[jboss-cvs] JBoss Messaging SVN: r3220 - in trunk: src/main/org/jboss/messaging/core/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Oct 20 06:49:18 EDT 2007
Author: timfox
Date: 2007-10-20 06:49:18 -0400 (Sat, 20 Oct 2007)
New Revision: 3220
Modified:
trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
Log:
Make sure correct value for selectBlobOnSelct is set when using Oracle
Modified: trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -125,34 +125,46 @@
}
public Object handleClosing(Invocation invocation) throws Throwable
- {
+ {
ConsumerState consumerState = getState(invocation);
-
- // We make sure closing is called on the ServerConsumerEndpoint.
- // This returns us the last delivery id sent
-
- Long l = (Long)invocation.invokeNext();
-
- long lastDeliveryId = l.longValue();
-
- // First we call close on the ClientConsumer which waits for onMessage invocations
- // to complete and the last delivery to arrive
- consumerState.getClientConsumer().close(lastDeliveryId);
-
-
- SessionState sessionState = (SessionState)consumerState.getParent();
- ConnectionState connectionState = (ConnectionState)sessionState.getParent();
-
- sessionState.removeCallbackHandler(consumerState.getClientConsumer());
+ try
+ {
- CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
- cm.unregisterHandler(consumerState.getConsumerID());
-
- //And then we cancel any messages still in the message callback handler buffer
- consumerState.getClientConsumer().cancelBuffer();
-
- return l;
- }
+ // We make sure closing is called on the ServerConsumerEndpoint.
+ // This returns us the last delivery id sent
+
+ Long l = (Long)invocation.invokeNext();
+
+ long lastDeliveryId = l.longValue();
+
+ // First we call close on the ClientConsumer which waits for onMessage invocations
+ // to complete and the last delivery to arrive
+ consumerState.getClientConsumer().close(lastDeliveryId);
+
+ SessionState sessionState = (SessionState)consumerState.getParent();
+ ConnectionState connectionState = (ConnectionState)sessionState.getParent();
+
+ sessionState.removeCallbackHandler(consumerState.getClientConsumer());
+
+ CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
+ cm.unregisterHandler(consumerState.getConsumerID());
+
+ //And then we cancel any messages still in the message callback handler buffer
+ consumerState.getClientConsumer().cancelBuffer();
+
+ return l;
+ }
+ finally
+ {
+ // If this method fails before the call to clientConsumer.close,
+ // we need to ensure the method will close the consumer, otherwise the server
+ // would hang during a shutdown
+ if (!consumerState.getClientConsumer().isClosed())
+ {
+ consumerState.getClientConsumer().close(-1);
+ }
+ }
+ }
public Object handleReceive(Invocation invocation) throws Throwable
{
Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -241,9 +241,12 @@
{
super.stop();
- reaperTimer.cancel();
-
- stopReaper();
+ if (reaper != null)
+ {
+ reaperTimer.cancel();
+
+ stopReaper();
+ }
}
// Injection -------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -64,11 +64,12 @@
sc = new ServiceContainer("all");
sc.start();
-
+
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
- sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ sc.getPersistenceManagerSQLProperties(),
+ true, true, true, false, 100, 5000,
+ !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -99,7 +99,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, useBinaryStream, trailingByte, maxParams, 5000, true);
+ true, batch, useBinaryStream, trailingByte, maxParams, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)p).injectNodeID(1);
p.start();
return p;
Modified: trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -108,7 +108,7 @@
pm = new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -245,7 +245,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -93,7 +93,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -87,7 +87,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -112,7 +112,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -204,7 +204,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, true);
+ true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-10-20 10:05:22 UTC (rev 3219)
+++ trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-10-20 10:49:18 UTC (rev 3220)
@@ -73,7 +73,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, true, false, maxParams, 5000, true);
+ true, batch, true, false, maxParams, 5000, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
p.start();
return p;
More information about the jboss-cvs-commits
mailing list