cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [4/6] git commit: Fix checkstyle issue and compile failure after merge
Date Mon, 05 May 2014 19:41:51 GMT
Fix checkstyle issue and compile failure after merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1cf944c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1cf944c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1cf944c

Branch: refs/heads/2.7.x-fixes
Commit: d1cf944c868a528d4d6d11c21937585c83afe13b
Parents: e8a751f
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon May 5 14:54:26 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon May 5 15:30:37 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/cxf/transport/jms/JMSDestination.java     | 3 +--
 .../org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d1cf944c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index 8ffdc6e..a0662f9 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -106,8 +106,7 @@ public class JMSDestination extends AbstractMultiplexDestination
      */
     protected Conduit getInbuiltBackChannel(Message inMessage) {
         //with JMS, non-robust OneWays will never need to send back a response, even a "202"
response.
-        boolean robust =
-        MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
+        boolean robust = MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
         if (inMessage.getExchange().isOneWay()
             && !robust) {
             return null;

http://git-wip-us.apache.org/repos/asf/cxf/blob/d1cf944c/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
index 00d54f4..334b9f0 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
@@ -148,13 +148,15 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
     }
     @Test
     public void testWSAddressingWithJms() throws Exception {
+        Bus bus = BusFactory.getDefaultBus();
+        BusFactory.setDefaultBus(bus);
+
         QName serviceName = new QName("http://apache.org/hello_world_doc_lit", 
                                  "SOAPService8");
         QName portName = new QName("http://apache.org/hello_world_doc_lit", "SoapPort8");
         URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
         SOAPService2 service = new SOAPService2(wsdl, serviceName);
-        Greeter greeter = markForClose(service.getPort(portName, Greeter.class, 
-                                                       cff, new AddressingFeature()));
+        Greeter greeter = service.getPort(portName, Greeter.class, new AddressingFeature());
 
         for (int idx = 0; idx < 5; idx++) {
 
@@ -174,5 +176,6 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
             }
 
         }
+        bus.shutdown(true);
     }
 }


Mime
View raw message