You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/29 20:37:40 UTC

svn commit: r1518750 - /cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java

Author: dkulp
Date: Thu Aug 29 18:37:39 2013
New Revision: 1518750

URL: http://svn.apache.org/r1518750
Log:
Merged revisions 1518748 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1518748 | dkulp | 2013-08-29 14:32:07 -0400 (Thu, 29 Aug 2013) | 2 lines

  Hold onto the JMS wsdl URL strongly for the life of the test to make sure the proper wsdl is used.

........

Modified:
    cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?rev=1518750&r1=1518749&r2=1518750&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Thu Aug 29 18:37:39 2013
@@ -55,6 +55,7 @@ public abstract class AbstractJMSTester 
     protected EndpointReferenceType target;
     protected MessageObserver observer;
     protected Message inMessage;
+    protected String wsdlURL;
 
     public static void startBroker(JMSBrokerSetup b) throws Exception {
         assertNotNull(b);
@@ -81,13 +82,15 @@ public abstract class AbstractJMSTester 
         if (System.getProperty("cxf.config.file") != null) {
             System.clearProperty("cxf.config.file");
         }
+        wsdlURL = null;
     }
 
     protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
         URL wsdlUrl = getClass().getResource(wsdl);
+        wsdlURL = wsdlUrl.toString();
         assertNotNull(wsdlUrl);
-        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, wsdlUrl.toString());
-        WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName));
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, wsdlURL);
+        WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlURL, new QName(ns, serviceName));
 
         Service service = factory.create();
         endpointInfo = service.getEndpointInfo(new QName(ns, portName));