Author: jleroux
Date: Tue May 15 19:39:36 2012
New Revision: 1338858
URL: http://svn.apache.org/viewvc?rev=1338858&view=rev
Log:
"Applied fix from trunk for revision: 1338856"
------------------------------------------------------------------------
r1338856 | jleroux | 2012-05-15 21:37:49 +0200 (mar., 15 mai 2012) | 4 lines
Definitively fixes and completes r1338831
Arg, I should have used the Eclipse refactor feature :/
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1338856
Modified:
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1338858&r1=1338857&r2=1338858&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
(original)
+++
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Tue May 15 19:39:36 2012
@@ -891,7 +891,7 @@ public class CCPaymentServices {
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0);
+ UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0, false);
} catch (TransformerException e) {
throw new ClearCommerceException("Error serializing
requestDocument: " + e.getMessage());
}
Modified:
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java?rev=1338858&r1=1338857&r2=1338858&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
(original)
+++
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
Tue May 15 19:39:36 2012
@@ -127,7 +127,7 @@ public class UspsMockApiServlet extends
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true,
false, 0);
+ UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true,
false, 0, false);
} catch (TransformerException e) {
Debug.logInfo(e, module);
return;
Modified:
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1338858&r1=1338857&r2=1338858&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
(original)
+++
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
Tue May 15 19:39:36 2012
@@ -1713,7 +1713,7 @@ public class UspsServices {
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0);
+ UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0, false);
} catch (TransformerException e) {
throw new UspsRequestException(
UtilProperties.getMessage(resourceError,
