commit 1e329a13bfc67ec0b4784d59b6e426e9444093d9
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Nov 12 19:03:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 12 19:03:12 2015 +0000
tree 9283c8a8aed7551b1f815e3e2d95cacd3a0f96c8
parent b675a4f8118e64cd571e04104b04847663144a73
parent 850d8de460d3177f51e90dd4bcdfd6c6967dee9c

Merge "AccountManager: Update display name only if it is not null." into stable-2.11

gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
index 62615c6..e1033d0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.account;
 
+import com.google.common.base.Strings;
 import com.google.gerrit.audit.AuditService;
 import com.google.gerrit.common.TimeUtil;
 import com.google.gerrit.common.data.AccessSection;
@@ -158,6 +159,7 @@
     }
 
     if (!realm.allowsEdit(Account.FieldName.FULL_NAME)
+        && !Strings.isNullOrEmpty(who.getDisplayName())
         && !eq(user.getAccount().getFullName(), who.getDisplayName())) {
       toUpdate = load(toUpdate, user.getAccountId(), db);
       toUpdate.setFullName(who.getDisplayName());