curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [6/7] git commit: minor re-format
Date Tue, 26 Aug 2014 17:58:53 GMT
minor re-format


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/942e23d4
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/942e23d4
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/942e23d4

Branch: refs/heads/master
Commit: 942e23d4ded3e7d687a1c818aacb69c0e7f8ba3d
Parents: d5f5517
Author: randgalt <randgalt@apache.org>
Authored: Tue Aug 26 12:55:31 2014 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Tue Aug 26 12:55:31 2014 -0500

----------------------------------------------------------------------
 .../recipes/locks/InterProcessMutex.java        | 57 +++++++++-----------
 1 file changed, 26 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/942e23d4/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
index 02a3d1f..c8032a8 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.curator.framework.recipes.locks;
 
 import com.google.common.collect.Maps;
@@ -35,15 +36,15 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class InterProcessMutex implements InterProcessLock, Revocable<InterProcessMutex>
 {
-    private final LockInternals         internals;
-    private final String                basePath;
+    private final LockInternals internals;
+    private final String basePath;
 
-    private final ConcurrentMap<Thread, LockData>   threadData = Maps.newConcurrentMap();
+    private final ConcurrentMap<Thread, LockData> threadData = Maps.newConcurrentMap();
 
     private static class LockData
     {
-        final Thread        owningThread;
-        final String        lockPath;
+        final Thread owningThread;
+        final String lockPath;
         final AtomicInteger lockCount = new AtomicInteger(1);
 
         private LockData(Thread owningThread, String lockPath)
@@ -57,7 +58,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
 
     /**
      * @param client client
-     * @param path the path to lock
+     * @param path   the path to lock
      */
     public InterProcessMutex(CuratorFramework client, String path)
     {
@@ -66,7 +67,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
 
     /**
      * @param client client
-     * @param path the path to lock
+     * @param path   the path to lock
      * @param driver lock driver
      */
     public InterProcessMutex(CuratorFramework client, String path, LockInternalsDriver driver)
@@ -131,8 +132,8 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
             can be only acted on by a single thread so locking isn't necessary
          */
 
-        Thread      currentThread = Thread.currentThread();
-        LockData    lockData = threadData.get(currentThread);
+        Thread currentThread = Thread.currentThread();
+        LockData lockData = threadData.get(currentThread);
         if ( lockData == null )
         {
             throw new IllegalMonitorStateException("You do not own the lock: " + basePath);
@@ -163,7 +164,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
      * @return list of nodes
      * @throws Exception ZK errors, interruptions, etc.
      */
-    public Collection<String>   getParticipantNodes() throws Exception
+    public Collection<String> getParticipantNodes() throws Exception
     {
         return LockInternals.getParticipantNodes(internals.getClient(), basePath, internals.getLockName(),
internals.getDriver());
     }
@@ -177,21 +178,14 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
     @Override
     public void makeRevocable(final RevocationListener<InterProcessMutex> listener,
Executor executor)
     {
-        internals.makeRevocable
-        (
-            new RevocationSpec
-            (
-                executor,
-                new Runnable()
+        internals.makeRevocable(new RevocationSpec(executor, new Runnable()
+            {
+                @Override
+                public void run()
                 {
-                    @Override
-                    public void run()
-                    {
-                        listener.revocationRequested(InterProcessMutex.this);
-                    }
+                    listener.revocationRequested(InterProcessMutex.this);
                 }
-            )
-        );
+            }));
     }
 
     InterProcessMutex(CuratorFramework client, String path, String lockName, int maxLeases,
LockInternalsDriver driver)
@@ -200,19 +194,20 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
         internals = new LockInternals(client, driver, path, lockName, maxLeases);
     }
 
-    boolean      isOwnedByCurrentThread()
+    boolean isOwnedByCurrentThread()
     {
-        LockData    lockData = threadData.get(Thread.currentThread());
+        LockData lockData = threadData.get(Thread.currentThread());
         return (lockData != null) && (lockData.lockCount.get() > 0);
     }
 
-    protected byte[]        getLockNodeBytes()
+    protected byte[] getLockNodeBytes()
     {
         return null;
     }
 
-    protected String getLockPath() {
-        LockData    lockData = threadData.get(Thread.currentThread());
+    protected String getLockPath()
+    {
+        LockData lockData = threadData.get(Thread.currentThread());
         return lockData != null ? lockData.lockPath : null;
     }
 
@@ -223,9 +218,9 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
            can be only acted on by a single thread so locking isn't necessary
         */
 
-        Thread          currentThread = Thread.currentThread();
+        Thread currentThread = Thread.currentThread();
 
-        LockData        lockData = threadData.get(currentThread);
+        LockData lockData = threadData.get(currentThread);
         if ( lockData != null )
         {
             // re-entering
@@ -236,7 +231,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
         String lockPath = internals.attemptLock(time, unit, getLockNodeBytes());
         if ( lockPath != null )
         {
-            LockData        newLockData = new LockData(currentThread, lockPath);
+            LockData newLockData = new LockData(currentThread, lockPath);
             threadData.put(currentThread, newLockData);
             return true;
         }


Mime
View raw message