Fix JENKINS-18443 when running on slaves

jenkinsci · Apr 23, 2014 · bfbd152 · bfbd152
1 parent be6f3ec
commit bfbd152
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/xunit/XUnitProcessor.java b/src/main/java/org/jenkinsci/plugins/xunit/XUnitProcessor.java
@@ -114,6 +114,15 @@ private boolean performTests(XUnitLog xUnitLog, AbstractBuild<?, ?> build, Build
                     result = getWorkspace(build).act(xUnitTransformer);
                     findTest = true;
                 } catch (InterruptedException ie) {
+                	// handled tunneled exceptions
+                	Throwable originalException = null;
+                	Throwable cause = ie.getCause();
+                	while (cause != null) {
+                		originalException = cause;
+                		cause = cause.getCause();
+                	}
+                	if (originalException instanceof InterruptedException)
+                		ie = (InterruptedException)originalException;
 
                     if (ie instanceof NoFoundTestException) {
                         xUnitLog.infoConsoleLogger("Failing BUILD.");
@@ -129,6 +138,9 @@ private boolean performTests(XUnitLog xUnitLog, AbstractBuild<?, ?> build, Build
                         xUnitLog.infoConsoleLogger("Failing BUILD.");
                         throw new StopTestProcessingException();
                     }
+
+                    xUnitLog.warningConsoleLogger("Caught exception of unexpected type " + ie.getClass() + ", rethrowing");
+                    throw ie;
                 }
 
                 if (!result && xUnitToolInfo.isStopProcessingIfError()) {