From 9fa9a391dafa6ba8394308c8c124ea0d4d3de45d Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Sat, 12 Dec 2009 18:16:10 -0800
Subject: [PATCH] Cleanup the reflog identity generation

Simplify the code, and ensure the SSH username field is always present
in the identity even if the username hasn't bee populated in the account.

Change-Id: I956fbd6f07ecd659c966e43c1e70001ac138b464
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 .../google/gerrit/server/IdentifiedUser.java  | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
index 7a12926c9c..9c78f124ac 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -211,35 +211,32 @@ public class IdentifiedUser extends CurrentUser {
 
   public PersonIdent newRefLogIdent(final Date when, final TimeZone tz) {
     final Account ua = getAccount();
+
     String name = ua.getFullName();
-    if (name == null) {
+    if (name == null || name.isEmpty()) {
       name = ua.getPreferredEmail();
     }
-    if (name == null) {
+    if (name == null || name.isEmpty()) {
       name = "Anonymous Coward";
     }
 
-    final String userId = "account-" + ua.getId().toString();
-    final String user;
-    if (ua.getSshUserName() != null) {
-      user = ua.getSshUserName() + "|" + userId;
-    } else {
-      user = userId;
+    String user = ua.getSshUserName();
+    if (user == null) {
+      user = "";
     }
+    user = user + "|" + "account-" + ua.getId().toString();
 
     String host = null;
-    final SocketAddress remotePeer =
-        remotePeerProvider != null ? remotePeerProvider.get() : null;
-    if (remotePeer instanceof InetSocketAddress) {
-      final InetSocketAddress sa = (InetSocketAddress) remotePeer;
-      final InetAddress in = sa.getAddress();
-      if (in != null) {
-        host = in.getCanonicalHostName();
-      } else {
-        host = sa.getHostName();
+    if (remotePeerProvider != null) {
+      final SocketAddress remotePeer = remotePeerProvider.get();
+      if (remotePeer instanceof InetSocketAddress) {
+        final InetSocketAddress sa = (InetSocketAddress) remotePeer;
+        final InetAddress in = sa.getAddress();
+
+        host = in != null ? in.getCanonicalHostName() : sa.getHostName();
       }
     }
-    if (host == null) {
+    if (host == null || host.isEmpty()) {
       host = "unknown";
     }