activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6194
Date Mon, 07 Mar 2016 14:20:11 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 5e0f49332 -> 903dec615


https://issues.apache.org/jira/browse/AMQ-6194

Fixing an issue that caused statistics for a transactional temporary
queue to be updated twice by mistake.  Moved the statistics update into
tryOrderedCursorAdd so that the update is called immediately only if
not inside a transaction.


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

Branch: refs/heads/master
Commit: 903dec615c7932475bd3e6cd869af25f01de64b2
Parents: 5e0f493
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Mon Mar 7 14:15:35 2016 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Mon Mar 7 14:15:35 2016 +0000

----------------------------------------------------------------------
 .../apache/activemq/broker/region/Queue.java    |   4 +-
 .../org/apache/activemq/bugs/AMQ6194Test.java   | 123 +++++++++++++++++++
 2 files changed, 124 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/903dec61/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 96a22ec..eb1e812 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -854,9 +854,6 @@ public class Queue extends BaseDestination implements Task, UsageListener,
Index
             }
         } while (started.get());
 
-        if (store == null || (!context.isInTransaction() && !message.isPersistent()))
{
-            messageSent(context, message);
-        }
         if (result != null && message.isResponseRequired() && !result.isCancelled())
{
             try {
                 result.get();
@@ -877,6 +874,7 @@ public class Queue extends BaseDestination implements Task, UsageListener,
Index
         } else {
             // no ordering issue with non persistent messages
             result = tryCursorAdd(message);
+            messageSent(context, message);
         }
 
         return result;

http://git-wip-us.apache.org/repos/asf/activemq/blob/903dec61/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
new file mode 100644
index 0000000..96cf129
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6194Test.java
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.jms.Connection;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Test that statistics for a sent message are properly counted for a temporary destination
+ * whether inside a transaction or not.
+ */
+@RunWith(Parameterized.class)
+public class AMQ6194Test {
+
+    private boolean transaction;
+
+    @Parameters(name = "transaction:{0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+            //!transaction
+            {false},
+            //transaction
+            {true}
+        });
+    }
+
+    private BrokerService brokerService;
+    private String connectionUri;
+
+    /**
+     * @param transaction
+     */
+    public AMQ6194Test(boolean transaction) {
+        super();
+        this.transaction = transaction;
+    }
+
+    @Before
+    public void before() throws Exception {
+        brokerService = new BrokerService();
+        TransportConnector connector = brokerService.addConnector("tcp://localhost:0");
+        connectionUri = connector.getPublishableConnectString();
+        brokerService.setPersistent(false);
+        brokerService.start();
+        brokerService.waitUntilStarted();
+    }
+
+    @After
+    public void after() throws Exception {
+        if (brokerService != null) {
+            brokerService.stop();
+            brokerService.waitUntilStopped();
+        }
+    }
+
+    @Test
+    public void testTempStatistics() throws Exception {
+        final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(connectionUri);
+        Connection connection = null;
+        Session session = null;
+        MessageProducer producer = null;
+        TemporaryQueue temporaryQueue = null;
+        try {
+            connection = factory.createConnection();
+            connection.start();
+            if (transaction) {
+                session = connection.createSession(true, Session.SESSION_TRANSACTED);
+            } else {
+                session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            }
+            temporaryQueue = session.createTemporaryQueue();
+            producer = session.createProducer(temporaryQueue);
+            final TextMessage textMessage = session.createTextMessage();
+            textMessage.setText("Text Message");
+
+            producer.send(textMessage);
+
+            if (transaction) {
+                session.commit();
+            }
+            Destination dest = brokerService.getDestination((ActiveMQDestination) temporaryQueue);
+            assertEquals(1, dest.getDestinationStatistics().getMessages().getCount());
+        } finally {
+            if (connection != null) {
+                connection.close();
+            }
+        }
+    }
+}
\ No newline at end of file


Mime
View raw message