You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2014/05/01 14:48:32 UTC

svn commit: r1591638 - /sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java

Author: justin
Date: Thu May  1 12:48:32 2014
New Revision: 1591638

URL: http://svn.apache.org/r1591638
Log:
SLING-3536 - on each interval for callback disposal, continue to poll until all queue is exhausted.

Modified:
    sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java

Modified: sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java?rev=1591638&r1=1591637&r2=1591638&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java Thu May  1 12:48:32 2014
@@ -133,10 +133,11 @@ public class ModelAdapterFactory impleme
     @Override
     public void run() {
         java.lang.ref.Reference<? extends Object> ref = queue.poll();
-        if (ref != null) {
-            log.debug("calling disposal for " + ref.toString());
+        while (ref != null) {
+            log.debug("calling disposal for {}.", ref.toString());
             DisposalCallbackRegistryImpl registry = disposalCallbacks.remove(ref);
             registry.onDisposed();
+            ref = queue.poll();
         }
     }