[exo-jcr-commits] exo-jcr SVN: r6001 - jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2012-04-02 02:36:05 -0400 (Mon, 02 Apr 2012)
New Revision: 6001

Modified:
   jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch
Log:
JCR-1731 : Patch for fix probleb with "JbossCache in CacheableLockManagerImpl is not load data from cache loader after second start repository (stop and start on repository) in "jbosscache-shareable" mode." was propoused.

Modified: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch
===================================================================
--- jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch	2012-03-30 13:15:56 UTC (rev 6000)
+++ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch	2012-04-02 06:36:05 UTC (rev 6001)
@@ -327,15 +327,7 @@
 ===================================================================
 --- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java	(revision 5992)
 +++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java	(working copy)
-@@ -31,6 +31,7 @@
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
-+import java.util.concurrent.atomic.AtomicBoolean;
- 
- /**
-  * This {@link CacheLoader} is used to encapsulate the {@link CacheLoader} used to persist the data of the Locks.
-@@ -50,6 +51,11 @@
+@@ -50,6 +50,11 @@
  public class ControllerCacheLoader implements CacheLoader
  {
     /**
@@ -347,11 +339,11 @@
      * The nested cache loader
      */
     private final CacheLoader cl;
-@@ -103,6 +109,11 @@
+@@ -103,6 +108,11 @@
              return cl.exists(name);
           }
        }
-+      else if (allowDirectAccess.get() != null && allowDirectAccess.get())
++      else if (allowDirectAccess.get() != null)
 +      {
 +         return cl.exists(name);
 +      }
@@ -359,11 +351,11 @@
        // All the data is loaded at startup, so no need to call the nested cache loader for another
        // cache status other than CacheStatus.STARTING
        return false;
-@@ -130,6 +141,11 @@
+@@ -130,6 +140,11 @@
              return cl.get(name);
           }
        }
-+      else if (allowDirectAccess.get() != null && allowDirectAccess.get())
++      else if (allowDirectAccess.get() != null)
 +      {
 +         return cl.get(name);
 +      }
@@ -371,7 +363,7 @@
        // All the data is loaded at startup, so no need to call the nested cache loader for another
        // cache status other than CacheStatus.STARTING
        return null;
-@@ -305,4 +321,21 @@
+@@ -305,4 +320,21 @@
        cl.stop();
     }