opendev/gerrit
Code Issues Proposed changes

BaseInit: Throw the result of die

Browse Source 
die() itself does not throw. It does, however, put the passed in
message in an exception, so the additional RuntimeException is not
required.

Coverity-CID: 37864
Change-Id: I91cf9790f0aa46c81d234cb6132cdde61ffad7f8
This commit is contained in:
Dave Borowitz 2015-09-03 11:09:16 -04:00
parent 89bc1eb083
commit ca25600045
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
View File

@ -215,12 +215,11 @@ public class BaseInit extends SiteProgram {
if (secureStoreInitData != null && currentSecureStoreClassName != null
&& !currentSecureStoreClassName.equals(secureStoreInitData.className)) {
String err =
String.format(
"Different secure store was previously configured: %s. "
+ "Use SwitchSecureStore program to switch between implementations.",
currentSecureStoreClassName);
die(err, new RuntimeException("secure store mismatch"));
String err = String.format(
"Different secure store was previously configured: %s. "
+ "Use SwitchSecureStore program to switch between implementations.",
currentSecureStoreClassName);
throw die(err);
}
m.add(new InitModule(standalone, initDb));