Author: jleroux
Date: Fri Apr 12 09:29:52 2019
New Revision: 1857395
URL: http://svn.apache.org/viewvc?rev=1857395&view=rev
Log:
"Applied fix from trunk framework for revision: 1857392 "
------------------------------------------------------------------------
r1857392 | jleroux | 2019-04-12 11:29:03 +0200 (ven. 12 avr. 2019) | 14 lignes
Improved: Improve ObjectInputStream class
(OFBIZ-10837)
Cleans and simplifies things in UtilObject.java and also handles patterns.
That's what we missed most when needing to update.
Fixes typos in SafeObjectInputStream class and add a commented line for a WIP in
resolveProxyClass method
Also includes work done in UtilObject.java for OFBIZ-9855
"Using try-with-resources with File IO Objects."
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/build.gradle
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/SafeObjectInputStream.java
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
ofbiz/branches/release16.11/specialpurpose/example/build.gradle
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 12 09:29:52 2019
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566
67,1857180,1857213
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566
67,1857180,1857213,1857392
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/build.gradle?rev=1857395&r1=1857394&r2=1857395&view=diff
==============================================================================
--- ofbiz/branches/release16.11/build.gradle (original)
+++ ofbiz/branches/release16.11/build.gradle Fri Apr 12 09:29:52 2019
@@ -123,10 +123,10 @@ dependencies {
compile 'org.apache.shiro:shiro-core:1.3.0'
compile 'org.apache.tika:tika-core:1.12'
compile 'org.apache.tika:tika-parsers:1.12'
- compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.38'
- compile 'org.apache.tomcat:tomcat-catalina:8.5.38'
- compile 'org.apache.tomcat:tomcat-jasper:8.5.38'
- compile 'org.apache.tomcat:tomcat-tribes:8.5.38'
+ compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.40'
+ compile 'org.apache.tomcat:tomcat-catalina:8.5.40'
+ compile 'org.apache.tomcat:tomcat-jasper:8.5.40'
+ compile 'org.apache.tomcat:tomcat-tribes:8.5.40'
compile 'org.apache.xmlgraphics:fop:2.1'
compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
Modified:
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/SafeObjectInputStream.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/SafeObjectInputStream.java?rev=1857395&r1=1857394&r2=1857395&view=diff
==============================================================================
---
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/SafeObjectInputStream.java
(original)
+++
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/SafeObjectInputStream.java
Fri Apr 12 09:29:52 2019
@@ -60,9 +60,9 @@ public class SafeObjectInputStream exten
@Override
protected Class<?> resolveClass(ObjectStreamClass classDesc) throws
IOException, ClassNotFoundException {
if (!WHITELIST_PATTERN.matcher(classDesc.getName()).find()) {
- Debug.logWarning("************************Incompatible class: " +
classDesc.getName() +
+ Debug.logWarning("***Incompatible class***: " +
classDesc.getName() +
". Please see OFBIZ-10837. Report to dev ML if you use
OFBiz without changes. "
- + "Else add you class into
UtilObject::getObjectException", "SafeObjectInputStream");
+ + "Else add your class into
UtilObject::getObjectException", "SafeObjectInputStream");
throw new ClassCastException("Incompatible class: " +
classDesc.getName());
}
@@ -78,7 +78,8 @@ public class SafeObjectInputStream exten
for (int i = 0; i < interfaces.length; i++) {
cinterfaces[i] = classloader.loadClass(interfaces[i]);
}
-
+ //Proxy.getInvocationHandler(proxy)
+
try {
return Proxy.getProxyClass(classloader, cinterfaces);
} catch (IllegalArgumentException e) {
Modified:
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java?rev=1857395&r1=1857394&r2=1857395&view=diff
==============================================================================
---
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
(original)
+++
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
Fri Apr 12 09:29:52 2019
@@ -45,65 +45,27 @@ public final class UtilObject {
public static byte[] getBytes(InputStream is) {
byte[] buffer = new byte[4 * 1024];
byte[] data = null;
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try {
-
- int numBytesRead;
- while ((numBytesRead = is.read(buffer)) != -1) {
- bos.write(buffer, 0, numBytesRead);
- }
- data = bos.toByteArray();
- } finally {
- bos.close();
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()){
+ int numBytesRead;
+ while ((numBytesRead = is.read(buffer)) != -1) {
+ bos.write(buffer, 0, numBytesRead);
}
+ data = bos.toByteArray();
} catch (IOException e) {
Debug.logError(e, module);
- } finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException e) {
- Debug.logError(e, module);
- }
}
-
return data;
}
/** Serialize an object to a byte array */
public static byte[] getBytes(Object obj) {
byte[] data = null;
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try {
- ObjectOutputStream oos = new ObjectOutputStream(bos);
- try {
- oos.writeObject(obj);
- data = bos.toByteArray();
- } catch (IOException e) {
- Debug.logError(e, module);
- } finally {
- oos.flush();
- oos.close();
- }
- } catch (IOException e) {
- // I don't know how to force an error during flush or
- // close of ObjectOutputStream; since OOS is wrapping
- // BAOS, and BAOS does not throw IOException during
- // write, I don't think this can happen.
- Debug.logError(e, module);
- } finally {
- bos.close();
- }
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+ oos.writeObject(obj);
+ data = bos.toByteArray();
} catch (IOException e) {
- // How could this ever happen? BAOS.close() is listed as
- // throwing the exception, but I don't understand why this
- // is.
Debug.logError(e, module);
}
-
return data;
}
@@ -145,14 +107,10 @@ public final class UtilObject {
try (ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
SafeObjectInputStream wois = new SafeObjectInputStream(bis,
Thread.currentThread().getContextClassLoader(),
- java.util.Arrays.asList("byte\\[\\]", "Number",
"Long", "foo", "SerializationInjector",
- "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.model.ModelTheme",
- "java.util.Collections",
"java.util.LinkedList", "java.util.ArrayList",
- "java.util.TimeZone"));) {
+ java.util.Arrays.asList("byte\\[\\]", "foo",
"SerializationInjector",
+
"\\[Z","\\[B","\\[S","\\[I","\\[J","\\[F","\\[D","\\[C",
+ "java..*", "sun.util.calendar..*",
"org.apache.ofbiz..*"));) {
+ // "foo" and, "SerializationInjector" are used in
UtilObjectTests::testGetObject
return wois.readObject();
}
}
Modified: ofbiz/branches/release16.11/specialpurpose/example/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/build.gradle?rev=1857395&r1=1857394&r2=1857395&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/example/build.gradle (original)
+++ ofbiz/branches/release16.11/specialpurpose/example/build.gradle Fri Apr 12
09:29:52 2019
@@ -1,3 +1,3 @@
dependencies {
- pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.38'
+ pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.40'
}
\ No newline at end of file
