svn commit: r991490 - in /ofbiz/branches/release10.04: ./ framework/base/src/org/ofbiz/base/util/UtilIO.java

Author: jleroux
Date: Wed Sep  1 09:47:11 2010
New Revision: 991490

URL: http://svn.apache.org/viewvc?rev=991490&view=rev
Log:
"Applied fix from trunk for revision: 991485 "
------------------------------------------------------------------------
r991485 | jleroux | 2010-09-01 11:15:14 +0200 (mer. 01 sept. 2010) | 12 lignes

A patch from Liu Xiangqian "method writeObject(StringBuilder sb, Object value, boolean allowJsonResolve) in UtilIO always throw an IOException" (https://issues.apache.org/jira/browse/OFBIZ-3916) - OFBIZ-3916

Tried to invoke method UtilIO.writeObject() but found the following code

try {
StringWriter writer = new StringWriter();
if (encodeObject(writer, value, allowJsonResolve)) { sb.append(writer.toString()); return; }
} catch (Exception e) {
}
throw new IOException("Can't write (" + value + ")");

It caused the method to always throw an IOException.
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilIO.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  1 09:47:11 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485

Modified: ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilIO.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=991490&r1=991489&r2=991490&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilIO.java (original)
+++ ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilIO.java Wed Sep  1 09:47:11 2010
@@ -401,7 +401,7 @@ public final class UtilIO {
                 return;
             }
         } catch (Exception e) {
+            throw new IOException("Can't write (" + value + ")");            
         }
-        throw new IOException("Can't write (" + value + ")");
     }
 }