Merge pull request #3 from jdewinne/master

JENKINS-16778: Timestamper makes the build fail if the slave is put offline during the build.
jenkinsci · May 5, 2013 · 8317afc · 8317afc
2 parents 09ec702 + 54dc741
commit 8317afc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory.java b/src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory.java
@@ -62,6 +62,10 @@ public ConsoleAnnotator<Object> newInstance(Object context) {
    * @return the offset in bytes
    */
   private static long getOffset(StaplerRequest request) {
+    // Rare case where a Jenkins slave is put offline, while build job is still running
+    if (null == request) {
+        return 0;
+    }
     String path = request.getPathInfo();
     if (path == null) {
       // JENKINS-16438