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

Make sure CompactObjectInputStream fall back to old behavior so make it compatible with older versions of netty which are used on the other end. See #452

Browse Source
This commit is contained in:
norman 2012-07-13 07:19:46 +02:00
parent 629cf073e1
commit 6c181af6b9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,19 @@ class CompactObjectInputStream extends ObjectInputStream {
case CompactObjectOutputStream.TYPE_THIN_DESCRIPTOR:
String className = readUTF();
Class<?> clazz = classResolver.resolve(className);
return ObjectStreamClass.lookup(clazz);
ObjectStreamClass streamClass = ObjectStreamClass.lookup(clazz);
if (streamClass == null) {
// If streamClass is null its very likely that we had an old netty version that was writing an
// interface with a thin descriptor. Fall back to use ObjectStreamClazz.lookupAny(..) to resolve
// it.
//
// This will only work on java6+ but if we hit this line its very likely that a user is upgrading
// from netty 3.2.x which was using the method before and so use java6+.
//
// See https://github.com/netty/netty/commit/6c2eba79d70a532822a0e38092faa9783d90906b
streamClass = ObjectStreamClass.lookupAny(clazz);
}
return streamClass;
default:
throw new StreamCorruptedException(
"Unexpected class descriptor type: " + type);