Changeset 7859 for trunk

Timestamp:

12/30/11 15:53:29 (8 years ago)

Author:

aivar

Message:

Bug with synchronization of multiple threads trying to load the native library. (Late threads would try JNA again unnecessarily.)

File:

• trunk/projects/curve-fitter/src/main/java/loci/curvefitter/SLIMCurveFitter.java (modified) (1 diff)

trunk/projects/curve-fitter/src/main/java/loci/curvefitter/SLIMCurveFitter.java

@@ -187 +187 @@
 
             synchronized (s_synchObject) {
-                // look for library on path
-                try {
-                    IJ.log("Using JNA");
-                    s_library = (CLibrary) Native.loadLibrary("slim-curve-1.0-SNAPSHOT", CLibrary.class);
-                    s_libraryLoaded = true;
-                    s_libraryOnPath = true;
-                }
-                catch (UnsatisfiedLinkError e) {
-                    System.out.println("Library not on path " + e.getMessage());
-                    IJ.log("Library not on path " + e.getMessage());
-                }
+
+                // check again to see if some other thread loaded it
+                if (!s_libraryLoaded) {
+                    
+                    // look for library on path
+                    try {
+                        IJ.log("Using JNA");
+                        s_library = (CLibrary) Native.loadLibrary("slim-curve-1.0-SNAPSHOT", CLibrary.class);
+                        s_libraryLoaded = true;
+                        s_libraryOnPath = true;
+                    }
+                    catch (UnsatisfiedLinkError e) {
+                        System.out.println("Library not on path " + e.getMessage());
+                        IJ.log("Library not on path " + e.getMessage());
+                    } 
+                }
+
 
                 if (!s_libraryLoaded) {