Add system config option to avoid doing user lookup for changelog ent…

…ries to resolve JENKINS-35484
jenkinsci · Jun 9, 2016 · 647f03f · 647f03f
1 parent 058e4a6
commit 647f03f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/external/ChangeSetExt.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/external/ChangeSetExt.java
@@ -45,6 +45,9 @@ public class ChangeSetExt {
     private List<Commit> commits;
     private String consoleUrl; // Not a rest endpoint so not including in _links
 
+    /** False by default, workaround for JENKINS-35484 where user lookup breaks things */
+    private static boolean AVOID_RESOLVING_COMMIT_AUTHORS = Boolean.getBoolean(ChangeSetExt.class.getName()+".avoidResolvingCommitAuthors");
+
     public String getKind() {
         return kind;
     }
@@ -173,7 +176,7 @@ protected void mapFields(ChangeLogSet<? extends ChangeLogSet.Entry> changeset, W
             commit.setCommitId(entry.getCommitId());
             commit.setCommitUrl(repoUrl);
             commit.setMessage(entry.getMsg());
-            commit.setAuthorJenkinsId(entry.getAuthor().getFullName());
+            commit.setAuthorJenkinsId((AVOID_RESOLVING_COMMIT_AUTHORS) ? "Unidentified" : entry.getAuthor().getFullName());
             commit.setTimestamp(entry.getTimestamp());
 
             if (commit.getTimestamp() > -1) {