--- a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	Fri Jul 22 21:14:56 2011 +0400
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	Tue Aug 30 14:30:03 2011 -0700
@@ -390,6 +390,12 @@
             ObjectInput in;
             try {
                 in = call.getInputStream();
+                try {
+                    Class<?> clazz = Class.forName("sun.rmi.transport.DGCImpl_Skel");
+                    if (clazz.isAssignableFrom(skel.getClass())) {
+                        ((MarshalInputStream)in).useCodebaseOnly();
+                    }
+                } catch (ClassNotFoundException ignore) { }
                 hash = in.readLong();
             } catch (Exception readEx) {
                 throw new UnmarshalException("error unmarshalling call header",