[1/2] karaf git commit: [KARAF-5315] Synchronize lock methods

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/master 675bd8fc5 -> 8b02711e4


[KARAF-5315] Synchronize lock methods


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5761abf9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5761abf9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5761abf9

Branch: refs/heads/master
Commit: 5761abf97fe6b010b40e2764d9eec6f3fcdd8875
Parents: 675bd8f
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Mon Sep 18 10:51:37 2017 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Tue Sep 19 11:06:29 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/main/lock/SimpleFileLock.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5761abf9/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java 
b/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java
index cc9cd3e..162d488 100644
--- a/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java
+++ b/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java
@@ -58,7 +58,7 @@ public class SimpleFileLock implements Lock {
         }
     }
 
-    public boolean lock() throws Exception {
+    public synchronized boolean lock() throws Exception {
         LOG.info("Trying to lock " + lockPath.getPath());
         if (lock == null) {
             lock = lockFile.getChannel().tryLock();
@@ -80,7 +80,7 @@ public class SimpleFileLock implements Lock {
         lock = null;
     }
  
-    public boolean isAlive() throws Exception {
+    public synchronized boolean isAlive() throws Exception {
         return lock != null && lock.isValid() && lockPath.exists();
     }
 
@@ -102,6 +102,7 @@ public class SimpleFileLock implements Lock {
         if (rc == null) {
             rc = lock;
         }
+
         return rc;
     }