commit 3e032cd61a424d6cfe9482b9c6aa57a5db1d34bb
author Saša Živkov <zivkov@gmail.com> Thu Mar 12 13:14:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 12 13:14:25 2015 +0000
tree 80c07fac6a583775cd67869ae7e7236b28c48be7
parent a1c6497de3c0dc7ecf355f0fd66da0a51954069f
parent 7ff85bc55c1ee2408f86e25cb05e5b6eb6a630ce

Merge "Fix NPE when indexing changed lines" into stable-2.10

gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
index 41dfba5..f067e27 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
@@ -436,7 +436,10 @@
         @Override
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
-          return input.changedLines().insertions;
+
+          return input.changedLines() != null
+              ? input.changedLines().insertions
+              : null;
         }
       };
 
@@ -447,7 +450,9 @@
         @Override
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
-          return input.changedLines().deletions;
+          return input.changedLines() != null
+              ? input.changedLines().deletions
+              : null;
         }
       };
 
@@ -459,7 +464,9 @@
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
           ChangedLines changedLines = input.changedLines();
-          return changedLines.insertions + changedLines.deletions;
+          return changedLines != null
+              ? changedLines.insertions + changedLines.deletions
+              : null;
         }
       };