opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.9'"

Browse Source
This commit is contained in:
Edwin Kempin 2014-06-24 06:46:58 +00:00 committed by Gerrit Code Review
commit 8952ca2271
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,14 +195,17 @@ 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);