[hornetq-commits] JBoss hornetq SVN: r10250 - 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 08:52:49 -0500 (Thu, 24 Feb 2011)
New Revision: 10250

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/HornetQMessageHandlerSecurityTest.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java
Log:
fixed tests to stop RA and NPE check on resource adapter stop

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-02-24 12:23:57 UTC (rev 10249)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2011-02-24 13:52:49 UTC (rev 10250)
@@ -228,7 +228,10 @@
 
       activations.clear();
 
-      defaultHornetQConnectionFactory.close();
+      if (defaultHornetQConnectionFactory != null)
+      {
+         defaultHornetQConnectionFactory.close();
+      }
 
       HornetQResourceAdapter.log.info("HornetQ resource adapter stopped");
    }

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java	2011-02-24 12:23:57 UTC (rev 10249)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerSecurityTest.java	2011-02-24 13:52:49 UTC (rev 10250)
@@ -62,6 +62,7 @@
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
       assertEquals(((LocalQueueBinding)binding).getQueue().getConsumerCount(), 0);
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testSimpleMessageReceivedOnQueueWithSecuritySucceeds() throws Exception
@@ -91,5 +92,6 @@
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
       assertEquals(((LocalQueueBinding)binding).getQueue().getConsumerCount(), 15);
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 }

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java	2011-02-24 12:23:57 UTC (rev 10249)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java	2011-02-24 13:52:49 UTC (rev 10250)
@@ -65,6 +65,8 @@
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+
+      qResourceAdapter.stop();
    }
 
    public void testInvalidAckMode() throws Exception
@@ -82,6 +84,7 @@
       {
          //pass
       }
+      qResourceAdapter.stop();
    }
 
    public void testSimpleMessageReceivedOnQueueInLocalTX() throws Exception
@@ -117,6 +120,7 @@
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testSimpleMessageReceivedOnQueueWithSelector() throws Exception
@@ -152,6 +156,7 @@
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "red");
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testEndpointDeactivated() throws Exception
@@ -174,6 +179,7 @@
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 0);
       assertTrue(endpoint.released);
+      qResourceAdapter.stop();
    }
 
    public void testMaxSessions() throws Exception
@@ -195,6 +201,7 @@
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
       assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 1);
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testSimpleTopic() throws Exception
@@ -224,6 +231,7 @@
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "test");
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testDurableSubscription() throws Exception
@@ -279,6 +287,7 @@
       assertNotNull(endpoint.lastMessage);
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testNonDurableSubscription() throws Exception
@@ -325,6 +334,7 @@
       assertNotNull(endpoint.lastMessage);
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testSelectorChangedWithTopic() throws Exception
@@ -380,6 +390,7 @@
       assertNotNull(endpoint.lastMessage);
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testSelectorNotChangedWithTopic() throws Exception
@@ -429,6 +440,7 @@
       assertNotNull(endpoint.lastMessage);
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "2");
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
 
    }
 

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java	2011-02-24 12:23:57 UTC (rev 10249)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerXATest.java	2011-02-24 13:52:49 UTC (rev 10250)
@@ -68,6 +68,7 @@
       endpoint.prepare();
       endpoint.commit();
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    public void testXARollback() throws Exception
@@ -104,6 +105,7 @@
       assertNotNull(endpoint.lastMessage);
       assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
+      qResourceAdapter.stop();
    }
 
    class XADummyEndpoint extends DummyMessageEndpoint