Changeset 2285 for trunk/autoquest-ui-core

Timestamp:

09/30/19 16:29:01 (5 years ago)

Author:

pharms

Message:

solved class loader issues

Location:

trunk/autoquest-ui-core

Files:

• pom.xml (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/commands/misc/CMDload.java (modified) (2 diffs)

trunk/autoquest-ui-core/pom.xml

@@ -66 +66 @@
     </dependency>
     <dependency>
+      <groupId>de.ugoe.cs.autoquest</groupId>
+      <artifactId>autoquest-plugin-core</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
       <groupId>net.sf.jung</groupId>
       <artifactId>jung-visualization</artifactId>

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/misc/CMDload.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.commands.misc;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
 import java.util.List;
 
+import de.ugoe.cs.autoquest.plugin.AutoQUESTPlugin;
+import de.ugoe.cs.autoquest.plugin.PluginLoader;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.CommandExecuter;
 import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
@@ -48 +53 @@
                 }
 
-                FileInputStream fis = null;
+                final PluginLoader pluginLoader = new PluginLoader(new File("lib"));
+                pluginLoader.load();
+
+                FileInputStream fis = null;
                 ObjectInputStream in = null;
                 try {
                         fis = new FileInputStream(filename);
-                        in = new ObjectInputStream(fis);
+                        in = new ObjectInputStream(fis) {
+                            @Override
+                            protected Class<?> resolveClass(ObjectStreamClass clazz)
+                                    throws IOException, ClassNotFoundException
+                            {
+                                try {
+                                    return this.getClass().getClassLoader().loadClass(clazz.getName());
+                                }
+                                catch (Exception e) {
+                                    for (AutoQUESTPlugin plugin : pluginLoader.getPlugins()) {
+                                        try {
+                                            return plugin.getClass().getClassLoader().loadClass(clazz.getName());
+                                        }
+                                        catch (Exception e2) {
+                                            // ignore and try next
+                                        }
+                                    }
+                                }
+                                
+                                throw new ClassNotFoundException("could not load class " + clazz.getName() +
+                                                                 " neither from normal class loader nor from " +
+                                                                 "plug in class loaders");
+                            }
+                        };
                         in.readObject();
                         in.close();