Be less stupoid

1 files changed, 4 insertions, 1 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
index 98b5732eb64..2e554d39e44 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
@@ -34,9 +34,12 @@ public class Lock implements Mutex {
                                                     " to acquire lock '" + lockPath + "'");
             if ( ! lock.tryLock()) { // Should be available to only this thread, while holding the above mutex.
                 release();
-                throw new IllegalStateException("InterProcessMutex acquired, but guarded lock held by someone else");
+                throw new IllegalStateException("InterProcessMutex acquired, but guarded lock held by someone else, for lock '" + lockPath + "'");
             }
         }
+        catch (UncheckedTimeoutException | IllegalStateException e) {
+            throw e;
+        }
         catch (Exception e) {
             throw new RuntimeException("Exception acquiring lock '" + lockPath + "'", e);
         }