Fixed 371 379

Author: nbhoski

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

@@ -7,6 +7,7 @@
  *
  */
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.CopyOnWrite;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -15,6 +16,7 @@
 import hudson.model.EnvironmentSpecific;
 import hudson.model.Node;
 import hudson.model.TaskListener;
+import hudson.remoting.VirtualChannel;
 import hudson.slaves.NodeSpecific;
 import hudson.tools.ToolDescriptor;
 import hudson.tools.ToolInstallation;
@@ -59,14 +61,23 @@ public MatlabInstallation forNode(@Nonnull Node node, TaskListener log) throws I
         return new MatlabInstallation(getName(), translateFor(node, log), getProperties().toList());
     }
 
+    @SuppressFBWarnings(value = {"NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"},
+        justification =
+            "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE: Its false positive scenario for sport bug which is fixed in later versions "
+                + "https://github.com/spotbugs/spotbugs/issues/1843")
     @Override
     public void buildEnvVars(EnvVars env) {
-        FilePath batchExecutablePath = new FilePath (Jenkins.get().getChannel(), getHome());
         String pathToExecutable = getHome() + "/bin";
-        if( batchExecutablePath.getParent () != null ){
-            env.put ("PATH+matlab_batch", batchExecutablePath.getParent().getRemote());
-        }
         env.put("PATH+matlabroot", pathToExecutable);
+        Jenkins jenkinsInstance = Jenkins.getInstanceOrNull();
+        if(jenkinsInstance != null){
+            if(jenkinsInstance.getChannel() != null){
+                FilePath batchExecutablePath = new FilePath(jenkinsInstance.getChannel (), getHome());
+                if( batchExecutablePath.getParent() != null ){
+                    env.put ("PATH+matlab_batch", batchExecutablePath.getParent().getRemote());
+                }
+            }
+        }
     }
 
     public static MatlabInstallation[] getAll () {

src/main/java/com/mathworks/ci/tools/MatlabInstaller.java

@@ -149,7 +149,7 @@ private void appendReleaseToArguments(String release, ArgumentListBuilder args,
         args.add("--release=" + actualRelease);
     }
 
-    private void getFreshCopyOfExecutables(String platform, FilePath expectedPath)
+    synchronized private void getFreshCopyOfExecutables(String platform, FilePath expectedPath)
         throws IOException, InterruptedException {
         FilePath matlabBatchPath = new FilePath(expectedPath, "matlab-batch");
         FilePath mpmPath = new FilePath(expectedPath, "mpm");

src/main/resources/com/mathworks/ci/tools/MatlabInstaller/help-release.html

@@ -1,6 +1,6 @@
 <div>
   <p>
-    Insert the MATLAB version to install. To install the latest release of MATLAB, insert latest in the <b>Version</b> box.
+    Insert the MATLAB version to install. To install the latest release of MATLAB, insert latest in the <b>Release</b> box.
   </p>
   <p>
     <ul>