svn commit: r706693 - in /ofbiz/branches/release4.0: ./ framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java hot-deploy/

Author: jleroux
Date: Tue Oct 21 10:58:41 2008
New Revision: 706693

URL: http://svn.apache.org/viewvc?rev=706693&view=rev
Log:
Applied fix from trunk for revision: 706692

Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
    ofbiz/branches/release4.0/hot-deploy/   (props changed)

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 21 10:58:41 2008
@@ -1 +1 @@
-/ofbiz/trunk:674173,676162,676227,676246,679704,705862,706035,706055
+/ofbiz/trunk:674173,676162,676227,676246,679704,705862,706035,706055,706067,706692

Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=706693&r1=706692&r2=706693&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Tue Oct 21 10:58:41 2008
@@ -181,7 +181,7 @@
             Debug.logWarning("content was null, doing nothing", module);
             return 0;
         }
-        ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes());
+        ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes("UTF-8"));
 
         return this.parse(bis, "Internal Content");
     }

Propchange: ofbiz/branches/release4.0/hot-deploy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 21 10:58:41 2008
@@ -0,0 +1 @@
+hello3