[exo-jcr-commits] exo-jcr SVN: r2764 - ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl.

[do-not-reply at jboss.org]

Author: aparfonov
Date: 2010-07-09 10:58:06 -0400 (Fri, 09 Jul 2010)
New Revision: 2764

Modified:
   ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java
Log:
EXOJCR-824: 

Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java
===================================================================
--- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java	2010-07-09 14:46:40 UTC (rev 2763)
+++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java	2010-07-09 14:58:06 UTC (rev 2764)
@@ -159,7 +159,7 @@
                if (expirationDate > 0 && expirationDate < System.currentTimeMillis())
                {
                   iter.remove();
-                  for (ResourceListener listener: resourceListeners)
+                  for (ResourceListener listener : resourceListeners)
                   {
                      listener.resourceRemoved(next.getObjectModel());
                   }
@@ -201,9 +201,15 @@
     * @throws Exception if can't set instance of {@link RuntimeDelegate}
     * @see MethodInvokerFactory
     */
-   @SuppressWarnings("unchecked")
    public ResourceBinder(ExoContainerContext containerContext, MethodInvokerFactory invokerFactory) throws Exception
    {
+      this(containerContext, null, invokerFactory);
+   }
+
+   @SuppressWarnings("unchecked")
+   protected ResourceBinder(ExoContainerContext containerContext, ResourceCleaner cleaner,
+      MethodInvokerFactory invokerFactory) throws Exception
+   {
       this.invokerFactory = invokerFactory;
 
       // Initialize RuntimeDelegate instance
@@ -242,9 +248,9 @@
          }
       }
 
-      Thread cleaner = new Thread(new ResourceCleaner(60));
-      cleaner.setDaemon(true);
-      cleaner.start();
+      Thread thread = new Thread(cleaner == null ? new ResourceCleaner(60) : cleaner);
+      thread.setDaemon(true);
+      thread.start();
    }
 
    /**
@@ -459,7 +465,7 @@
          }
          rootResources.add(resourceFactory);
          Collections.sort(rootResources, RESOURCE_COMPARATOR);
-         for (ResourceListener listener: resourceListeners)
+         for (ResourceListener listener : resourceListeners)
          {
             listener.resourceAdded(resourceFactory.getObjectModel());
          }
@@ -635,7 +641,7 @@
          }
          if (resource != null)
          {
-            for (ResourceListener listener: resourceListeners)
+            for (ResourceListener listener : resourceListeners)
             {
                listener.resourceRemoved(resource.getObjectModel());
             }
@@ -673,7 +679,7 @@
          }
          if (resource != null)
          {
-            for (ResourceListener listener: resourceListeners)
+            for (ResourceListener listener : resourceListeners)
             {
                listener.resourceRemoved(resource.getObjectModel());
             }