Changeset 4390

Timestamp:

Aug 12, 2008, 1:05:12 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1043: JarClassLoader?.getInstance() doesn't create a new class loader if a secondary JAR file has changed

File:

• trunk/src/core/net/sf/basedb/util/JarClassLoader.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/JarClassLoader.java

@@ -274 +274 @@
       {
         File jarFile = info.jarFile;
-        isSame = jarFile.exists() && 
-          jarFile.lastModified() == info.lastModified && 
-          jarFile.length() == info.size;
+        if (jarFile.exists())
+        {
+          isSame = info.existed && 
+            jarFile.lastModified() == info.lastModified && 
+            jarFile.length() == info.size;
+        }
+        else
+        {
+          isSame = !info.existed;
+        }
         if (!isSame) return true;
       }
@@ -404 +411 @@
   {
     final File jarFile;
+    final boolean existed;
     final long lastModified;
     final long size;
@@ -410 +418 @@
     {
       this.jarFile = jarFile;
+      this.existed = jarFile.exists();
       this.size = jarFile.length();
       this.lastModified = jarFile.lastModified();