Merge pull request #192 from mathworks/2.5.0-Qualification

Bring fixes from 2.5.0-Qualification to dev_main

Author: abhargav-mw

src/main/java/com/mathworks/ci/MatlabCommandStepExecution.java

@@ -45,13 +45,12 @@ public Void run() throws Exception {
 
         int exitCode = execMatlabCommand(workspace, launcher, listener, env);
 
-        if(exitCode == 0){
-            getContext().setResult(Result.SUCCESS);
-            return null;
+        if(exitCode != 0){
+            // throw an exception if return code is non-zero
+            stop(new MatlabExecutionException(exitCode));
         }
 
-        // throw an exception if return code is non-zero
-        stop(new MatlabExecutionException(exitCode));
+        getContext().setResult(Result.SUCCESS);
         return null;
     }
 

src/main/java/com/mathworks/ci/MatlabRunTestsStepExecution.java

@@ -44,13 +44,12 @@ public Void run() throws Exception {
 
         int exitCode = execMatlabCommand(workspace, launcher, listener, env);
 
-        if(exitCode == 0){
-            getContext().setResult(Result.SUCCESS);
-            return null;
+        if(exitCode != 0){
+            // throw an exception if return code is non-zero
+            stop(new MatlabExecutionException(exitCode));
         }
 
-        // throw an exception if returned exit code is non-zero
-        stop(new MatlabExecutionException(exitCode));
+        getContext().setResult(Result.SUCCESS);
         return null;
     }