Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 47259 invoked from network); 26 Apr 2010 18:54:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Apr 2010 18:54:53 -0000 Received: (qmail 37182 invoked by uid 500); 26 Apr 2010 18:54:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 37072 invoked by uid 500); 26 Apr 2010 18:54:52 -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 37061 invoked by uid 99); 26 Apr 2010 18:54:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:54:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 26 Apr 2010 18:54:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C9C42388994; Mon, 26 Apr 2010 18:54:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938191 - /cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java Date: Mon, 26 Apr 2010 18:54:07 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100426185407.2C9C42388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Mon Apr 26 18:54:06 2010 New Revision: 938191 URL: http://svn.apache.org/viewvc?rev=938191&view=rev Log: [CXF-2786]ws-rm Proxy should send SequenceAcknowledgement according to AcksTo URI header Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java?rev=938191&r1=938190&r2=938191&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java (original) +++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java Mon Apr 26 18:54:06 2010 @@ -75,7 +75,7 @@ public class Proxy { OperationInfo oi = reliableEndpoint.getEndpoint().getEndpointInfo().getService().getInterface() .getOperation(RMConstants.getSequenceAckOperationName()); - invoke(oi, new Object[] {}, null); + invoke(oi, new Object[] {ds}, null); } void terminate(SourceSequence ss) throws RMException { @@ -239,8 +239,23 @@ public class Proxy { Endpoint endpoint = reliableEndpoint.getEndpoint(); BindingInfo bi = reliableEndpoint.getBindingInfo(); Conduit c = reliableEndpoint.getConduit(); - org.apache.cxf.ws.addressing.EndpointReferenceType replyTo = reliableEndpoint.getReplyTo(); - Client client = createClient(bus, endpoint, c, replyTo); + Client client = null; + if (params.length > 0 && params[0] instanceof DestinationSequence) { + EndpointReferenceType acksTo = + ((DestinationSequence)params[0]).getAcksTo(); + String acksAddress = acksTo.getAddress().getValue(); + org.apache.cxf.ws.addressing.AttributedURIType attrURIType = + new org.apache.cxf.ws.addressing.AttributedURIType(); + attrURIType.setValue(acksAddress); + org.apache.cxf.ws.addressing.EndpointReferenceType acks = + new org.apache.cxf.ws.addressing.EndpointReferenceType(); + acks.setAddress(attrURIType); + client = createClient(bus, endpoint, c, acks); + params = new Object[] {}; + } else { + org.apache.cxf.ws.addressing.EndpointReferenceType replyTo = reliableEndpoint.getReplyTo(); + client = createClient(bus, endpoint, c, replyTo); + } BindingOperationInfo boi = bi.getOperation(oi); try {