[infinispan-commits] Infinispan SVN: r1102 - trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2009-11-04 16:12:54 -0500 (Wed, 04 Nov 2009)
New Revision: 1102

Modified:
   trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/SharedLuceneLock.java
Log:
[ISPN-252] (Fix Lucene directory after ISPN-251)

Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/SharedLuceneLock.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/SharedLuceneLock.java	2009-11-04 16:46:43 UTC (rev 1101)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/locking/SharedLuceneLock.java	2009-11-04 21:12:54 UTC (rev 1102)
@@ -67,7 +67,7 @@
     */
    @Override
    public boolean obtain() throws IOException {
-      Object previousValue = cache.putIfAbsent(keyOfLock, keyOfLock, lockFlags);
+      Object previousValue = cache.withFlags(lockFlags).putIfAbsent(keyOfLock, keyOfLock);
       if (previousValue == null) {
          if (log.isTraceEnabled()) {
             log.trace("Lock: {0} acquired for index: {1}", lockName, indexName);
@@ -101,7 +101,7 @@
     * at Directory creation: we expect the lock to not exist in this case.
     */
    private void clearLock() {
-      Object previousValue = cache.remove(keyOfLock, lockFlags);
+      Object previousValue = cache.withFlags(lockFlags).remove(keyOfLock);
       if (previousValue!=null && log.isTraceEnabled()) {
          log.trace("Lock removed for index: {0}", indexName);
       }
@@ -116,7 +116,7 @@
          if ((tx = tm.getTransaction()) != null) {
             tm.suspend();
          }
-         locked = cache.containsKey(keyOfLock, lockFlags);
+         locked = cache.withFlags(lockFlags).containsKey(keyOfLock);
       } catch (Exception e) {
          log.error("Error in suspending transaction", e);
       } finally {