diff --git a/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/lock/ZookeeperLockRegistry.java b/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/lock/ZookeeperLockRegistry.java index 3edb6521b3..2807aa92e5 100644 --- a/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/lock/ZookeeperLockRegistry.java +++ b/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/lock/ZookeeperLockRegistry.java @@ -271,7 +271,7 @@ public class ZookeeperLockRegistry implements ExpirableLockRegistry, DisposableB @Override public boolean tryLock() { try { - return tryLock(0, TimeUnit.MICROSECONDS); + return tryLock(1, TimeUnit.SECONDS); } catch (InterruptedException e) { Thread.currentThread().interrupt(); diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java index 4405a7eab8..09e57fdaab 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java @@ -352,4 +352,16 @@ public class ZkLockRegistryTests extends ZookeeperTestSupport { registry.destroy(); } + @Test + public void testTryLock() throws Exception { + ZookeeperLockRegistry registry = new ZookeeperLockRegistry(this.client); + for (int i = 0; i < 10; i++) { + Lock lock = registry.obtain("foo"); + assertTrue(lock.tryLock()); + lock.unlock(); + } + + registry.destroy(); + } + }