[infinispan-commits] Infinispan SVN: r1470 - in trunk/core/src: main/java/org/infinispan/interceptors and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-08 12:42:51 -0500 (Mon, 08 Feb 2010)
New Revision: 1470

Modified:
   trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
   trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
   trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java
Log:
IntelliJ Inspection refactoring

Modified: trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2010-02-08 15:50:33 UTC (rev 1469)
+++ trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2010-02-08 17:42:51 UTC (rev 1470)
@@ -233,6 +233,6 @@
    }
 
    public final void releaseLock(Object key) {
-      lockManager.unlock(key, lockManager.getOwner(key));
+      lockManager.unlock(key);
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2010-02-08 15:50:33 UTC (rev 1469)
+++ trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2010-02-08 17:42:51 UTC (rev 1470)
@@ -286,7 +286,7 @@
             // and then unlock
             if (needToUnlock) {
                if (trace) log.trace("Releasing lock on [" + key + "] for owner " + owner);
-               lockManager.unlock(key, owner);
+               lockManager.unlock(key);
             }
          }
       } else {

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java	2010-02-08 15:50:33 UTC (rev 1469)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java	2010-02-08 17:42:51 UTC (rev 1470)
@@ -166,7 +166,7 @@
          // and then unlock
          if (needToUnlock) {
             if (trace) log.trace("Releasing lock on [" + key + "] for owner " + owner);
-            unlock(key, owner);
+            unlock(key);
          }
       }
    }

Modified: trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java	2010-02-08 15:50:33 UTC (rev 1469)
+++ trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java	2010-02-08 17:42:51 UTC (rev 1470)
@@ -187,7 +187,7 @@
       LockManager lm1 = TestingUtil.extractComponent(cache(0, "test"), LockManager.class);
       assert !lm1.isLocked("key") : "It is locked by " + lm1.getOwner("key");
 
-      lm2.unlock("key", ctx.getLockOwner());
+      lm2.unlock("key");
       assert !lm2.isLocked("key");
       assert !lm1.isLocked("key");
    }
@@ -210,7 +210,7 @@
       replicationLatch.countDown();
 
       Thread.sleep(3000); //just to make sure the remote tx thread managed to spin around for some times. 
-      lm2.unlock("key", ctx.getLockOwner());
+      lm2.unlock("key");
 
       t1.waitForResponse();