From 357d491cbe5e97e36e6bf0731bcedfd8a1c67ec5 Mon Sep 17 00:00:00 2001 From: gtully Date: Wed, 17 Sep 2014 16:14:51 +0100 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4705 - verify lock sanity on acquire so master cannot start and immediatly fail with a keepalive failure --- .../main/java/org/apache/activemq/store/SharedFileLocker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e1b51df6bd..e14eb03cb1 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 "