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 2016/07/25 18:27:03 UTC
[1/2] activemq-artemis git commit: ARTEMIS-651 Typo in word
"topology" in class ServerLocatorImpl
Repository: activemq-artemis
Updated Branches:
refs/heads/master d7c149b41 -> 7a0d3fea2
ARTEMIS-651 Typo in word "topology" in class ServerLocatorImpl
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c9dfbad6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c9dfbad6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c9dfbad6
Branch: refs/heads/master
Commit: c9dfbad69c0a4022310ffdbbe3d8fdcf39e40b4c
Parents: d7c149b
Author: Martin Styk <ms...@redhat.com>
Authored: Mon Jul 25 13:51:20 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 25 14:26:47 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/client/impl/ServerLocatorImpl.java | 4 ++--
.../artemis/tests/integration/ra/ActiveMQClusteredTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9dfbad6/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index a2c1922..76ffdb9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -540,7 +540,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
// if the topologyArray is null, we will use the initialConnectors
if (usedTopology != null) {
if (logger.isTraceEnabled()) {
- logger.trace("Selecting connector from toplogy.");
+ logger.trace("Selecting connector from topology.");
}
int pos = loadBalancingPolicy.select(usedTopology.length);
Pair<TransportConfiguration, TransportConfiguration> pair = usedTopology[pos];
@@ -1844,7 +1844,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
return clone;
}
- public boolean isReceivedToplogy() {
+ public boolean isReceivedTopology() {
return receivedTopology;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9dfbad6/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
index e6b9a01..b8fdfe0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
@@ -145,7 +145,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
long timeout = 10000;
long now = System.currentTimeMillis();
- while (!((ServerLocatorImpl)cf1.getServerLocator()).isReceivedToplogy()) {
+ while (!((ServerLocatorImpl)cf1.getServerLocator()).isReceivedTopology()) {
Thread.sleep(50);
}
[2/2] activemq-artemis git commit: This closes #658
Posted by cl...@apache.org.
This closes #658
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a0d3fea
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a0d3fea
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a0d3fea
Branch: refs/heads/master
Commit: 7a0d3fea22db7f58448e6fe2e0d2aac92f9020ff
Parents: d7c149b c9dfbad
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 25 14:26:48 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 25 14:26:48 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/client/impl/ServerLocatorImpl.java | 4 ++--
.../artemis/tests/integration/ra/ActiveMQClusteredTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------