[exo-jcr-commits] exo-jcr SVN: r4349 - in jcr/branches/1.12.x/patch/1.12.9-GA: JCR-1622 and 1 other directory.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2011-05-09 15:14:47 -0400 (Mon, 09 May 2011)
New Revision: 4349

Added:
   jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1622/
   jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1622/JCR-1622.patch
Log:
JCR-1622: patch proposed

Added: jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1622/JCR-1622.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1622/JCR-1622.patch	                        (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1622/JCR-1622.patch	2011-05-09 19:14:47 UTC (rev 4349)
@@ -0,0 +1,167 @@
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java	(revision 4347)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java	(working copy)
+@@ -20,6 +20,7 @@
+ 
+ import org.exoplatform.services.jcr.config.RepositoryEntry;
+ import org.exoplatform.services.jcr.impl.proccess.WorkerService;
++import org.picocontainer.Startable;
+ 
+ /**
+  * LockRemoverHolder holds is a single per-repository LockRemover container.
+@@ -27,7 +28,7 @@
+  * @author <a href="mailto:karpenko.sergiy at gmail.com">Karpenko Sergiy</a>
+  * @version $Id: exo-jboss-codetemplates.xml 34360 2009-07-22 23:58:59Z aheritier $
+  */
+-public class LockRemoverHolder
++public class LockRemoverHolder implements Startable
+ {
+ 
+    /**
+@@ -80,4 +81,19 @@
+       return new LockRemover(workerService, lockManager, timeout);
+    }
+ 
++   /**
++    * @see org.picocontainer.Startable#start()
++    */
++   public void start()
++   {
++   }
++
++   /**
++    * @see org.picocontainer.Startable#stop()
++    */
++   public void stop()
++   {
++      workerService.stop();
++   }
++
+ }
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java	(revision 4347)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java	(working copy)
+@@ -33,6 +33,7 @@
+ import org.exoplatform.services.jcr.impl.Constants;
+ import org.exoplatform.services.log.ExoLogger;
+ import org.exoplatform.services.log.Log;
++import org.picocontainer.Startable;
+ 
+ import java.util.ArrayList;
+ import java.util.Calendar;
+@@ -59,7 +60,7 @@
+  * @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
+  * @version $Id: LinkedWorkspaceStorageCacheImpl.java 34801 2009-07-31 15:44:50Z dkatayev $
+  */
+-public class LinkedWorkspaceStorageCacheImpl implements WorkspaceStorageCache
++public class LinkedWorkspaceStorageCacheImpl implements WorkspaceStorageCache, Startable
+ {
+ 
+    /**
+@@ -763,28 +764,6 @@
+       }
+    }
+ 
+-   /**
+-    * {@inheritDoc}
+-    */
+-   @Override
+-   protected void finalize() throws Throwable
+-   {
+-      try
+-      {
+-         workerTimer.cancel();
+-      }
+-      catch (Throwable e)
+-      {
+-         System.err.println(this.name + " cache, finalyze error " + e);
+-      }
+-
+-      nodesCache.clear();
+-      propertiesCache.clear();
+-      cache.clear();
+-
+-      super.finalize();
+-   }
+-
+    private void scheduleTask(TimerTask task, int start, long period)
+    {
+       Calendar firstTime = Calendar.getInstance();
+@@ -2000,4 +1979,33 @@
+    {
+       return true;
+    }
++
++   /**
++    * {@inheritDoc}
++    */
++   public void start()
++   {
++   }
++
++   /**
++    * {@inheritDoc}
++    */
++   public void stop()
++   {
++      if (workerTimer != null)
++      {
++         try
++         {
++            workerTimer.cancel();
++         }
++         catch (Throwable e)
++         {
++            LOG.warn(this.name + " cache, stop error " + e);
++         }
++      }
++
++      nodesCache.clear();
++      propertiesCache.clear();
++      cache.clear();
++   }
+ }
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleanerHolder.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleanerHolder.java	(revision 4347)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleanerHolder.java	(working copy)
+@@ -18,6 +18,8 @@
+  */
+ package org.exoplatform.services.jcr.impl.util.io;
+ 
++import org.picocontainer.Startable;
++
+ /**
+  * Created by The eXo Platform SAS. <br/> per workspace container file cleaner holder object
+  * 
+@@ -25,7 +27,7 @@
+  * @version $Id: WorkspaceFileCleanerHolder.java 11907 2008-03-13 15:36:21Z ksm $
+  */
+ 
+-public class FileCleanerHolder
++public class FileCleanerHolder implements Startable
+ {
+ 
+    private final FileCleaner fileCleaner;
+@@ -40,4 +42,19 @@
+       return fileCleaner;
+    }
+ 
++   /**
++    * @see org.picocontainer.Startable#start()
++    */
++   public void start()
++   {
++   }
++
++   /**
++    * @see org.picocontainer.Startable#stop()
++    */
++   public void stop()
++   {
++      fileCleaner.halt();
++   }
++
+ }