ChangeJson: Catch RuntimeException in fallback check handlers
There are almost certainly more bugs like I439dfc2cd lurking, where a
missing database entity results in a NullPointerException, and falling
back to the check-only path would be more useful than letting the
error propagate.
Change-Id: If8b6e969fcebf2388753c9cc2e1eed1533a6cbbc
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 94ecc68..cdca93d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -239,7 +239,7 @@
ChangeInfo res = toChangeInfo(cd, reviewed, limitToPsId);
accountLoader.fill();
return res;
- } catch (OrmException e) {
+ } catch (OrmException | RuntimeException e) {
if (!has(CHECK)) {
throw e;
}
@@ -289,7 +289,7 @@
if (i == null) {
try {
i = toChangeInfo(cd, reviewed, Optional.<PatchSet.Id> absent());
- } catch (OrmException e) {
+ } catch (OrmException | RuntimeException e) {
if (has(CHECK)) {
i = checkOnly(cd);
} else {
