fix crashes introduced with 3.0.2

Author: RuedigerMoeller

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.ruedigermoeller</groupId>
     <artifactId>fst</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.3</version>
     <packaging>bundle</packaging>
 
     <description>A fast java serialization drop in-replacement and some serialization based utils such as Structs and OffHeap Memory.</description>

src/main/java/org/nustaq/serialization/FSTClazzNameRegistry.java

@@ -20,7 +20,6 @@
 import org.nustaq.serialization.util.FSTUtil;
 
 import java.io.IOException;
-import java.lang.reflect.Proxy;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -183,8 +182,6 @@ public FSTClazzInfo decodeClass(FSTDecoder in, FSTConfiguration conf) throws IOE
         }
     }
 
-
-    private static final String JDKPROXYCLASSPREFIX = "com.sun.proxy.$Proxy"; // Might only work with Oracle JDK
     HashMap<String,Class> classCache = new HashMap<String, Class>(200);
     AtomicBoolean classCacheLock = new AtomicBoolean(false);
     public Class classForName(String clName, FSTConfiguration conf) throws ClassNotFoundException {
@@ -217,10 +214,7 @@ public Class classForName(String clName, FSTConfiguration conf) throws ClassNotF
                             }
                         }
                         return actorClz;
-                    } else if (clName.startsWith(JDKPROXYCLASSPREFIX)) {
-                        res = Proxy.class;
-                    }
-                    else {
+                    } else {
                         if ( conf.getLastResortResolver() != null ) {
                             Class aClass = conf.getLastResortResolver().getClass(clName);
                             if ( aClass != null )

src/main/java/org/nustaq/serialization/FSTConfiguration.java

@@ -501,7 +501,6 @@ protected static FSTConfiguration initDefaultFstConfigurationInternal(FSTConfigu
         reg.putSerializer(Hashtable.class, new FSTMapSerializer(), true);
         reg.putSerializer(ConcurrentHashMap.class, new FSTMapSerializer(), true);
         reg.putSerializer(Throwable.class, new FSTThrowableSerializer(),true);
-        reg.putSerializer(Proxy.class, new FSTProxySerializer(),true);
 
         reg.putSerializer(BitSet.class, new FSTBitSetSerializer(),true);
         reg.putSerializer(Timestamp.class, new FSTTimestampSerializer(),true);
@@ -838,8 +837,6 @@ void addDefaultClazzes() {
         classRegistry.registerClass(Timestamp.class, this);
         classRegistry.registerClass(Locale.class,this);
 
-        classRegistry.registerClass(Proxy.class,this);
-
         classRegistry.registerClass(StringBuffer.class,this);
         classRegistry.registerClass(StringBuilder.class,this);
 

src/main/java/org/nustaq/serialization/FSTObjectInput.java

@@ -901,6 +901,8 @@ protected Object readArrayNoHeader(FSTClazzInfo.FSTFieldInfo referencee, int pos
             return null;
         }
         Class arrType = arrCl.getComponentType();
+        if (arrType == null)
+            arrType = Object.class;
         if (!arrType.isArray()) {
             Object array = Array.newInstance(arrType, len);
             if ( ! referencee.isFlat() )