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

1 files changed, 10 insertions, 3 deletions

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 41dfba5b19..f067e27296 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 @@ public class ChangeField {
         @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 @@ public class ChangeField {
         @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 class ChangeField {
         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;
         }
       };