cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1373720 - in /cxf/branches/2.5.x-fixes: rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
Date Thu, 16 Aug 2012 03:28:11 GMT
Author: ffang
Date: Thu Aug 16 03:28:11 2012
New Revision: 1373720

URL: http://svn.apache.org/viewvc?rev=1373720&view=rev
Log:
[CXF-4475]LoggingInInterceptor throws when pretty printing MTOM messages

Modified:
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
    cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java?rev=1373720&r1=1373719&r2=1373720&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
Thu Aug 16 03:28:11 2012
@@ -147,7 +147,8 @@ public abstract class AbstractLoggingInt
                                 String encoding, String contentType) 
         throws Exception {
         // Just transform the XML message when the cos has content
-        if (isPrettyLogging() && (contentType != null && contentType.indexOf("xml")
>= 0) && cos.size() > 0) {
+        if (isPrettyLogging() && (contentType != null && contentType.indexOf("xml")
>= 0 
+            && contentType.toLowerCase().indexOf("multipart/related") < 0) &&
cos.size() > 0) {
             Transformer serializer = XMLUtils.newTransformer(2);
             // Setup indenting to "pretty print"
             serializer.setOutputProperty(OutputKeys.INDENT, "yes");

Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java?rev=1373720&r1=1373719&r2=1373720&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
Thu Aug 16 03:28:11 2012
@@ -69,7 +69,7 @@ public class MTOMTest extends AbstractBu
         }
     }
     
-    @Logging
+    @Logging(pretty = true)
     @WebService
     @MTOM(threshold = 1)
     public interface MTOMService {



Mime
View raw message