Author: jleroux
Date: Tue May 15 19:28:23 2012
New Revision: 1338848
URL: http://svn.apache.org/viewvc?rev=1338848&view=rev
Log:
"Applied fix from trunk for revision: 1338845"
------------------------------------------------------------------------
r1338845 | jleroux | 2012-05-15 21:26:39 +0200 (mar., 15 mai 2012) | 1 line
Fixes and complete r1338831
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1338845
Modified:
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java?rev=1338848&r1=1338847&r2=1338848&view=diff
==============================================================================
---
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
(original)
+++
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
Tue May 15 19:28:23 2012
@@ -469,7 +469,7 @@ public class UelFunctions {
File file = FileUtil.getFile(str);
if (file != null) {
FileOutputStream os = new FileOutputStream(file);
- UtilXml.writeXmlDocument(node, os, encoding,
omitXmlDeclaration, indent, indentAmount);
+ UtilXml.writeXmlDocument(node, os, encoding,
omitXmlDeclaration, indent, indentAmount, false);
os.close();
return true;
} else {
@@ -515,7 +515,7 @@ public class UelFunctions {
public static String toXmlString(Node node, String encoding, boolean
omitXmlDeclaration, boolean indent, int indentAmount) {
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- UtilXml.writeXmlDocument(node, os, encoding, omitXmlDeclaration,
indent, indentAmount);
+ UtilXml.writeXmlDocument(node, os, encoding, omitXmlDeclaration,
indent, indentAmount, false);
os.close();
return os.toString();
} catch (Exception e) {
