activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4705 - verify lock sanity on acquire so master cannot start and immediatly fail with a keepalive failure
Date Wed, 17 Sep 2014 15:15:48 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk f19add11d -> 357d491cb


https://issues.apache.org/jira/browse/AMQ-4705 - verify lock sanity on acquire so master cannot
start and immediatly fail with a keepalive failure


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/357d491c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/357d491c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/357d491c

Branch: refs/heads/trunk
Commit: 357d491cbe5e97e36e6bf0731bcedfd8a1c67ec5
Parents: f19add1
Author: gtully <gary.tully@gmail.com>
Authored: Wed Sep 17 16:14:51 2014 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Wed Sep 17 16:14:57 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/store/SharedFileLocker.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/357d491c/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
b/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
index e1b51df..e14eb03 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
@@ -52,7 +52,7 @@ public class SharedFileLocker extends AbstractLocker {
                 while ((!isStopped()) && (!isStopping())) {
                     try {
                         lockFile.lock();
-                        locked = true;
+                        locked = keepAlive();
                         break;
                     } catch (IOException e) {
                         LOG.info("Database "


Mime
View raw message