incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1478359 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs: JobManagerImpl.java queues/TopicRoundRobinJobQueue.java
Date Thu, 02 May 2013 13:15:33 GMT
Author: cziegeler
Date: Thu May  2 13:15:32 2013
New Revision: 1478359

URL: http://svn.apache.org/r1478359
Log:
SLING-2851 :  Topic Round Robin Queue is not correctly marked for removal 

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/TopicRoundRobinJobQueue.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1478359&r1=1478358&r2=1478359&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
Thu May  2 13:15:32 2013
@@ -384,8 +384,10 @@ public class JobManagerImpl
             // update mbeans
             eventAdmin.sendEvent(new QueueStatusEvent(null, queue));
         } else {
-            // notify queue
-            queue.rename(queue.getName() + "<outdated>(" + queue.hashCode() + ")");
+            if ( !queue.getName().contains("<outdated>") ) {
+                // notify queue
+                queue.rename(queue.getName() + "<outdated>(" + queue.hashCode() + ")");
+            }
             // readd with new name
             this.queues.put(queue.getName(), queue);
             // update mbeans

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/TopicRoundRobinJobQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/TopicRoundRobinJobQueue.java?rev=1478359&r1=1478358&r2=1478359&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/TopicRoundRobinJobQueue.java
(original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/TopicRoundRobinJobQueue.java
Thu May  2 13:15:32 2013
@@ -69,7 +69,7 @@ public final class TopicRoundRobinJobQue
     protected boolean canBeMarkedForRemoval() {
         boolean result = super.canBeMarkedForRemoval();
         if ( result ) {
-            result = !this.isWaitingForNext;
+            result = this.isWaitingForNext;
         }
         return result;
     }



Mime
View raw message