opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9'

Browse Source 
* stable-2.9:
  Cherry-pick: Bump database row version to invalidate ETag cache
  Fix consultRules so that it does not bail out on RuntimeException

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java

Change-Id: I5d7fb4cc49819258e589e6b8023814eba0370988
This commit is contained in:
David Pursehouse
2014-06-24 10:46:27 +09:00
parent aec45cf82c 22da0b0a08
commit 7be9cef533
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,15 +195,18 @@ public class RulesCache {
return pmc; return pmc;
} }
private PrologMachineCopy consultRules(String name, Reader rules) { private PrologMachineCopy consultRules(String name, Reader rules)
throws CompileException {
BufferingPrologControl ctl = newEmptyMachine(systemLoader); BufferingPrologControl ctl = newEmptyMachine(systemLoader);
PushbackReader in = new PushbackReader(rules, Prolog.PUSHBACK_SIZE); PushbackReader in = new PushbackReader(rules, Prolog.PUSHBACK_SIZE);
if (!ctl.execute( try {
Prolog.BUILTIN, "consult_stream", if (!ctl.execute(Prolog.BUILTIN, "consult_stream",
SymbolTerm.intern(name), SymbolTerm.intern(name), new JavaObjectTerm(in))) {
new JavaObjectTerm(in))) {
return null; return null;
} }
} catch (RuntimeException e) {
throw new CompileException("Error while consulting rules from " + name, e);
}
return save(ctl); return save(ctl);
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -201,6 +201,10 @@ public class ChangeInserter {
if(!messageIsForChange()) { if(!messageIsForChange()) {
commitMessageNotForChange(); commitMessageNotForChange();
if (changeMessage != null) {
ChangeUtil.bumpRowVersionNotLastUpdatedOn(
changeMessage.getKey().getParentKey(), db);
}
} }
gitRefUpdated.fire(change.getProject(), patchSet.getRefName(), gitRefUpdated.fire(change.getProject(), patchSet.getRefName(),
ObjectId.zeroId(), commit); ObjectId.zeroId(), commit);