[hornetq-commits] JBoss hornetq SVN: r10248 - 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-02-24 05:28:07 -0500 (Thu, 24 Feb 2011)
New Revision: 10248

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-5987 - removed hasbeenupdated=true from getters

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java	2011-02-24 09:32:14 UTC (rev 10247)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java	2011-02-24 10:28:07 UTC (rev 10248)
@@ -162,7 +162,6 @@
       {
          ConnectionFactoryProperties.log.trace("getDiscoveryAddress()");
       }
-      hasBeenUpdated = true;
       return discoveryAddress;
    }
 
@@ -182,7 +181,6 @@
       {
          ConnectionFactoryProperties.log.trace("getDiscoveryPort()");
       }
-      hasBeenUpdated = true;
       return discoveryPort;
    }
 
@@ -202,7 +200,6 @@
       {
          ConnectionFactoryProperties.log.trace("getDiscoveryRefreshTimeout()");
       }
-      hasBeenUpdated = true;
       return discoveryRefreshTimeout;
    }
 
@@ -222,7 +219,6 @@
       {
          ConnectionFactoryProperties.log.trace("getDiscoveryInitialWaitTimeout()");
       }
-      hasBeenUpdated = true;
       return discoveryInitialWaitTimeout;
    }
 
@@ -242,7 +238,6 @@
       {
          ConnectionFactoryProperties.log.trace("getClientID()");
       }
-      hasBeenUpdated = true;
       return clientID;
    }
 
@@ -268,7 +263,6 @@
       {
          ConnectionFactoryProperties.log.trace("getDupsOKBatchSize()");
       }
-      hasBeenUpdated = true;
       return dupsOKBatchSize;
    }
 
@@ -288,7 +282,6 @@
       {
          ConnectionFactoryProperties.log.trace("getTransactionBatchSize()");
       }
-      hasBeenUpdated = true;
       return transactionBatchSize;
    }
 
@@ -308,7 +301,6 @@
       {
          ConnectionFactoryProperties.log.trace("getClientFailureCheckPeriod()");
       }
-      hasBeenUpdated = true;
       return clientFailureCheckPeriod;
    }
 
@@ -328,7 +320,6 @@
       {
          ConnectionFactoryProperties.log.trace("getConnectionTTL()");
       }
-      hasBeenUpdated = true;
       return connectionTTL;
    }
 
@@ -348,7 +339,6 @@
       {
          ConnectionFactoryProperties.log.trace("getCallTimeout()");
       }
-      hasBeenUpdated = true;
       return callTimeout;
    }
 
@@ -368,7 +358,6 @@
       {
          ConnectionFactoryProperties.log.trace("getConsumerWindowSize()");
       }
-      hasBeenUpdated = true;
       return consumerWindowSize;
    }
 
@@ -388,7 +377,6 @@
       {
          ConnectionFactoryProperties.log.trace("getConsumerMaxRate()");
       }
-      hasBeenUpdated = true;
       return consumerMaxRate;
    }
 
@@ -408,7 +396,6 @@
       {
          ConnectionFactoryProperties.log.trace("getConfirmationWindowSize()");
       }
-      hasBeenUpdated = true;
       return confirmationWindowSize;
    }
 
@@ -428,7 +415,6 @@
       {
          ConnectionFactoryProperties.log.trace("getProducerMaxRate()");
       }
-      hasBeenUpdated = true;
       return producerMaxRate;
    }
 
@@ -448,7 +434,6 @@
       {
          ConnectionFactoryProperties.log.trace("getMinLargeMessageSize()");
       }
-      hasBeenUpdated = true;
       return minLargeMessageSize;
    }
 
@@ -468,7 +453,6 @@
       {
          ConnectionFactoryProperties.log.trace("isBlockOnAcknowledge()");
       }
-      hasBeenUpdated = true;
       return blockOnAcknowledge;
    }
 
@@ -488,7 +472,6 @@
       {
          ConnectionFactoryProperties.log.trace("isBlockOnNonDurableSend()");
       }
-      hasBeenUpdated = true;
       return blockOnNonDurableSend;
    }
 
@@ -508,7 +491,6 @@
       {
          ConnectionFactoryProperties.log.trace("isBlockOnDurableSend()");
       }
-      hasBeenUpdated = true;
       return blockOnDurableSend;
    }
 
@@ -528,7 +510,6 @@
       {
          ConnectionFactoryProperties.log.trace("isAutoGroup()");
       }
-      hasBeenUpdated = true;
       return autoGroup;
    }
 
@@ -548,7 +529,6 @@
       {
          ConnectionFactoryProperties.log.trace("isPreAcknowledge()");
       }
-      hasBeenUpdated = true;
       return preAcknowledge;
    }
 
@@ -568,7 +548,6 @@
       {
          ConnectionFactoryProperties.log.trace("getRetryInterval()");
       }
-      hasBeenUpdated = true;
       return retryInterval;
    }
 
@@ -588,7 +567,6 @@
       {
          ConnectionFactoryProperties.log.trace("getRetryIntervalMultiplier()");
       }
-      hasBeenUpdated = true;
       return retryIntervalMultiplier;
    }
 
@@ -608,7 +586,6 @@
       {
          ConnectionFactoryProperties.log.trace("getReconnectAttempts()");
       }
-      hasBeenUpdated = true;
       return reconnectAttempts;
    }
 
@@ -628,7 +605,6 @@
       {
          ConnectionFactoryProperties.log.trace("isUseGlobalPools()");
       }
-      hasBeenUpdated = true;
       return useGlobalPools;
    }
 
@@ -648,7 +624,6 @@
       {
          ConnectionFactoryProperties.log.trace("getScheduledThreadPoolMaxSize()");
       }
-      hasBeenUpdated = true;
       return scheduledThreadPoolMaxSize;
    }
 
@@ -668,7 +643,6 @@
       {
          ConnectionFactoryProperties.log.trace("getThreadPoolMaxSize()");
       }
-      hasBeenUpdated = true;
       return threadPoolMaxSize;
    }
 

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-02-24 09:32:14 UTC (rev 10247)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java	2011-02-24 10:28:07 UTC (rev 10248)
@@ -235,6 +235,28 @@
       qResourceAdapter.stop();
       assertTrue(endpoint.released);
    }
+
+   public void testResourceAdapterSetupOverrideNoCFParams() 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);
+
+      CountDownLatch latch = new CountDownLatch(1);
+      DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
+      DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
+      qResourceAdapter.endpointActivation(endpointFactory, spec);
+      qResourceAdapter.stop();
+      assertFalse(spec.isHasBeenUpdated());
+      assertTrue(endpoint.released);
+   }
    
    @Override
    public boolean isSecure()