commit ea1f69d5e3811c6a8d3aaf9dd8ed9f0a40c67d83
author Eryk Szymanski <eryksz@gmail.com> Thu Jun 19 14:36:14 2014 +0200
committer Eryk Szymanski <eryksz@gmail.com> Thu Jun 19 16:13:02 2014 +0200
tree 89325684e926864000e60eca38e70ad4e1f37962
parent 6e381a26e72c26e26217657e56d0e0ce69dff6ec

Fix consultRules so that it does not bail out on RuntimeException

This problem was causing internal server error in Gerrit GUI on browsing
open changes in case one or more projects had broken rules.pl in meta
config.

Change-Id: Ib1395a5d48abd0150a9b2e0c3680cb39ae186f1a
Signed-off-by: Eryk Szymanski <eryksz@gmail.com>

gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java b/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java
index 4a3cd9a..f263bed 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java
@@ -196,14 +196,17 @@
     return pmc;
   }
 
-  private PrologMachineCopy consultRules(String name, Reader rules) {
+  private PrologMachineCopy consultRules(String name, Reader rules)
+      throws CompileException {
     BufferingPrologControl ctl = newEmptyMachine(systemLoader);
     PushbackReader in = new PushbackReader(rules, Prolog.PUSHBACK_SIZE);
-    if (!ctl.execute(
-        Prolog.BUILTIN, "consult_stream",
-        SymbolTerm.intern(name),
-        new JavaObjectTerm(in))) {
-      return null;
+    try {
+      if (!ctl.execute(Prolog.BUILTIN, "consult_stream",
+          SymbolTerm.intern(name), new JavaObjectTerm(in))) {
+        return null;
+      }
+    } catch (RuntimeException e) {
+      throw new CompileException("Error while consulting rules from " + name, e);
     }
     return save(ctl);
   }