svn commit: r1855371 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java

Author: jleroux
Date: Wed Mar 13 08:19:32 2019
New Revision: 1855371

URL: http://svn.apache.org/viewvc?rev=1855371&view=rev
Log:
Improved: Improve ObjectInputStream class
(OFBIZ-10837)

The white list was still not complete as reported by Deepak at OFBIZ-10837
This adds https://issues.apache.org/jira/browse/OFBIZ-10837

It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.

Thanks: Deepak Dexit

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java?rev=1855371&r1=1855370&r2=1855371&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java Wed Mar 13 08:19:32 2019
@@ -143,8 +143,8 @@ public final class UtilObject {
                 SafeObjectInputStream wois = new SafeObjectInputStream(bis,
                         Thread.currentThread().getContextClassLoader(),
                         java.util.Arrays.asList("byte\\[\\]", "Number", "Long", "foo", "SerializationInjector",
-                                "java.util.HashMap", "Boolean", "Number", "Integer", "FlexibleStringExpander"));) {
-                        // byte[] used in EntityCrypto::doDecrypt, all others used in UtilObjectTests::testGetObject
+                                "java.util.HashMap", "Boolean", "Number", "Integer", "FlexibleStringExpander",
+                                "sun.util.calendar.ZoneInfo"));) {
             return wois.readObject();
         }
     }