Don't disconnect after an abort.

Don't disconnect from the P4 server immediately after an abort is detected. JENKINS-37487 @StuartR
jenkinsci · Aug 23, 2016 · edd69ad · edd69ad
1 parent 53733b2
commit edd69ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/p4/client/ConnectionHelper.java b/src/main/java/org/jenkinsci/plugins/p4/client/ConnectionHelper.java
@@ -505,6 +505,5 @@ public boolean hasAborted() {
 
 	public void abort() {
 		this.abort = true;
-		disconnect();
 	}
 }
diff --git a/src/main/java/org/jenkinsci/plugins/p4/tasks/AbstractTask.java b/src/main/java/org/jenkinsci/plugins/p4/tasks/AbstractTask.java
@@ -226,6 +226,7 @@ protected Object tryTask() throws AbortException {
 
 				return result;
 			} catch (AbortException e) {
+				p4.disconnect();
 				throw e;
 			} catch (Exception e) {
 				last = e;