diff options
author | Hugo Arès <hugo.ares@ericsson.com> | 2015-03-11 14:49:07 -0400 |
---|---|---|
committer | Saša Živkov <zivkov@gmail.com> | 2015-03-12 13:12:41 +0000 |
commit | 7ff85bc55c1ee2408f86e25cb05e5b6eb6a630ce (patch) | |
tree | 932fa7c4d3210873f5bc1ec5584e45db387415a2 | |
parent | 368d234ac6c6b4e47cb992a4914498731fb9dc3e (diff) |
Fix NPE when indexing changed lines
Change-Id: I0256dd2e3b194bf9fe989b196276e1405354ae0e
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java | 13 |
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; } }; |