Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7047195EB for ; Fri, 17 Feb 2012 15:04:58 +0000 (UTC) Received: (qmail 22102 invoked by uid 500); 17 Feb 2012 15:04:58 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 22046 invoked by uid 500); 17 Feb 2012 15:04:58 -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 22039 invoked by uid 99); 17 Feb 2012 15:04:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2012 15:04:58 +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; Fri, 17 Feb 2012 15:04:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9CBE82388A9B; Fri, 17 Feb 2012 15:04:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1245597 - in /cxf/branches/2.5.x-fixes: ./ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ Date: Fri, 17 Feb 2012 15:04:37 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120217150437.9CBE82388A9B@eris.apache.org> Author: ay Date: Fri Feb 17 15:04:37 2012 New Revision: 1245597 URL: http://svn.apache.org/viewvc?rev=1245597&view=rev Log: Merged revisions 1245591 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245591 | ay | 2012-02-17 15:59:36 +0100 (Fri, 17 Feb 2012) | 1 line add a robust-inonly test case with wsrm usage ........ Added: cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java - copied unchanged from r1245591, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml - copied unchanged from r1245591, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 17 15:04:37 2012 @@ -1 +1 @@ -/cxf/trunk:1244697,1244821,1244939,1245070,1245572 +/cxf/trunk:1244697,1244821,1244939,1245070,1245572,1245591 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?rev=1245597&r1=1245596&r2=1245597&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Fri Feb 17 15:04:37 2012 @@ -72,10 +72,10 @@ public class ControlImpl extends org.ap greeterBus.getOutFaultInterceptors().add(logOut); if (cfgResource.indexOf("provider") == -1) { - Endpoint.publish(address, implementor); + endpoint = Endpoint.publish(address, implementor); LOG.info("Published greeter endpoint."); } else { - Endpoint.publish(address, new GreeterProvider()); + endpoint = Endpoint.publish(address, new GreeterProvider()); LOG.info("Published greeter provider."); } } finally {