activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: AMQ-5266 - fix leak in transaction context - completions were not cleared on close/commit
Date Fri, 17 Jul 2015 11:32:25 GMT
Repository: activemq
Updated Branches:
  refs/heads/master b9b27b968 -> 7c116631b


AMQ-5266 - fix leak in transaction context - completions were not cleared on close/commit


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

Branch: refs/heads/master
Commit: 7c116631b504e31fb0bd9f805b1b77090d16f4ff
Parents: b9b27b9
Author: gtully <gary.tully@gmail.com>
Authored: Fri Jul 17 12:30:52 2015 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Jul 17 12:31:29 2015 +0100

----------------------------------------------------------------------
 .../activemq/store/jdbc/TransactionContext.java |  1 +
 .../store/jdbc/TransactionContextTest.java      | 87 ++++++++++++++++++++
 2 files changed, 88 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/7c116631/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
index 25b78ab..c83b969 100755
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
@@ -162,6 +162,7 @@ public class TransactionContext {
                 for (Runnable completion: completions) {
                     completion.run();
                 }
+                completions.clear();
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/activemq/blob/7c116631/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
new file mode 100644
index 0000000..dcc5b27
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/TransactionContextTest.java
@@ -0,0 +1,87 @@
+/**
+ * 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.store.jdbc;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TransactionContextTest {
+
+    org.apache.activemq.store.jdbc.TransactionContext underTest;
+    static JDBCPersistenceAdapter jdbcPersistenceAdapter;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        jdbcPersistenceAdapter = new JDBCPersistenceAdapter();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        jdbcPersistenceAdapter.stop();
+    }
+
+    @Before
+    public void setup() throws Exception {
+        underTest = new TransactionContext(jdbcPersistenceAdapter);
+    }
+
+    @Test
+    public void testCompletionCalledOnceOnCommmit() throws Exception {
+        final AtomicInteger called = new AtomicInteger();
+        underTest.begin();
+        underTest.onCompletion(new Runnable() {
+            @Override
+            public void run() {
+                called.incrementAndGet();
+            }
+        });
+        underTest.commit();
+
+        assertEquals(1, called.get());
+        underTest.begin();
+        underTest.commit();
+
+        assertEquals(1, called.get());
+
+    }
+
+    @Test
+    public void testCompletionCalledOnceOnClose() throws Exception {
+
+        underTest.getConnection();
+        final AtomicInteger called = new AtomicInteger();
+        underTest.onCompletion(new Runnable() {
+            @Override
+            public void run() {
+                called.incrementAndGet();
+            }
+        });
+        underTest.close();
+
+        assertEquals(1, called.get());
+        underTest.getConnection();
+        underTest.close();
+
+        assertEquals(1, called.get());
+    }
+
+}


Mime
View raw message