commit c4962af56bab833ba94b033d4722eba5021b5197
author Ken Arnold <k.arnold@sap.com> Tue Apr 14 15:20:06 2015 +0200
committer Ken Arnold <k.arnold@sap.com> Wed Apr 15 10:20:07 2015 +0200
tree 0cb06788b8752dd7feec3d486beea416d67794fe
parent d36b41f740f247cd6b0eacfa5d899180d5319cd5

[Fix] NPE exception if label value is null

Change-Id: If3db94d2d06698cbd96f73d5637df1aeb9543f61

src/main/java/com/googlesource/gerrit/plugins/importer/AddApprovalsStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/AddApprovalsStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/AddApprovalsStep.java
index 55f0300..e703b60 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/AddApprovalsStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/AddApprovalsStep.java
@@ -109,13 +109,13 @@
                 , pluginName, labelName, a.username, changeInfo.id));
             continue;
           }
-          approvals.add(new PatchSetApproval(
-              new PatchSetApproval.Key(change.currentPatchSetId(), user,
-                  labelType.getLabelId()), a.value.shortValue(),
-                  MoreObjects.firstNonNull(a.date, TimeUtil.nowTs())));
+          short shortValue = a.value != null ? a.value.shortValue() : 0;
+          approvals.add(new PatchSetApproval(new PatchSetApproval.Key(change
+              .currentPatchSetId(), user, labelType.getLabelId()), shortValue,
+              MoreObjects.firstNonNull(a.date, TimeUtil.nowTs())));
           ChangeUpdate update = updateFactory.create(ctrl);
-          if (a.value != 0) {
-            update.putApproval(labelName, a.value.shortValue());
+          if (shortValue != 0) {
+            update.putApproval(labelName, shortValue);
           } else {
             update.removeApproval(labelName);
           }