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/a1946162 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a1946162 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a1946162 Branch: refs/heads/activemq-5.10.x Commit: a19461627ec3903be442d272fc088df58fcd49bc Parents: c682f91 Author: gtully <[email protected]> Authored: Wed Sep 17 16:14:51 2014 +0100 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Dec 17 21:45:34 2014 -0500 ---------------------------------------------------------------------- .../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/a1946162/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 "
