Merge branch 'stable-2.15'
* stable-2.15:
Update bazlets to the latest on stable-2.14 to use 2.14.7 release API
Update to latest bazlets on stable-2.14
Fix: ssh delete-project command is inconsistent with WebUI
Remove ReviewDb related stuff only when ReviewDb is enable
Change-Id: Ief48c9a5373cd8af260db1217ee64dcb6bc87f52
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteAction.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteAction.java
index 50f68fa..f9b0b5e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteAction.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteAction.java
@@ -74,4 +74,4 @@
private boolean isAllProjects(ProjectResource rsrc) {
return (rsrc.getProjectState().getProject().getNameKey().equals(allProjectsName));
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
index db9a4bb..a804b3f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
@@ -92,7 +92,7 @@
deleteProject.doDelete(rsrc, input);
} catch (RestApiException | OrmException | IOException e) {
- die(e);
+ throw die(e);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
index 8d4b240..73588f1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProject.java
@@ -171,4 +171,4 @@
deleteLog.onDelete((IdentifiedUser) userProvider.get(), project.getNameKey(), input, ex);
}
}
-}
+}
\ No newline at end of file
