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 72EB5DD3A for ; Fri, 16 Nov 2012 17:14:47 +0000 (UTC) Received: (qmail 62786 invoked by uid 500); 16 Nov 2012 17:14:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62717 invoked by uid 500); 16 Nov 2012 17:14:46 -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 62708 invoked by uid 99); 16 Nov 2012 17:14:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 17:14:46 +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, 16 Nov 2012 17:14:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0FDA62388A33; Fri, 16 Nov 2012 17:14:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1410478 - /cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java Date: Fri, 16 Nov 2012 17:14:24 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121116171425.0FDA62388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Nov 16 17:14:24 2012 New Revision: 1410478 URL: http://svn.apache.org/viewvc?rev=1410478&view=rev Log: Merged revisions 1410415 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1410415 | dkulp | 2012-11-16 10:58:44 -0500 (Fri, 16 Nov 2012) | 10 lines Merged revisions 1410182 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410182 | dkulp | 2012-11-15 22:11:35 -0500 (Thu, 15 Nov 2012) | 2 lines Make sure bus is shutdown ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java?rev=1410478&r1=1410477&r2=1410478&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java Fri Nov 16 17:14:24 2012 @@ -42,6 +42,7 @@ public class RMUtilsTest extends Assert @Before public void setUp() { + control = EasyMock.createNiceControl(); } @@ -79,15 +80,18 @@ public class RMUtilsTest extends Assert // this test makes sure that an automatically generated id will be // mapped to the static default bus name "cxf". + System.out.println("bus: " + BusFactory.getThreadDefaultBus(false)); control.reset(); EasyMock.expect(e.getEndpointInfo()).andReturn(ei).times(2); EasyMock.expect(ei.getName()).andReturn(eqn); EasyMock.expect(ei.getService()).andReturn(si); EasyMock.expect(si.getName()).andReturn(sqn); control.replay(); + Bus bus = BusFactory.getDefaultBus(); assertEquals("{ns1}service.{ns2}endpoint@" + Bus.DEFAULT_BUS_ID, - RMUtils.getEndpointIdentifier(e, BusFactory.getDefaultBus())); - + RMUtils.getEndpointIdentifier(e, bus)); + bus.shutdown(true); + // a generated bundle artifact bus control.reset(); EasyMock.expect(e.getEndpointInfo()).andReturn(ei).times(2);