- Bump MSL

- Fix ClassLoader (if we have directory Test, no Test/package.mo, and Test.mo in a package) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16414 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 20, 2013 · 0809ddb · 0809ddb
1 parent d68b393
commit 0809ddb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Compiler/FrontEnd/ClassLoader.mo b/Compiler/FrontEnd/ClassLoader.mo
@@ -284,7 +284,8 @@ algorithm
     case (CLASSLOAD(id),_,_,_,_)
       equation
         pd = System.pathDelimiter();
-        true = System.directoryExists(mp +& pd +& id);
+        file = mp +& pd +& id +& "/package.mo";
+        true = System.directoryExists(mp +& pd +& id) and System.regularFileExists(file);
         cl = loadCompletePackageFromMp(id,id,mp,encoding,w1,Error.getNumErrorMessages());
         ei = Absyn.makeClassElement(cl);
         cps = mergeBefore(Absyn.PUBLIC({ei}),acc);
@@ -293,7 +294,8 @@ algorithm
     case (CLASSLOAD(id),_,_,_,_)
       equation
         pd = System.pathDelimiter();
-        false = System.directoryExists(mp +& pd +& id);
+        file = mp +& pd +& id +& "/package.mo";
+        false = System.directoryExists(mp +& pd +& id) and System.regularFileExists(file);
         file = mp +& pd +& id +& ".mo";
         true = System.regularFileExists(file);
         cl = parsePackageFile(file,encoding,false,w1,id);