summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Arès <hugo.ares@ericsson.com>2015-02-23 10:06:05 -0500
committerHugo Arès <hugo.ares@ericsson.com>2015-02-25 15:18:39 +0000
commit2bb0f3a4da70458ca1f68f44b32d0a7a0d649168 (patch)
tree096d7da8276a3d9704b692b6cae44ec9c4908673
parent4d48481cc69757abbfcf2d3a4ae1d4002277020d (diff)
Fix NullPointerException when executing query with --comments option
messages method was accesssing the notes member variable directly instead of using the notes method, which will load the notes if not already loaded. Issue: 3210 Change-Id: I4b02f10d75070507cedbe9876a0f7c90944e0e2d
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
index ed640154b8..e9266cdd82 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
@@ -530,7 +530,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;
}