activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [03/44] activemq-artemis git commit: fixing regression caused by #397
Date Tue, 23 Feb 2016 19:38:59 GMT
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/refactor-openwire
Commit: c4760488e366e4d00d90e53e57bd24d4bb4f097a
Parents: 89aafa4
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Tue Feb 23 14:16:32 2016 -0500
Committer: Clebert Suconic <clebertsuconic@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;
       }
    }


Mime
View raw message