commit 9f6f18baf59884a30a912f5f1883f8283e825210
author Thomas Draebing <thomas.draebing@sap.com> Wed Aug 14 14:44:31 2019 +0200
committer Thomas Draebing <thomas.draebing@sap.com> Wed Aug 14 14:44:31 2019 +0200
tree 6a36df5159c5d62012e56073743e72f1ab6893e9
parent ec72e08efadba8e28d5dd78245e568d443365f97
parent ecc77772d3f204f4da9cc88c7d1822ec2c266d2e

Merge branch 'stable-2.16' into master

* stable-2.16:
  Fix setting email for service user

Change-Id: Ia7adb72b737899c674eae0f107e5605113495546

src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
index debdabf..53666bc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
@@ -94,7 +94,7 @@
       EmailInput in = new EmailInput();
       in.email = input.email;
       in.noConfirmation = true;
-      createEmail.get().apply(rsrc.getUser(), IdString.fromDecoded(email), in);
+      createEmail.get().apply(rsrc.getUser(), IdString.fromDecoded(in.email), in);
       putPreferred.get().apply(rsrc.getUser(), input.email);
       return Response.ok(input.email);
     }