You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/09 15:41:14 UTC
svn commit: r1734247 - in /ofbiz/branches/release15.12: ./
framework/service/src/org/ofbiz/service/engine/HttpEngine.java
Author: jleroux
Date: Wed Mar 9 14:41:14 2016
New Revision: 1734247
URL: http://svn.apache.org/viewvc?rev=1734247&view=rev
Log:
"Applied fix from trunk for revision: 1734246"
------------------------------------------------------------------------
r1734246 | jleroux | 2016-03-09 15:40:33 +0100 (mer. 09 mars 2016) | 3 lignes
A patch from Oleg Andreyev for "Incorrect content length in response from HTTP service engine" https://issues.apache.org/jira/browse/OFBIZ-6925
Obvious error that cause deserialization errors on receiving side under some conditions because data extracted from response shorter than it really was sent.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/framework/service/src/org/ofbiz/service/engine/HttpEngine.java
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 14:41:14 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246
Modified: ofbiz/branches/release15.12/framework/service/src/org/ofbiz/service/engine/HttpEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=1734247&r1=1734246&r2=1734247&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original)
+++ ofbiz/branches/release15.12/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Wed Mar 9 14:41:14 2016
@@ -182,10 +182,10 @@ public class HttpEngine extends GenericA
response.setContentType("plain/text");
if (errorMessage.length() > 0) {
- response.setContentLength(errorMessage.length());
+ response.setContentLength(errorMessage.toString().getBytes().length);
out.write(errorMessage.toString());
} else {
- response.setContentLength(resultString.length());
+ response.setContentLength(resultString.getBytes().length);
out.write(resultString);
}