- Fixed exception thrown in the finalization block in the Directory class

 - Fixed NPE in the return statement in the loadDLL method in the File class

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1620 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/io/Directory.java

@@ -32,6 +32,8 @@ public class Directory implements Comparable {
     public static final String PathSeparator = System.getProperty("file.separator");
     protected static final boolean isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows");
 
+    private boolean directorySearchInitialized = false;
+
 
   //**************************************************************************
   //** Constructor
@@ -1195,6 +1197,7 @@ public List getChildren(boolean RecursiveSearch, Object filter, boolean wait){
               //Spawn threads used to crawl through the file system
                 long directoryID = Long.valueOf(java.util.Calendar.getInstance().getTimeInMillis() + "" + new Random().nextInt(100000)).longValue();
                 int numThreads = 20; //<-- this should be set dynamically and self tuning
+                directorySearchInitialized = true;
                 DirectorySearch.deleteCache();
                 DirectorySearch search = new DirectorySearch(fileFilter, items, directoryID, numThreads);
                 for (int i=0; i<numThreads; i++) {
@@ -1887,6 +1890,7 @@ public List getEvents() throws Exception {
         return FileSystemWatcher.getEvents();
     }
 
+
   //**************************************************************************
   //** Stop
   //**************************************************************************
@@ -1898,9 +1902,9 @@ public void stop(){
 
         try{
             //for (int i=0; i<20; i++)
-            DirectorySearch.stop();
+            if (directorySearchInitialized) DirectorySearch.stop();
         }
-        catch(Exception e){}
+        catch(Throwable e){}
     }
 
 

src/javaxt/io/File.java

@@ -29,6 +29,7 @@ public class File implements Comparable {
     private static final boolean isWindows = Directory.isWindows;
     private int bufferSize = 1024*1024; //1MB
 
+    //public static final boolean jni = loadDLL();
 
   //**************************************************************************
   //** Constructor
@@ -1554,7 +1555,7 @@ protected static synchronized boolean loadDLL(){
 
             if (dllLoaded==null){ //haven't tried to load the dll yet...
                 String jvmPlatform = System.getProperty("os.arch");
-                String dllName = null;
+                String dllName;
                 if (jvmPlatform.equalsIgnoreCase("x86")){
                     dllName = "javaxt-core.dll";
                 }
@@ -1574,7 +1575,7 @@ else if(jvmPlatform.equalsIgnoreCase("amd64")){
 
 
               //Construct list of possible file locations for the dll
-                java.util.ArrayList<java.io.File> files = new java.util.ArrayList<java.io.File>();
+                java.util.ArrayList<java.io.File> files = new java.util.ArrayList<>();
                 files.add(new java.io.File(jar.getFile().getParentFile(), dllName));
                 javaxt.io.Directory dir = new javaxt.io.Directory(System.getProperty("user.home"));
                 for (String appDir : new String[]{"AppData\\Local", "Application Data"}){
@@ -1625,8 +1626,14 @@ else if(jvmPlatform.equalsIgnoreCase("amd64")){
                             dllLoaded = true;
                             break;
                         }
-                        catch(Exception e){
-                            e.printStackTrace();
+                        catch(Throwable t){
+                            String msg = "already loaded in another classloader";
+                            if (t.getMessage().contains(msg)){ //UnsatisfiedLinkError
+                                System.err.println(System.mapLibraryName("javaxt_core") + " " + msg);
+                            }
+                            else{
+                                t.printStackTrace();
+                            }
                         }
                     }
                 }
@@ -1635,10 +1642,10 @@ else if(jvmPlatform.equalsIgnoreCase("amd64")){
               //Don't update the static variable to give users a chance to fix
               //the load error (e.g. manually extract the dll and copy it into
               //one of the directories).
-              //dllLoaded = false;
+                //dllLoaded = false;
             }
 
-            return dllLoaded;
+            return dllLoaded==null ? false : dllLoaded;
         }
         else{//not windows...
             return false;