You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/03/28 15:37:07 UTC
svn commit: r1856485 - in /ofbiz/ofbiz-framework/branches/release18.12: ./
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
Author: jleroux
Date: Thu Mar 28 15:37:07 2019
New Revision: 1856485
URL: http://svn.apache.org/viewvc?rev=1856485&view=rev
Log:
"Applied fix from trunk for revision: 1856484"
------------------------------------------------------------------------
r1856484 | jleroux | 2019-03-28 16:36:13 +0100 (jeu. 28 mars 2019) | 13 lignes
Improved: Improve ObjectInputStream class
(OFBIZ-10837)
The white list was still not complete as reported by Ed Mack
This adds
org.apache.ofbiz.widget.model.ModelTheme
java.util.Collections
java.util.LinkedList
java.util.ArrayList
java.util.TimeZonz
Thanks: Ed Mack at OFBIZ-10876
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 28 15:37:07 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484
Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java?rev=1856485&r1=1856484&r2=1856485&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java Thu Mar 28 15:37:07 2019
@@ -146,7 +146,10 @@ public final class UtilObject {
"java.util.HashMap", "Boolean", "Number", "Integer", "FlexibleStringExpander",
"sun.util.calendar.ZoneInfo", "java.sql.Timestamp", "java.util.Date",
"java.math.BigDecimal", "\\[Z","\\[B","\\[S","\\[I","\\[J","\\[F","\\[D","\\[C",
- "org.apache.ofbiz.widget.renderer.VisualTheme"));) {
+ "org.apache.ofbiz.widget.renderer.VisualTheme",
+ "org.apache.ofbiz.widget.model.ModelTheme",
+ "java.util.Collections", "java.util.LinkedList", "java.util.ArrayList",
+ "java.util.TimeZone"));) {
return wois.readObject();
}
}