opendev/gerrit
Code Issues Proposed changes

Merge changes Iddd04aa3,Ica535e34,I19d7c6f0,I79433c5e,I1566242d

Browse Source 
* changes:
  RefPatternMatcher#getUsernames: Remove premature optimization
  RefPatternMatcher#getUsernames: Return ImmutableSet
  IdentifiedUser#getEmailAddresses: Return ImmutableSet
  Add IdentifiedUser#getLoggableName()
  AccountManager#update: Improve logging when username is not changed/set
This commit is contained in:
Dave Borowitz
2018-01-23 18:07:05 +00:00
committed by Gerrit Code Review
parent a0cc7845ea 7b25bac23b
commit 394da19619
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -918,7 +918,7 @@ class ReceiveCommits {
reject(cmd, "invalid project configuration");
logError(
"User "
+ user.getUserName()
+ user.getLoggableName()
+ " tried to push invalid project configuration "
+ cmd.getNewId().name()
+ " for "
@@ -994,7 +994,7 @@ class ReceiveCommits {
reject(cmd, "invalid project configuration");
logError(
"User "
+ user.getUserName()
+ user.getLoggableName()
+ " tried to push invalid project configuration "
+ cmd.getNewId().name()
+ " for "

2
java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@@ -447,7 +447,7 @@ public class CommitValidators {
} catch (ConfigInvalidException | IOException e) {
log.error(
"User "
+ user.getUserName()
+ user.getLoggableName()
+ " tried to push an invalid project configuration "
+ receiveEvent.command.getNewId().name()
+ " for project "