[cxf] branch 3.1.x-fixes updated: Fixing last merge

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 3d49ef1  Fixing last merge
3d49ef1 is described below

commit 3d49ef18c6ce53af0510958c319c8ae09e5901d2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 27 15:19:11 2018 +0100

    Fixing last merge
---
 .../src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 5e95499..e0ae5b2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -538,8 +538,8 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        BusFactory.setDefaultBus(bus);
-        BusFactory.setThreadDefaultBus(bus);
+        SpringBusFactory.setDefaultBus(bus);
+        SpringBusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);

-- 
To stop receiving notification emails like this one, please contact
coheigea@apache.org.