From 6c1c7ca94493d39b259ec1236f33ce456b6c8ad3 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Tue, 22 Jul 2014 14:45:09 +0900
Subject: [PATCH] Fix potential NPE in cherry-pick submit strategy

Change-Id: I0099d9a73a3f5e86c77235668bc0fc1205979456
---
 .../java/com/google/gerrit/server/git/strategy/CherryPick.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
index 18df4c140e..14a68bb454 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
@@ -164,7 +164,7 @@ public class CherryPick extends SubmitStrategy {
         ChangeUtil.nextPatchSetId(args.repo, n.change().currentPatchSetId());
     final PatchSet ps = new PatchSet(id);
     ps.setCreatedOn(TimeUtil.nowTs());
-    ps.setUploader(submitAudit.getAccountId());
+    ps.setUploader(cherryPickUser.getAccountId());
     ps.setRevision(new RevId(newCommit.getId().getName()));
 
     final RefUpdate ru;