[JENKINS-20192] don't attempt to build user during internal comparison

jenkinsci · Oct 23, 2013 · 39502b6 · 39502b6
1 parent 18c7ccc
commit 39502b6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/hudson/scm/CVSChangeLogSet.java b/src/main/java/hudson/scm/CVSChangeLogSet.java
@@ -182,8 +182,14 @@ public boolean canBeMergedWith(final CVSChangeLog that) {
             if (!this.getChangeDate().equals(that.getChangeDate())) {
                 return false;
             }
-            if (!this.getAuthor().equals(that.getAuthor())) {
-                return false;
+            if (this.user == null && that.user != null) {
+                 return false;
+            }
+            if (that.user == null && this.user != null) {
+                 return false;
+            }
+            if (this.user != null && !this.user.equals(that.user)) {
+                 return false;
             }
             if (!this.getMsg().equals(that.getMsg())) {
                 return false;
@@ -337,6 +343,9 @@ public void setChangeDateString(final String changeDate) {
         @Override
         @Exported
         public User getAuthor() {
+            if (user == null) {
+                return User.getUnknown();
+            }
             return User.get(user);
         }