Merge pull request #61 from apache/3.2.13-release

3.2.13 release

.travis.yml

@@ -3,8 +3,6 @@ sudo: false # faster builds
 
 jdk:
     - openjdk11
-    - openjdk10
-    - openjdk9
     - openjdk8
    #   - openjdk7
 

pom.xml

@@ -27,7 +27,7 @@
     <groupId>com.alibaba</groupId>
     <artifactId>hessian-lite</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.12</version>
+    <version>3.2.13</version>
     <name>Hessian Lite(Dubbo embed version)</name>
 
     <properties>

src/main/java/com/alibaba/com/caucho/hessian/io/SerializerFactory.java

@@ -343,11 +343,6 @@ public Serializer getSerializer(Class cl)
             serializer = factory.getSerializer(cl);
         }
 
-        if (!Serializable.class.isAssignableFrom(cl)
-                && !_isAllowNonSerializable) {
-            throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
-        }
-
         if (serializer != null) {
 
         } else if (isZoneId(cl)) //must before "else if (JavaSerializer.getWriteReplace(cl) != null)"
@@ -419,6 +414,11 @@ protected Serializer getDefaultSerializer(Class cl) {
         if (_defaultSerializer != null)
             return _defaultSerializer;
 
+        if (!Serializable.class.isAssignableFrom(cl)
+                && !_isAllowNonSerializable) {
+            throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
+        }
+
         return new JavaSerializer(cl, _loader);
     }
 
@@ -453,11 +453,6 @@ public Deserializer getDeserializer(Class cl)
             deserializer = factory.getDeserializer(cl);
         }
 
-        if (!Serializable.class.isAssignableFrom(cl)
-                && !_isAllowNonSerializable) {
-            throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
-        }
-
         if (deserializer != null) {
         } else if (Collection.class.isAssignableFrom(cl))
             deserializer = new CollectionDeserializer(cl);
@@ -500,6 +495,11 @@ else if (Class.class.equals(cl))
      * @return a serializer object for the serialization.
      */
     protected Deserializer getDefaultDeserializer(Class cl) {
+        if (!Serializable.class.isAssignableFrom(cl)
+                && !_isAllowNonSerializable) {
+            throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
+        }
+
         return new JavaDeserializer(cl);
     }
 

src/main/resources/DENY_CLASS

@@ -73,6 +73,7 @@ org.apache.commons.beanutils.
 org.apache.commons.codec.binary.
 org.apache.commons.collections.functors.
 org.apache.commons.collections4.functors.
+org.apache.commons.codec.
 org.apache.commons.configuration.
 org.apache.commons.configuration2.
 org.apache.commons.dbcp.datasources.
@@ -97,9 +98,10 @@ org.apache.xalan.xsltc.trax.
 org.apache.xbean.naming.context.
 org.apache.xpath.
 org.apache.zookeeper.
-org.aspectj.apache.bcel.util.
+org.aspectj.
 org.codehaus.groovy.runtime.
 org.datanucleus.store.rdbms.datasource.dbcp.datasources.
+org.dom4j.
 org.eclipse.jetty.util.log.
 org.geotools.filter.
 org.h2.value.
@@ -109,8 +111,11 @@ org.jboss.ejb3.
 org.jboss.proxy.ejb.
 org.jboss.resteasy.plugins.server.resourcefactory.
 org.jboss.weld.interceptor.builder.
+org.junit.
 org.mockito.internal.creation.cglib.
 org.mortbay.log.
+org.mockito.
+org.thymeleaf.
 org.quartz.
 org.springframework.aop.aspectj.
 org.springframework.beans.BeanWrapperImpl$BeanPropertyHandler
@@ -120,7 +125,9 @@ org.springframework.jndi.
 org.springframework.orm.
 org.springframework.transaction.
 org.yaml.snakeyaml.tokens.
+ognl.
 pstore.shaded.org.apache.commons.collections.
+sun.print.
 sun.rmi.server.
 sun.rmi.transport.
 weblogic.ejb20.internal.