mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 23:25:24 +02:00
ObjectInputStream.java (resolveProxyClass): New method from Classpath.
* java/io/ObjectInputStream.java (resolveProxyClass): New method from Classpath. * Makefile.in: Rebuilt. * Makefile.am (rmi_java_source_files): Added new files. * gnu/java/rmi/RMIMarshalledObjectInputStream.java, gnu/java/rmi/RMIMarshalledObjectOutputStream.java, gnu/java/rmi/server/ConnectionRunnerPool.java: New files from Classpath. * gnu/java/rmi/dgc/DGCImpl.java, gnu/java/rmi/dgc/DGCImpl_Skel.java, gnu/java/rmi/dgc/DGCImpl_Stub.java, gnu/java/rmi/registry/RegistryImpl_Skel.java, gnu/java/rmi/registry/RegistryImpl_Stub.java, gnu/java/rmi/server/RMIHashes.java, gnu/java/rmi/server/RMIObjectInputStream.java, gnu/java/rmi/server/RMIObjectOutputStream.java, gnu/java/rmi/server/UnicastConnection.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/rmi/server/UnicastRef.java, gnu/java/rmi/server/UnicastServer.java, gnu/java/rmi/server/UnicastServerRef.java, java/rmi/MarshalledObject.java, java/rmi/server/RMIClassLoader.java, java/rmi/server/RemoteObject.java, java/rmi/server/UnicastRemoteObject.java, java/security/SecureClassLoader.java: Merged from Classpath. From-SVN: r57675
This commit is contained in:
@@ -71,7 +71,7 @@ public class SecureClassLoader extends ClassLoader
|
||||
@param b the data representing the classfile, in classfile format.
|
||||
@param off the offset into the data where the classfile starts.
|
||||
@param len the length of the classfile data in the array.
|
||||
@param cs the CodeSource for the class
|
||||
@param cs the CodeSource for the class or null when unknown.
|
||||
|
||||
@return the class that was defined and optional CodeSource.
|
||||
|
||||
@@ -81,16 +81,14 @@ public class SecureClassLoader extends ClassLoader
|
||||
CodeSource cs)
|
||||
{
|
||||
// FIXME: Need to cache ProtectionDomains according to 1.3 docs.
|
||||
ProtectionDomain protectionDomain =
|
||||
new ProtectionDomain(cs, getPermissions(cs));
|
||||
try
|
||||
if (cs != null)
|
||||
{
|
||||
ProtectionDomain protectionDomain
|
||||
= new ProtectionDomain(cs, getPermissions(cs));
|
||||
return super.defineClass(name, b, off, len, protectionDomain);
|
||||
}
|
||||
catch (ClassFormatError cfe)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else
|
||||
return super.defineClass(name, b, off, len);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user