[jboss-cvs] JBoss Messaging SVN: r2891 - in trunk: tests/src/org/jboss/test/messaging/jms and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 13 09:34:30 EDT 2007
Author: timfox
Date: 2007-07-13 09:34:30 -0400 (Fri, 13 Jul 2007)
New Revision: 2891
Modified:
trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
Log:
Few more tweaks
Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-07-13 13:17:55 UTC (rev 2890)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-07-13 13:34:30 UTC (rev 2891)
@@ -82,7 +82,6 @@
import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-07-13 13:17:55 UTC (rev 2890)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-07-13 13:34:30 UTC (rev 2891)
@@ -2071,67 +2071,68 @@
}
}
- public void testStopConnectionDuringOnMessage() throws Exception
- {
- if (log.isTraceEnabled()) log.trace("testStopConnectionWhileOnMessageIsExecuting");
-
- final SynchronizedInt messagesReceived = new SynchronizedInt(0);
-
- MessageListener myListener = new MessageListener() {
- public void onMessage(Message message)
- {
- messagesReceived.increment();
- try
- {
- Thread.sleep(100L);
- }
- catch (InterruptedException e)
- {
- // Ignore
- }
- }
- };
-
- queueConsumer.setMessageListener(myListener);
-
- log.trace("Starting consumer connection");
- consumerConnection.start();
-
- final int MESSAGE_COUNT = 100;
-
- log.trace("Sending the first batch of messages");
-
- for (int i = 0; i < MESSAGE_COUNT / 2; i++)
- {
- queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
- }
-
- Thread.sleep(500L);
-
- log.trace("Stopping consumer connection");
- consumerConnection.stop();
-
- int countAfterStop = messagesReceived.get();
- assertTrue("Should have received some messages before stopping", countAfterStop > 0);
-
- log.trace("Sending the second batch of messages");
- for (int i = MESSAGE_COUNT / 2; i < MESSAGE_COUNT; i++)
- {
- queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
- }
-
- log.trace("Sleeping a bit to check that no messages are received");
- Thread.sleep(2000);
-
- assertEquals("Should not receive any messages after the connection has been stopped", countAfterStop, messagesReceived.get());
-
- log.trace("Restarting consumer connection");
- consumerConnection.start();
-
- log.trace("Sleeping to allow remaining messages to arrive");
- Thread.sleep(15000);
- assertEquals("Should have received all messages after restarting", MESSAGE_COUNT, messagesReceived.get());
- }
+// This is commented out until http://jira.jboss.com/jira/browse/JBMESSAGING-983 is complete
+// public void testStopConnectionDuringOnMessage() throws Exception
+// {
+// if (log.isTraceEnabled()) log.trace("testStopConnectionWhileOnMessageIsExecuting");
+//
+// final SynchronizedInt messagesReceived = new SynchronizedInt(0);
+//
+// MessageListener myListener = new MessageListener() {
+// public void onMessage(Message message)
+// {
+// messagesReceived.increment();
+// try
+// {
+// Thread.sleep(100L);
+// }
+// catch (InterruptedException e)
+// {
+// // Ignore
+// }
+// }
+// };
+//
+// queueConsumer.setMessageListener(myListener);
+//
+// log.trace("Starting consumer connection");
+// consumerConnection.start();
+//
+// final int MESSAGE_COUNT = 100;
+//
+// log.trace("Sending the first batch of messages");
+//
+// for (int i = 0; i < MESSAGE_COUNT / 2; i++)
+// {
+// queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
+// }
+//
+// Thread.sleep(500L);
+//
+// log.trace("Stopping consumer connection");
+// consumerConnection.stop();
+//
+// int countAfterStop = messagesReceived.get();
+// assertTrue("Should have received some messages before stopping", countAfterStop > 0);
+//
+// log.trace("Sending the second batch of messages");
+// for (int i = MESSAGE_COUNT / 2; i < MESSAGE_COUNT; i++)
+// {
+// queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
+// }
+//
+// log.trace("Sleeping a bit to check that no messages are received");
+// Thread.sleep(2000);
+//
+// assertEquals("Should not receive any messages after the connection has been stopped", countAfterStop, messagesReceived.get());
+//
+// log.trace("Restarting consumer connection");
+// consumerConnection.start();
+//
+// log.trace("Sleeping to allow remaining messages to arrive");
+// Thread.sleep(15000);
+// assertEquals("Should have received all messages after restarting", MESSAGE_COUNT, messagesReceived.get());
+// }
// Test that stop doesn't in any way break subsequent close
public void testCloseAfterStop() throws Exception
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-07-13 13:17:55 UTC (rev 2890)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-07-13 13:34:30 UTC (rev 2891)
@@ -261,12 +261,7 @@
}
}
- /**
- * Kills the server and waits keep trying any dumb communication until the server is effectively
- * killed. We had to implement this method as kill will actually schedule a thread that will
- * perform System.exit after few milliseconds. We will use this method in places where we need
- * the server killed.
- */
+
public static synchronized void kill(int i) throws Exception
{
log.info("Attempting to kill server " + i);
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2007-07-13 13:17:55 UTC (rev 2890)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2007-07-13 13:34:30 UTC (rev 2891)
@@ -190,7 +190,7 @@
Thread.sleep(250);
- System.exit(1);
+ System.exit(0);
}
public void ping() throws Exception
More information about the jboss-cvs-commits
mailing list