Author: cmailleux
Date: Thu Jul 12 19:00:16 2007
New Revision: 17986
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17986&repname=
=3Djahia
Log:
Port [17917] Correctly calculate size in bytes
Modified:
trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorService.ja=
va
Modified: trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorServ=
ice.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/esi/EsiSOAPInvalidatorService.java&rev=3D17986&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorService.ja=
va (original)
+++ trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorService.ja=
va Thu Jul 12 19:00:16 2007
@@ -164,7 +164,11 @@
=
//TODO: gzip the invalidation message if it is big
post.setRequestBody(soapRequest);
- post.setRequestContentLength(soapRequest.length());
+ try {
+ post.setRequestContentLength(soapRequest.getBytes("UTF-8")=
.length);
+ } catch (UnsupportedEncodingException e) {
+ logger.error("Cannot decode SOAP Message in UTF-8");
+ }
post.setRequestHeader("Content-type", "text/xml; charset=3Dutf=
-8");
=
String responseXML =3D null;
@@ -327,16 +331,18 @@
boolean includeAbsoluteFr=
ags,
boolean includeNonAbsolut=
eFrags) {
StringBuffer invMessage =3D new StringBuffer();
-
+ if(pids!=3Dnull && pids.size()>0) {
String pageInvMessage =3D ServicesRegistry.getInstance().getEsiInv=
alidationWriterService()
.getPageAndAllFragsInvalidationString(pc, pids, includeAbs=
oluteFrags, includeNonAbsoluteFrags);
-
+ invMessage.append(pageInvMessage);
+ }
+ if(users!=3Dnull && users.size()>0) {
String userInvMessage =3D ServicesRegistry.getInstance().getEsiInv=
alidationWriterService()
.getHeaderBasedUserInvalidationString (users);
=
- invMessage.append(pageInvMessage);
invMessage.append(userInvMessage);
=
+ }
if (invMessage.length()>0) {
String soapRequest =3D ServicesRegistry.getInstance().getEsiIn=
validationWriterService().addSOAPXMLWrapper(invMessage.toString());
if (logger.isDebugEnabled())
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
