[Jboss-cvs] JBoss Messaging SVN: r1342 - in trunk: src/main/org/jboss/jms/client src/main/org/jboss/messaging/core tests/src/org/jboss/test/messaging/core/local tests/src/org/jboss/test/messaging/core/paging tests/src/org/jboss/test/messaging/jms/server tests/src/org/jboss/test/messaging/tools/jmx/rmi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 21 18:40:43 EDT 2006
Author: timfox
Date: 2006-09-21 18:40:34 -0400 (Thu, 21 Sep 2006)
New Revision: 1342
Modified:
trunk/src/main/org/jboss/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
trunk/src/main/org/jboss/messaging/core/PagingChannelSupport.java
trunk/tests/src/org/jboss/test/messaging/core/local/PagingFilteredQueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
Log:
More clustering - getting tests to run
Modified: trunk/src/main/org/jboss/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnection.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/src/main/org/jboss/jms/client/JBossConnection.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -75,7 +75,6 @@
protected ConnectionDelegate delegate;
private int connectionType;
- private boolean closed;
// Constructors --------------------------------------------------
@@ -131,7 +130,6 @@
{
delegate.closing();
delegate.close();
- closed = true;
}
public ConnectionConsumer createConnectionConsumer(Destination destination,
@@ -264,17 +262,6 @@
}
}
- protected void finalize() throws Throwable
- {
- super.finalize();
- //If a user hasn't explicitly closed the connection due to sloppy programming
- //then we close it here
- if (!closed)
- {
- close();
- }
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ChannelSupport.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/src/main/org/jboss/messaging/core/ChannelSupport.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -794,6 +794,7 @@
}
// I might as well return null, the sender shouldn't care
+
return new SimpleDelivery(this, ref, true);
}
Modified: trunk/src/main/org/jboss/messaging/core/PagingChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/PagingChannelSupport.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/src/main/org/jboss/messaging/core/PagingChannelSupport.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -162,10 +162,6 @@
// Receiver implementation
// -----------------------------------------------------------------
- public Delivery handle(DeliveryObserver sender, MessageReference ref, Transaction tx)
- {
- return super.handle(sender, ref, tx);
- }
// Channel implementation
// ---------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/core/local/PagingFilteredQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/local/PagingFilteredQueueTestBase.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/tests/src/org/jboss/test/messaging/core/local/PagingFilteredQueueTestBase.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -205,17 +205,25 @@
Message m5 = new CoreMessage(5, false, 0, 0, (byte)0, null, null, 0);
MessageReference ref1 = ms.reference(m1);
- MessageReference ref2 = ms.reference(m1);
- MessageReference ref3 = ms.reference(m1);
- MessageReference ref4 = ms.reference(m1);
- MessageReference ref5 = ms.reference(m1);
+ MessageReference ref2 = ms.reference(m2);
+ MessageReference ref3 = ms.reference(m3);
+ MessageReference ref4 = ms.reference(m4);
+ MessageReference ref5 = ms.reference(m5);
- assertNull(queue.handle(null, ref1, null));
- assertNull(queue.handle(null, ref2, null));
- assertNotNull(queue.handle(null, ref3, null));
- assertNull(queue.handle(null, ref4, null));
- assertNull(queue.handle(null, ref5, null));
+ Delivery del = queue.handle(null, ref1, null);
+ assertFalse(del.isSelectorAccepted());
+ del = queue.handle(null, ref2, null);
+ assertFalse(del.isSelectorAccepted());
+
+ del = queue.handle(null, ref3, null);
+ assertTrue(del.isSelectorAccepted());
+
+ del = queue.handle(null, ref4, null);
+ assertFalse(del.isSelectorAccepted());
+
+ del = queue.handle(null, ref5, null);
+ assertFalse(del.isSelectorAccepted());
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -883,6 +883,7 @@
consume(queue, consumeCount, refs, 50);
consumeCount += 50;
+
//verify 0 ref in storage
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -95,9 +95,9 @@
public void testChangeDefaultJNDIContexts() throws Exception
{
ServerManagement.stopServerPeer();
-
+
ServerManagement.startServerPeer("0", "/here-go-queues", "/and-here-topics/etc/etc");
-
+
try
{
ServerManagement.deployQueue("SomeQueue");
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-09-21 22:24:21 UTC (rev 1341)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-09-21 22:40:34 UTC (rev 1342)
@@ -345,10 +345,20 @@
for(Iterator i = connFactoryObjectNames.iterator(); i.hasNext(); )
{
- ObjectName on = (ObjectName)i.next();
- sc.invoke(on, "stop", new Object[0], new String[0]);
- sc.invoke(on, "destroy", new Object[0], new String[0]);
- sc.unregisterService(on);
+ try
+ {
+ ObjectName on = (ObjectName)i.next();
+ sc.invoke(on, "stop", new Object[0], new String[0]);
+ sc.invoke(on, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(on);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
}
connFactoryObjectNames.clear();
@@ -376,32 +386,93 @@
log.debug("stopping JMS server");
- sc.invoke(serverPeerObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(serverPeerObjectName, "destroy", new Object[0], new String[0]);
+ try
+ {
+ sc.invoke(serverPeerObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(serverPeerObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(serverPeerObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
- sc.unregisterService(serverPeerObjectName);
+
log.debug("stopping ServerPeer's plug-in dependencies");
- sc.invoke(shutdownLoggerObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(shutdownLoggerObjectName, "destroy", new Object[0], new String[0]);
- sc.unregisterService(shutdownLoggerObjectName);
+ try
+ {
+ sc.invoke(shutdownLoggerObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(shutdownLoggerObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(shutdownLoggerObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
- sc.invoke(jmsUserManagerObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(jmsUserManagerObjectName, "destroy", new Object[0], new String[0]);
- sc.unregisterService(jmsUserManagerObjectName);
+ try
+ {
+ sc.invoke(jmsUserManagerObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(jmsUserManagerObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(jmsUserManagerObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
- sc.invoke(queuePostOfficeObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(queuePostOfficeObjectName, "destroy", new Object[0], new String[0]);
- sc.unregisterService(queuePostOfficeObjectName);
+ try
+ {
+ sc.invoke(queuePostOfficeObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(queuePostOfficeObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(queuePostOfficeObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
- sc.invoke(topicPostOfficeObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(topicPostOfficeObjectName, "destroy", new Object[0], new String[0]);
- sc.unregisterService(topicPostOfficeObjectName);
+ try
+ {
+ sc.invoke(topicPostOfficeObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(topicPostOfficeObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(topicPostOfficeObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
- sc.invoke(persistenceManagerObjectName, "stop", new Object[0], new String[0]);
- sc.invoke(persistenceManagerObjectName, "destroy", new Object[0], new String[0]);
- sc.unregisterService(persistenceManagerObjectName);
+ try
+ {
+ sc.invoke(persistenceManagerObjectName, "stop", new Object[0], new String[0]);
+ sc.invoke(persistenceManagerObjectName, "destroy", new Object[0], new String[0]);
+ sc.unregisterService(persistenceManagerObjectName);
+ }
+ catch (Exception ignore)
+ {
+ //If the serverpeer failed when starting up previously, then only some of the
+ //services may be started. The ones that didn't start will fail when attempting to shut
+ //them down.
+ //Hence we must catch and ignore or we won't shut everything down
+ }
}
More information about the jboss-cvs-commits
mailing list