activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/4] activemq-artemis git commit: Fix RaceOnSyncLargeMessageOverReplication2Test
Date Fri, 06 May 2016 15:50:51 GMT
Fix RaceOnSyncLargeMessageOverReplication2Test


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/19147113
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/19147113
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/19147113

Branch: refs/heads/master
Commit: 19147113cbc3f0addbf843f3e52a2fac64f45d4b
Parents: 41800c2
Author: jbertram <jbertram@apache.org>
Authored: Thu May 5 20:20:43 2016 -0500
Committer: jbertram <jbertram@apache.org>
Committed: Thu May 5 20:21:18 2016 -0500

----------------------------------------------------------------------
 .../artemis/core/server/impl/AutoCreatedQueueManagerImpl.java    | 4 +++-
 .../byteman/RaceOnSyncLargeMessageOverReplication2Test.java      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19147113/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
index 25fc60a..c39d269 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
@@ -46,7 +46,9 @@ public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager
{
                   logger.debug("deleting auto-created queue \"" + queueName + ".\" consumerCount
= " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteJmsQueues = " +
isAutoDeleteJmsQueues);
                }
 
-               server.getJMSQueueDeleter().delete(queueName);
+               if (server.getJMSQueueDeleter() != null) {
+                  server.getJMSQueueDeleter().delete(queueName);
+               }
             }
             else if (logger.isDebugEnabled()) {
                logger.debug("NOT deleting auto-created queue \"" + queueName + ".\" consumerCount
= " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteJmsQueues = " +
isAutoDeleteJmsQueues);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19147113/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
index 417f98c..34e6336 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
@@ -120,7 +120,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase
 
       connection = (ActiveMQConnection) factory.createConnection();
       session = connection.createSession(true, Session.SESSION_TRANSACTED);
-      queue = session.createQueue("jms.queue.Queue");
+      queue = session.createQueue("Queue");
       producer = session.createProducer(queue);
 
    }


Mime
View raw message