andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not use ObjectStreamClass.lookupAny() to resolve interfaces

Browse Source 
Fixes #130
This commit is contained in:
Trustin Lee 2011-12-15 16:35:27 +09:00
parent 8145ad96f6
commit c6ef712503
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
View File

@ -55,8 +55,6 @@ class CompactObjectInputStream extends ObjectInputStream {
case CompactObjectOutputStream.TYPE_THIN_DESCRIPTOR: case CompactObjectOutputStream.TYPE_THIN_DESCRIPTOR:
String className = readUTF(); String className = readUTF();
Class<?> clazz = classResolver.resolve(className); Class<?> clazz = classResolver.resolve(className);
// change lookupAny to lookup as lookupAny is only supported in java6
return ObjectStreamClass.lookup(clazz); return ObjectStreamClass.lookup(clazz);
default: default:
throw new StreamCorruptedException( throw new StreamCorruptedException(

3
src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
View File

@ -19,6 +19,7 @@ import java.io.IOException;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass; import java.io.ObjectStreamClass;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.Serializable;
/** /**
*/ */
@ -39,7 +40,7 @@ class CompactObjectOutputStream extends ObjectOutputStream {
@Override @Override
protected void writeClassDescriptor(ObjectStreamClass desc) throws IOException { protected void writeClassDescriptor(ObjectStreamClass desc) throws IOException {
Class<?> clazz = desc.forClass(); Class<?> clazz = desc.forClass();
if (clazz.isPrimitive() || clazz.isArray()) { if (clazz.isPrimitive() || clazz.isArray() || desc.getSerialVersionUID() == 0) {
write(TYPE_FAT_DESCRIPTOR); write(TYPE_FAT_DESCRIPTOR);
super.writeClassDescriptor(desc); super.writeClassDescriptor(desc);
} else { } else {