CID-1116298 path can be null, make sure that is properly handled

apache · Sep 19, 2014 · 6f54d48 · 6f54d48
1 parent 6687727
commit 6f54d48
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java
@@ -308,7 +308,7 @@ public static class Task implements Runnable {
         public Task(OutputInterpreter interpreter, BufferedReader reader) {
             this.interpreter = interpreter;
             this.reader = reader;
-            this.result = null;
+            result = null;
         }
 
         @Override
@@ -340,8 +340,6 @@ public synchronized String getResult() throws InterruptedException {
     public static String findScript(String path, String script) {
         s_logger.debug("Looking for " + script + " in the classpath");
 
-        path = path.replace("/", File.separator);
-
         URL url = ClassLoader.getSystemResource(script);
         s_logger.debug("System resource: " + url);
         File file = null;
@@ -351,6 +349,12 @@ public static String findScript(String path, String script) {
             return file.getAbsolutePath();
         }
 
+        if (path == null) {
+            s_logger.warn("No search path specified, unable to look for " + script);
+            return null;
+        }
+        path = path.replace("/", File.separator);
+
         /**
          * Look in WEB-INF/classes of the webapp
          * URI workaround the URL encoding of url.getFile