From 6af0d9f31128b7465ae2ee57e6a33bc845996be0 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Fri, 30 Sep 2016 12:30:13 +0200
Subject: [PATCH] Fix setting full name from web UI if no current email is set

Change-Id: Ia6107413caa3e519137cebac90b2111b4ea8a0ba
Signed-off-by: Edwin Kempin <ekempin@google.com>
---
 .../com/google/gerrit/client/account/ContactPanelShort.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
index f5f38fbf6a..0b8fe3ee21 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
@@ -369,7 +369,7 @@ class ContactPanelShort extends Composite {
     registerNewEmail.setEnabled(false);
 
     CallbackGroup group = new CallbackGroup();
-    if (!newEmail.equals(currentEmail)) {
+    if (currentEmail != null && !newEmail.equals(currentEmail)) {
       AccountApi.setPreferredEmail("self", newEmail,
           group.add(new GerritCallback<NativeString>() {
         @Override