Merge pull request #106 from tastatur/master

[FIXED JENKINS-26264] UpdateUpdater perform will throw an AbortException
jenkinsci · Jan 19, 2015 · 205ef51 · 205ef51
2 parents a20e047 + e5ef893
commit 205ef51
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/hudson/scm/subversion/UpdateUpdater.java b/src/main/java/hudson/scm/subversion/UpdateUpdater.java
@@ -26,6 +26,7 @@
  */
 package hudson.scm.subversion;
 
+import hudson.AbortException;
 import hudson.Extension;
 import hudson.model.Hudson;
 import hudson.scm.SubversionSCM.External;
@@ -167,7 +168,7 @@ public List<External> perform() throws IOException, InterruptedException {
             } catch (SVNCancelException e) {
                 if (isAuthenticationFailedError(e)) {
                     e.printStackTrace(listener.error("Failed to check out " + location.remote));
-                    return null;
+                    throw (AbortException) new AbortException().initCause(e);
                 } else {
                     listener.error("Subversion update has been canceled");
                     throw (InterruptedException)new InterruptedException().initCause(e);