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:
parent
e3e3815b7f
commit
d74732f5cd
28 changed files with 1175 additions and 156 deletions
|
@ -39,13 +39,56 @@ package gnu.java.rmi.server;
|
|||
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.Class;
|
||||
import gnu.java.security.provider.SHA;
|
||||
import gnu.java.io.NullOutputStream;
|
||||
import gnu.java.lang.reflect.TypeSignature;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.DigestOutputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
public class RMIHashes
|
||||
{
|
||||
//There're other places using DigestOutputStream to generate hash in classpath, but I think the way I used
|
||||
//here is more efficient, anyway, you can switch to DigestOutputStream by doing like "//or:" comments say.
|
||||
|
||||
//or:add this statement: private static final NullOutputStream nullOutputStream = new NullOutputStream ();
|
||||
public static long getMethodHash(Method meth)
|
||||
{
|
||||
return meth.hashCode ();
|
||||
//Object Serialization Spec 8.3
|
||||
try
|
||||
{
|
||||
MessageDigest md = MessageDigest.getInstance ("SHA");
|
||||
//or:remove this statement: DigestOutputStream digest_out = new DigestOutputStream (nullOutputStream, md);
|
||||
ByteArrayOutputStream digest_out = new ByteArrayOutputStream();
|
||||
DataOutputStream data_out = new DataOutputStream (digest_out);
|
||||
|
||||
StringBuffer sbuf = new StringBuffer();
|
||||
sbuf.append(meth.getName());
|
||||
sbuf.append('(');
|
||||
Class params[] = meth.getParameterTypes();
|
||||
for(int i = 0; i < params.length; i++)
|
||||
sbuf.append(TypeSignature.getEncodingOfClass(params[i]));
|
||||
sbuf.append(')');
|
||||
Class rcls = meth.getReturnType();
|
||||
if(rcls != Void.TYPE)
|
||||
sbuf.append(TypeSignature.getEncodingOfClass(rcls));
|
||||
else
|
||||
sbuf.append('V');
|
||||
|
||||
data_out.writeUTF (sbuf.toString());
|
||||
data_out.flush();
|
||||
data_out.close ();
|
||||
|
||||
md.update(digest_out.toByteArray()); //or:remove this statement
|
||||
byte[] sha = md.digest ();
|
||||
long result = 0;
|
||||
int len = sha.length < 8 ? sha.length : 8;
|
||||
for (int i=0; i < len; i++)
|
||||
result += (long)(sha[i] & 0xFF) << (8 * i);
|
||||
return result;
|
||||
}catch(Exception _){
|
||||
return -1L;
|
||||
}
|
||||
}
|
||||
|
||||
public static long getInterfaceHash(Class clazz)
|
||||
|
@ -53,3 +96,4 @@ public class RMIHashes
|
|||
return clazz.hashCode ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue