diff -r a78533d1bbc6 -r f51518b30c84 jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java --- a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java Fri Oct 21 18:01:01 2011 +0900 +++ b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java Mon Oct 24 20:55:08 2011 +0100 @@ -262,7 +262,9 @@ * Returns the first non-null class loader up the execution stack, or null * if only code from the null class loader is on the stack. */ - private static native ClassLoader latestUserDefinedLoader(); + private static ClassLoader latestUserDefinedLoader() { + return sun.misc.VM.latestUserDefinedLoader(); + } /** * Fix for 4179055: Need to assist resolving sun stubs; resolve