svn commit: r1080328 - in /cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/ core/src/main/java/org/apache/cxf/endpoint/

[dkulp]

Author: dkulp
Date: Thu Mar 10 19:26:26 2011
New Revision: 1080328

URL: http://svn.apache.org/viewvc?rev=1080328&view=rev
Log:
[CXF-3366] More work to enable delayed body parsing

Modified:
    
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
    
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=1080328&r1=1080327&r2=1080328&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
 Thu Mar 10 19:26:26 2011
@@ -152,7 +152,7 @@ public class ReadHeadersInterceptor exte
 
                 Node nd = message.getContent(Node.class);
                 Document doc = null;
-                if (nd instanceof Document && 
((Document)nd).getDocumentElement() == null) {
+                if (nd instanceof Document) {
                     doc = (Document)nd;
                     StaxUtils.readDocElements(doc, doc, filteredReader, false, 
false);
                 } else {

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?rev=1080328&r1=1080327&r2=1080328&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 Thu Mar 10 19:26:26 2011
@@ -133,7 +133,7 @@ public class SAAJInInterceptor extends A
                 message.setContent(SOAPMessage.class, soapMessage);
                 
                 SOAPPart part = soapMessage.getSOAPPart();
-                message.setContent(Document.class, part);
+                message.setContent(Node.class, part);
                 message.put(BODY_FILLED_IN, Boolean.FALSE);
 
             } catch (RuntimeException ex) {

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1080328&r1=1080327&r2=1080328&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java 
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu 
Mar 10 19:26:26 2011
@@ -642,6 +642,7 @@ public class ClientImpl
             message.getExchange().put(Endpoint.class, endpoint);
         }
         message = endpoint.getBinding().createMessage(message);
+        message.getExchange().setInMessage(message);
         message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
         message.put(Message.INBOUND_MESSAGE, Boolean.TRUE);
         PhaseManager pm = bus.getExtension(PhaseManager.class);