[infinispan-commits] Infinispan SVN: r1485 - in trunk/core/src/main/java/org/infinispan: util/concurrent/locks and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-02-09 11:43:59 -0500 (Tue, 09 Feb 2010)
New Revision: 1485

Modified:
   trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
Log:
Make lock acquisition logging more symmetric.

Modified: trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2010-02-09 16:33:02 UTC (rev 1484)
+++ trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2010-02-09 16:43:59 UTC (rev 1485)
@@ -203,8 +203,6 @@
 
       if (!ctx.hasLockedKey(key) && !shouldSkipLocking) {
          if (lockManager.lockAndRecord(key, ctx)) {
-            // successfully locked!
-            if (trace) log.trace("Successfully acquired lock!");
             return true;
          } else {
             Object owner = lockManager.getOwner(key);

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-09 16:33:02 UTC (rev 1484)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java	2010-02-09 16:43:59 UTC (rev 1485)
@@ -80,6 +80,8 @@
       long lockTimeout = getLockAcquisitionTimeout(ctx);
       if (trace) log.trace("Attempting to lock {0} with acquisition timeout of {1} millis", key, lockTimeout);
       if (lockContainer.acquireLock(key, lockTimeout, MILLISECONDS)) {
+         // successfully locked!
+         if (trace) log.trace("Successfully acquired lock!");         
          return true;
       }