You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2010/02/22 19:48:11 UTC
svn commit: r915014 - in /activemq/branches/activemq-5.3: ./
activemq-core/src/main/java/org/apache/activemq/transport/
activemq-core/src/main/java/org/apache/activemq/transport/stomp/
activemq-core/src/test/java/org/apache/activemq/bugs/
Author: rajdavies
Date: Mon Feb 22 18:48:10 2010
New Revision: 915014
URL: http://svn.apache.org/viewvc?rev=915014&view=rev
Log:
fixed failing test case
Modified:
activemq/branches/activemq-5.3/ (props changed)
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (props changed)
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java (props changed)
activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 18:48:10 2010
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,911812-912087,912496-912652
+/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,911812-912087,912496-912652,915010
Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 18:48:10 2010
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,905769,911812-912087,912496-912652
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084,881278-881313,905769,911812-912087,912496-912652,915010
Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 18:48:10 2010
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825009-825084,881278-881313,911812-912087,912496-912652
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825009-825084,881278-881313,911812-912087,912496-912652,915010
Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java?rev=915014&r1=915013&r2=915014&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java Mon Feb 22 18:48:10 2010
@@ -25,7 +25,6 @@
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
-import javax.jms.Topic;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
@@ -68,33 +67,7 @@
endUsage = brokerService.getSystemUsage().getMemoryUsage().getUsage();
assertEquals(startUsage,endUsage);
}
-
- public void testTopicResourcesReleased() throws Exception{
- ActiveMQConnectionFactory fac = new ActiveMQConnectionFactory(ACTIVEMQ_BROKER_BIND);
- Connection tempConnection = fac.createConnection();
- tempConnection.start();
- Session tempSession = tempConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Topic tempTopic = tempSession.createTemporaryTopic();
- final MessageConsumer tempConsumer = tempSession.createConsumer(tempTopic);
-
- Connection testConnection = fac.createConnection();
- long startUsage = brokerService.getSystemUsage().getMemoryUsage().getUsage();
- Session testSession = testConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer testProducer = testSession.createProducer(tempTopic);
- byte[] payload = new byte[1024*4];
- for (int i = 0; i < NUMBER; i++ ) {
- BytesMessage msg = testSession.createBytesMessage();
- msg.writeBytes(payload);
- testProducer.send(msg);
- }
- long endUsage = brokerService.getSystemUsage().getMemoryUsage().getUsage();
- assertFalse(startUsage==endUsage);
- tempConnection.close();
- Thread.sleep(1000);
- endUsage = brokerService.getSystemUsage().getMemoryUsage().getUsage();
- assertEquals(startUsage,endUsage);
- }
-
+
@Override
protected void setUp() throws Exception {