Changeset 13449

Timestamp:

Sep 11, 2019 12:54:11 PM (3 months ago)

Author:

Christian Andersson

Message:

Fixed nullpointer. Related to ticket:5837

Location:

branches/dev-cw-evaluator/Compiler

Files:

• ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExternalCeval.jrag (modified) (1 diff)
• ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/ExternalProcessCacheImpl.java (modified) (2 diffs)

branches/dev-cw-evaluator/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExternalCeval.jrag

@@ -304 +304 @@
             }
             input = input.concat("]");
+        }
+        if (arg.isArray()) {
+            input = input.concat("v");
         }
         if (useSeparator) {

branches/dev-cw-evaluator/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/ExternalProcessCacheImpl.java

@@ -53 +53 @@
         File f = new File(ext.libraryDirectory(), platform);
         String libLoc = f.isDirectory() ? f.getPath() : ext.libraryDirectory();
-        File dir = new File(libLoc);
-        File[] matches = dir.listFiles(new FilenameFilter()
-        {
-          public boolean accept(File dir, String name)
-          {
-             return name.contains(extName) && name.endsWith(SystemUtil.sharedLibraryExtension());
-          }
-        });
-        for(File file : matches) {
-            sharedLib = file.toString();
-            break;
-        }
-        if (sharedLib.equals("")) {
-            for (String lib : ext.library()) {
-                File tmp = new File(libLoc, lib.concat(SystemUtil.sharedLibraryExtension()));
-                if (tmp.exists() && !tmp.isDirectory()) {
-                    sharedLib = tmp.toString();
+        if (libLoc != null) {
+            File dir = new File(libLoc);
+            File[] matches = dir.listFiles(new FilenameFilter()
+            {
+              public boolean accept(File dir, String name)
+              {
+                 return name.contains(extName) && name.endsWith(SystemUtil.sharedLibraryExtension());
+              }
+            });
+            for(File file : matches) {
+                sharedLib = file.toString();
+                break;
+            }
+            if (sharedLib.equals("")) {
+                for (String lib : ext.library()) {
+                    File tmp = new File(libLoc, lib.concat(SystemUtil.sharedLibraryExtension()));
+                    if (tmp.exists() && !tmp.isDirectory()) {
+                        sharedLib = tmp.toString();
+                    }
                 }
             }
@@ -149 +151 @@
                     arguments.add(0, executable); /* Needs to be first */
                     
-                    mc.log().debug("Using pre-compiled evaluator for outputs: '" + getOutputArguments(ext) + "' and inputs: '" + getInputArguments(ext));
+                    mc.log().debug("Using pre-compiled evaluator for outputs: '" + getOutputArguments(ext) + "' and inputs: '" + getInputArguments(ext) +"'");
                 } else {
                     executable = mc.compileExternal(ext);