You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/02/23 20:37:07 UTC
[1/2] activemq-artemis git commit: fixing regression caused by #397
Repository: activemq-artemis
Updated Branches:
refs/heads/master 89aafa44b -> 5abf5d3fc
fixing regression caused by #397
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c4760488
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c4760488
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c4760488
Branch: refs/heads/master
Commit: c4760488e366e4d00d90e53e57bd24d4bb4f097a
Parents: 89aafa4
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Feb 23 14:16:32 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Feb 23 14:22:51 2016 -0500
----------------------------------------------------------------------
.../artemis/core/server/impl/SharedNothingLiveActivation.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c4760488/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
index 53d1c14..789e864 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
@@ -283,13 +283,12 @@ public class SharedNothingLiveActivation extends LiveActivation {
locator.setReconnectAttempts(0);
try (ClientSessionFactoryInternal factory = locator.connectNoWarnings()) {
// Just try connecting
+ listener.latch.await(5, TimeUnit.SECONDS);
}
catch (Exception notConnected) {
return false;
}
- listener.latch.await(5, TimeUnit.SECONDS);
-
return listener.isNodePresent;
}
}
[2/2] activemq-artemis git commit: This closes #401
Posted by jb...@apache.org.
This closes #401
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5abf5d3f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5abf5d3f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5abf5d3f
Branch: refs/heads/master
Commit: 5abf5d3fcae0dd3b3dccaf4bc04cc6e916b3576b
Parents: 89aafa4 c476048
Author: jbertram <jb...@apache.org>
Authored: Tue Feb 23 13:36:45 2016 -0600
Committer: jbertram <jb...@apache.org>
Committed: Tue Feb 23 13:36:45 2016 -0600
----------------------------------------------------------------------
.../artemis/core/server/impl/SharedNothingLiveActivation.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------