procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/21785 (ClassNotFound during deserialization)

Browse source 
PR libgcj/21785:
	* java/io/natObjectInputStream.cc (currentClassLoader): Removed.
	(currentLoader): New method.
	* java/io/ObjectInputStream.java (resolveProxyClass): Use
	currentLoader.
	(currentLoader): Now native.
	(currentClassLoader): Removed.
	* testsuite/libjava.lang/pr21785.java: New file.
	* testsuite/libjava.lang/pr21785.out: New file.

From-SVN: r100462
This commit is contained in:
Tom Tromey 2005-06-01 19:58:25 +00:00 • committed by Tom Tromey
parent c3a29423de
commit cd3352b625
5 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libjava/java/io/ObjectInputStream.java
View file

@ -783,21 +783,11 @@ public class ObjectInputStream extends InputStream
}
/**
* This method invokes the method currentClassLoader for the
* current security manager (or build an empty one if it is not
* present).
*
* @return The most recent non-system ClassLoader on the execution stack.
* @see java.lang.SecurityManager#currentClassLoader()
* Returns he most recent user defined ClassLoader on the execution stack
* or null of none is found.
*/
private ClassLoader currentLoader()
{
SecurityManager sm = System.getSecurityManager();
if (sm == null)
sm = new SecurityManager () {};
return currentClassLoader(sm);
}
// GCJ LOCAL: native method.
private native ClassLoader currentLoader();
/**
* Lookup a class stored in the local hashtable. If it is not
@ -883,12 +873,7 @@ public class ObjectInputStream extends InputStream
protected Class resolveProxyClass(String[] intfs)
throws IOException, ClassNotFoundException
{
SecurityManager sm = System.getSecurityManager();
if (sm == null)
sm = new SecurityManager() {};
ClassLoader cl = currentClassLoader(sm);
ClassLoader cl = currentLoader();
Class[] clss = new Class[intfs.length];
if(cl == null)
@ -1866,15 +1851,6 @@ public class ObjectInputStream extends InputStream
}
}
/**
* This native method is used to get access to the protected method
* of the same name in SecurityManger.
*
* @param sm SecurityManager instance which should be called.
* @return The current class loader in the calling stack.
*/
private static native ClassLoader currentClassLoader (SecurityManager sm);
private void callReadMethod (Method readObject, Class klass, Object obj)
throws ClassNotFoundException, IOException
{