Author: ay Date: Fri Feb 17 15:10:55 2012 New Revision: 1245601 URL: http://svn.apache.org/viewvc?rev=1245601&view=rev Log: Merged revisions 1245597 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1245597 | ay | 2012-02-17 16:04:37 +0100 (Fri, 17 Feb 2012) | 9 lines 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.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java - copied unchanged from r1245597, cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml - copied unchanged from r1245597, cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 17 15:10:55 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1245597 +/cxf/trunk:1245591 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.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.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?rev=1245601&r1=1245600&r2=1245601&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original) +++ cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Fri Feb 17 15:10:55 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 {
