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/10/26 19:06:43 UTC
[1/2] activemq-artemis git commit: ARTEMIS-279 fixing typo
Repository: activemq-artemis
Updated Branches:
refs/heads/master e35c4d580 -> 992c34bc6
ARTEMIS-279 fixing typo
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/32e6d9c6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/32e6d9c6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/32e6d9c6
Branch: refs/heads/master
Commit: 32e6d9c61addebc42d8a5d154ac9311d625b1697
Parents: e35c4d5
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 26 14:06:11 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 26 14:06:11 2015 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/commands/bin/artemis-service.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32e6d9c6/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 5e37c56..ad3fca5 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -18,7 +18,7 @@
-->
<service>
- <id>armetis-${artemis.instance.name}-${host}</id>
+ <id>artemis-${artemis.instance.name}-${host}</id>
<name>ActiveMQ Artemis: ${artemis.instance.name} @ ${host}</name>
<description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
[2/2] activemq-artemis git commit: Small tweak on test
Posted by cl...@apache.org.
Small tweak on test
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/992c34bc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/992c34bc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/992c34bc
Branch: refs/heads/master
Commit: 992c34bc6a6123207eb99456852e05506e5e9e01
Parents: 32e6d9c
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 26 14:06:20 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 26 14:06:26 2015 -0400
----------------------------------------------------------------------
.../integration/client/SessionCloseOnGCTest.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/992c34bc/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
index a5d8e1c..d5a13d9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
@@ -216,20 +216,8 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase {
ActiveMQTestBase.checkWeakReferences(ref1, ref2, ref3);
- int count = 0;
- final int TOTAL_SLEEP_TIME = 400;
- final int MAX_COUNT = 20;
- while (count++ < MAX_COUNT) {
- /*
- * The assertion is vulnerable to races, both in the session closing as well as the return
- * value of the sessions.size() (i.e. HashSet.size()).
- */
- synchronized (this) {
- // synchronized block will (as a side effect) force sync all field values
- if (sf.numSessions() == 0)
- break;
- Thread.sleep(TOTAL_SLEEP_TIME / MAX_COUNT);
- }
+ for (int i = 0; i < 1000 && sf.numSessions() != 0; i++) {
+ forceGC();
}
Assert.assertEquals("# sessions", 0, sf.numSessions());
Assert.assertEquals("# connections", 1, sf.numConnections());