Index: openide/src/org/openide/loaders/InstanceSupport.java
===================================================================
RCS file: /cvs/openide/src/org/openide/loaders/InstanceSupport.java,v
retrieving revision 1.46
diff -u -r1.46 InstanceSupport.java
--- openide/src/org/openide/loaders/InstanceSupport.java	11 Feb 2002 12:24:22 -0000	1.46
+++ openide/src/org/openide/loaders/InstanceSupport.java	4 Mar 2002 12:57:30 -0000
@@ -195,7 +195,18 @@
             if (isSerialized ()) {
                 // create from ser file
                 BufferedInputStream bis = new BufferedInputStream(instanceOrigin().getInputStream(), 1024);
-                org.openide.util.io.NbObjectInputStream nbis = new org.openide.util.io.NbObjectInputStream(bis);
+                org.openide.util.io.NbObjectInputStream nbis = new org.openide.util.io.NbObjectInputStream(bis) {
+                    protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {
+                      ClassLoader cl = org.openide.TopManager.getDefault().currentClassLoader();
+                      try {
+                        return Class.forName(v.getName(), false, cl);
+                      } catch (ClassNotFoundException cnfe) {
+                      String msg = "Offending classloader: " + cl; // NOI18N
+                      ErrorManager.getDefault ().annotate(cnfe, ErrorManager.INFORMATIONAL, msg, null, null, null);
+                      throw cnfe;
+                    }
+                  }
+                };
                 Object o = nbis.readObject();
                 nbis.close();
                 return o;