svn commit: r398076 - in /incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq: JmsTransactionTestSupport.java broker/BrokerTestSupport.java broker/ft/TransactedTopicMasterSlaveTest.java

[chirino]

Author: chirino
Date: Fri Apr 28 20:22:23 2006
New Revision: 398076

URL: http://svn.apache.org/viewcvs?rev=398076&view=rev
Log:
Set instance variables to null so that we don't OOM exceptions when using m2

Modified:
    
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
    
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
    
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java

Modified: 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?rev=398076&r1=398075&r2=398076&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
 Fri Apr 28 20:22:23 2006
@@ -100,8 +100,12 @@
         log.info("Closing down connection");
 
         session.close();
+        session=null;
         connection.close();
+        connection=null;
         broker.stop();
+        broker=null;
+        
         log.info("Connection closed.");
     }
 

Modified: 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java?rev=398076&r1=398075&r2=398076&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
 Fri Apr 28 20:22:23 2006
@@ -87,6 +87,10 @@
     
     protected void tearDown() throws Exception {
         broker.stop();
+        broker=null;    
+        regionBroker=null;    
+        persistenceAdapter=null;
+        memoryManager=null;
         super.tearDown();
     }
     

Modified: 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java?rev=398076&r1=398075&r2=398076&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
 Fri Apr 28 20:22:23 2006
@@ -55,6 +55,7 @@
 
     protected void tearDown() throws Exception{
         slave.stop();
+        slave=null;
         super.tearDown();
     }