Changeset 7324

Timestamp:

Apr 6, 2017, 10:47:40 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2074: Support for plug-ins to save custom information in the static cache

The functionality could be implemented by subclassing the ObjectInputStream and implementing the resolveClass() method.

Location:

trunk/src/core/net/sf/basedb

Files:

• core/Job.java (modified) (2 diffs)
• core/PluginRequest.java (modified) (1 diff)
• util/StaticCache.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/Job.java

@@ -1426 +1426 @@
     @since 3.11
   */
-  Serializable loadState()
+  Serializable loadState(ClassLoader loader)
   {
     Serializable state = null;
@@ -1433 +1433 @@
       String key = "/job-state/" + getId();
       StaticCache cache = Application.getStaticCache();
-      state = (Serializable)cache.load(key, 2000);
+      state = (Serializable)cache.load(key, loader, 2000);
       if (state != null) cache.delete(key, 2000);
     }

trunk/src/core/net/sf/basedb/core/PluginRequest.java

@@ -83 +83 @@
     this.plugin = plugin;
     this.command = command;
-    this.state = job.loadState();
+    this.state = job.loadState(plugin.getClass().getClassLoader());
     this.pluginConfiguration = pluginConfiguration;
     this.pluginDefinition = pluginDefinition;

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

@@ -33 +33 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
 import java.io.OutputStream;
 import java.io.Serializable;
@@ -408 +409 @@
   public Object load(String key, int timeout)
   {
+    return load(key, null, timeout);
+  }
+  
+  public Object load(String key, ClassLoader loader, int timeout)
+  {
     if (disabled) return null;
     Serializable object = null;
@@ -416 +422 @@
       if (in != null)
       {
-        ObjectInputStream oin = new ObjectInputStream(in);
+        // Create stream and override resolveClass so we
+        // can load classes from the given class loader
+        ObjectInputStream oin = new ObjectInputStream(in)
+        {
+          @Override
+          protected Class<?> resolveClass(ObjectStreamClass streamClass)
+              throws IOException, ClassNotFoundException
+          {
+            Class<?> c = null;
+            try
+            {
+              c = super.resolveClass(streamClass);
+            }
+            catch (ClassNotFoundException ex)
+            {
+              if (loader == null) throw ex;
+              c = Class.forName(streamClass.getName(), false, loader);
+            }
+            return c;
+          }
+        };
         try
         {
@@ -444 +470 @@
     }
     return object;    
+    
   }