[FIXED JENKINS-21875]

User.current() can return null, so this better check for null
jenkinsci · Mar 26, 2014 · d487d1f · d487d1f
1 parent 20ea8d1
commit d487d1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -61,6 +61,9 @@
   <li class=bug>
     Fixed a slow down in resource loading caused by fix to JENKINS-18677.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21579">issue 21579</a>)
+  <li class=bug>
+    Fixed NPE in <tt>UserCause</tt>
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21875">issue 21875</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/slaves/OfflineCause.java b/core/src/main/java/hudson/slaves/OfflineCause.java
@@ -109,7 +109,7 @@ public static class UserCause extends SimpleOfflineCause {
 
         public UserCause(User user, String message) {
             super(hudson.slaves.Messages._SlaveComputer_DisconnectedBy(
-                    user.getId(),
+                    user!=null ? user.getId() : Jenkins.ANONYMOUS.getName(),
                     message != null ? " : " + message : ""
             ));
             this.user = user;