You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/02/02 16:31:50 UTC
[1/3] activemq-6 git commit: remove unnecessary cache operation
Repository: activemq-6
Updated Branches:
refs/heads/master 7cdd77c78 -> 9900d5331
remove unnecessary cache operation
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/9e214e9c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/9e214e9c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/9e214e9c
Branch: refs/heads/master
Commit: 9e214e9c43d32156228c7414bf87cb06b233c7bd
Parents: 7cdd77c
Author: jbertram <jb...@redhat.com>
Authored: Fri Jan 30 13:34:49 2015 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Fri Jan 30 13:35:27 2015 -0600
----------------------------------------------------------------------
.../tests/integration/persistence/DuplicateCacheTest.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e214e9c/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
index 578f623..29dfab5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
@@ -71,9 +71,6 @@ public class DuplicateCacheTest extends StorageManagerTestBase
cache.deleteFromCache(id);
assertFalse(cache.contains(id));
-
- cache.deleteFromCache(id);
-
}
[2/3] activemq-6 git commit: avoid potential NPE
Posted by cl...@apache.org.
avoid potential NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/fe11fb4c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/fe11fb4c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/fe11fb4c
Branch: refs/heads/master
Commit: fe11fb4c02e3fc0492191224b366df878329e809
Parents: 9e214e9
Author: jbertram <jb...@redhat.com>
Authored: Fri Jan 30 13:35:16 2015 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Fri Jan 30 13:35:28 2015 -0600
----------------------------------------------------------------------
.../integration/cluster/distribution/ClusterTestBase.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/fe11fb4c/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
index 9c4d118..7370f33 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -1201,16 +1201,16 @@ public abstract class ClusterTestBase extends ServiceTestBase
ClientMessage message = holder.consumer.receive(WAIT_TIMEOUT);
- message.acknowledge();
-
- consumers[consumerIDs[count]].session.commit();
-
Assert.assertNotNull("consumer " + consumerIDs[count] + " did not receive message " + i, message);
Assert.assertEquals("consumer " + consumerIDs[count] + " message " + i,
i,
message.getObjectProperty(ClusterTestBase.COUNT_PROP));
+ message.acknowledge();
+
+ consumers[consumerIDs[count]].session.commit();
+
}
count++;
[3/3] activemq-6 git commit: This closes #87 - a few test fixes
Posted by cl...@apache.org.
This closes #87 - a few test fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/9900d533
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/9900d533
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/9900d533
Branch: refs/heads/master
Commit: 9900d5331be786ceb36ac81c4cc77c28f22c1ccf
Parents: 7cdd77c fe11fb4
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Feb 2 10:31:21 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Feb 2 10:31:21 2015 -0500
----------------------------------------------------------------------
.../integration/cluster/distribution/ClusterTestBase.java | 8 ++++----
.../tests/integration/persistence/DuplicateCacheTest.java | 3 ---
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------