Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 30483 invoked from network); 10 Mar 2011 19:26:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Mar 2011 19:26:53 -0000 Received: (qmail 24972 invoked by uid 500); 10 Mar 2011 19:26:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24917 invoked by uid 500); 10 Mar 2011 19:26:53 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 24910 invoked by uid 99); 10 Mar 2011 19:26:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2011 19:26:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2011 19:26:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3961123889E7; Thu, 10 Mar 2011 19:26:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 10 Mar 2011 19:26:27 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110310192627.3961123889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);