opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
David Pursehouse
2015-11-12 19:03:12 +00:00
committed by Gerrit Code Review
parent b675a4f811 850d8de460
commit 1e329a13bf
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 @@ public class AccountManager {
}
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());