[hornetq-commits] JBoss hornetq SVN: r10165 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/ra and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2011-01-31 05:13:37 -0500 (Mon, 31 Jan 2011)
New Revision: 10165

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQRATestBase.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-5836 - make sure if a different connector class not to use orginal default params

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2011-01-31 06:54:56 UTC (rev 10164)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2011-01-31 10:13:37 UTC (rev 10165)
@@ -1387,9 +1387,17 @@
       
       if (connectorClassName != null)
       {
-         Map<String, Object> connectionParams =
+         Map<String, Object> connectionParams;
+         if(raProperties.getConnectorClassName().equals(overrideProperties.getConnectorClassName()))
+         {
+
+            connectionParams =
                overrideConnectionParameters(raProperties.getParsedConnectionParameters(),overrideProperties.getParsedConnectionParameters());
-         
+         }
+         else
+         {
+            connectionParams = overrideProperties.getParsedConnectionParameters();
+         }
          TransportConfiguration transportConf = new TransportConfiguration(connectorClassName, connectionParams);
          
          if (ha)

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQRATestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQRATestBase.java	2011-01-31 06:54:56 UTC (rev 10164)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQRATestBase.java	2011-01-31 10:13:37 UTC (rev 10165)
@@ -55,7 +55,7 @@
       super.setUp();
       clearData();
       locator = createInVMNonHALocator();
-      configuration = createDefaultConfig();
+      configuration = createDefaultConfig(true);
       configuration.setSecurityEnabled(isSecure());
       server = createServer(true, configuration);
       server.start();

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java	2011-01-31 06:54:56 UTC (rev 10164)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java	2011-01-31 10:13:37 UTC (rev 10165)
@@ -213,6 +213,30 @@
       assertEquals(9999l, initWait);
 
    }
+
+    //https://issues.jboss.org/browse/JBPAPP-5836
+   public void testResourceAdapterSetupOverrideCFParams() throws Exception
+   {
+      HornetQResourceAdapter qResourceAdapter = new HornetQResourceAdapter();
+      qResourceAdapter.setConnectorClassName(INVM_CONNECTOR_FACTORY);
+      qResourceAdapter.setConnectionParameters("server-id=0");
+      HornetQRATestBase.MyBootstrapContext ctx = new HornetQRATestBase.MyBootstrapContext();
+      qResourceAdapter.start(ctx);
+      HornetQActivationSpec spec = new HornetQActivationSpec();
+      spec.setResourceAdapter(qResourceAdapter);
+      spec.setUseJNDI(false);
+      spec.setDestinationType("javax.jms.Queue");
+      spec.setDestination(MDBQUEUE);
+      //now override the connector class
+      spec.setConnectorClassName(NETTY_CONNECTOR_FACTORY);
+      spec.setConnectionParameters("port=5445");
+      CountDownLatch latch = new CountDownLatch(1);
+      DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
+      DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
+      qResourceAdapter.endpointActivation(endpointFactory, spec);
+      qResourceAdapter.stop();
+      assertTrue(endpoint.released);
+   }
    
    @Override
    public boolean isSecure()