Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 44982 invoked from network); 4 Dec 2009 21:01:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Dec 2009 21:01:34 -0000 Received: (qmail 39934 invoked by uid 500); 4 Dec 2009 21:01:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39856 invoked by uid 500); 4 Dec 2009 21:01:33 -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 39845 invoked by uid 99); 4 Dec 2009 21:01:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2009 21:01:33 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 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; Fri, 04 Dec 2009 21:01:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 56D3B23889BF; Fri, 4 Dec 2009 21:01:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887356 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ systests/ws-specs/ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/ systests/ws-specs/src/test/resourc... Date: Fri, 04 Dec 2009 21:01:09 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091204210111.56D3B23889BF@eris.apache.org> Author: dkulp Date: Fri Dec 4 21:01:08 2009 New Revision: 887356 URL: http://svn.apache.org/viewvc?rev=887356&view=rev Log: Merged revisions 887353 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r887353 | dkulp | 2009-12-04 15:49:40 -0500 (Fri, 04 Dec 2009) | 2 lines [CXF-2572] Fix problem of Message mode provider and oneway operations with ws-addressing. Test from Alexandros Karypidis provided. ........ Added: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/ - copied from r887353, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/MessageProviderWithAddressingPolicy.java - copied unchanged from r887353, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/MessageProviderWithAddressingPolicy.java cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java - copied unchanged from r887353, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml - copied unchanged from r887353, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/addr-jaxwsmm.wsdl - copied unchanged from r887353, cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/addr-jaxwsmm.wsdl Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 4 21:01:08 2009 @@ -1 +1 @@ -/cxf/trunk:887328 +/cxf/trunk:887328,887353 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java?rev=887356&r1=887355&r2=887356&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java Fri Dec 4 21:01:08 2009 @@ -147,6 +147,9 @@ private void doSoap(Message message) { MessageContentsList list = (MessageContentsList)message.getContent(List.class); + if (list == null || list.isEmpty()) { + return; + } Object o = list.get(0); if (o instanceof SOAPMessage) { SOAPMessage soapMessage = (SOAPMessage)o; Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml?rev=887356&r1=887355&r2=887356&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml Fri Dec 4 21:01:08 2009 @@ -74,6 +74,21 @@ ${project.version} + generate-addr-jaxwsmm-sources + generate-test-sources + + ${basedir}/target/generated/src/test/java + + + ${basedir}/src/test/resources/wsdl_systest_wsspec/addr-jaxwsmm.wsdl + + + + + wsdl2java + + + generate-wssec10-test-sources generate-test-sources