Changeset 7227

Timestamp:

Nov 15, 2016, 2:47:32 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2041: Support for extension points within extensions

This should get rid of the problem that a scan for changes only once. The problem was that if a change was detected in a JAR file, the ExtensionsFile.validate() method was called which, as a side-effect, nullified the current JAR class loader. This caused a second scan to think that everyting was up to date. The class loader is no longer reset when validating, but only if a change has been detected and the getClassLoader() method is called.

File:

• trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java

@@ -426 +426 @@
     hasError = false;
     validationError = null;
-    jarLoader = null;
     
     InputStream in = null;
@@ -575 +574 @@
   /**
     Get the class loader used to load classes for the extension. Only JAR
-    files have class loaders so this method may return null.
+    files have class loaders so this method may return null. Once a class
+    loader has been created it remains the same until a change has been detected
+    with {@link #checkModified()} which forces the creation of a new class loader
+    when this method is called.
   */
   public ClassLoader getClassLoader()
     throws IOException
   {
-    if (jarLoader == null && isJar())
+    if ((jarLoader == null || wasModified) && isJar())
     {
       jarLoader = (JarClassLoader)JarClassLoader.getInstance(getFile().getAbsolutePath(), true);