Merge pull request #34 from lrobertson39/master

[FIXED JENKINS-23740] Re-use opList so that if null or empty, default to AbortOperation is used.
jenkinsci · Jul 10, 2014 · 12cb64b · 12cb64b
2 parents ca80b3f + cf1fd6f
commit 12cb64b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/build_timeout/BuildTimeoutWrapper.java b/src/main/java/hudson/plugins/build_timeout/BuildTimeoutWrapper.java
@@ -136,7 +136,7 @@ public void doRun() {
                         // defaults to AbortOperation.
                         opList = Arrays.<BuildTimeOutOperation>asList(new AbortOperation());
                     }
-                    for( BuildTimeOutOperation op: getOperationList() ) {
+                    for( BuildTimeOutOperation op: opList ) {
                         try {
                             if (!op.perform(build, listener, effectiveTimeout)) {
                                 operationFailed = true;