opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Fix NullPointerException when executing query with --comments option
  ChangeControl: Optimize creation by not re-reading changes

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
	gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
	gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
	gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java

Change-Id: Id2098e90c2c19d36d86585b39249c1ca75590641
This commit is contained in:
David Pursehouse 2015-02-26 09:48:45 +09:00
commit 0e0cc1732f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@ -596,7 +596,7 @@ public class ChangeData {
public List<ChangeMessage> messages()
throws OrmException {
if (messages == null) {
messages = cmUtil.byChange(db, notes);
messages = cmUtil.byChange(db, notes());
}
return messages;
}