svn commit: r991169 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

[cziegeler]

Author: cziegeler
Date: Tue Aug 31 12:17:17 2010
New Revision: 991169

URL: http://svn.apache.org/viewvc?rev=991169&view=rev
Log:
SLING-1710 : JobEventHandler: jobs in a waiting state won't be waked up anymore 
if job.getProperty(EventUtil.PROPERTY_JOB_QUEUE_NAME) != null

Modified:
    
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Modified: 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=991169&r1=991168&r2=991169&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
 Tue Aug 31 12:17:17 2010
@@ -601,6 +601,10 @@ public class JobEventHandler
                         if ( this.jobQueues.size() >= this.maxJobQueues ) {
                             this.logger.warn("Unable to create new job queue 
named {} as there are already {} job queues." +
                                     " Try to increase the maximum number of 
job queues!", queueName, this.jobQueues.size());
+                            // if the job is not put into a queue, we have to 
remove the queue name property
+                            final EventPropertiesMap newEvent = new 
EventPropertiesMap(info.event);
+                            newEvent.remove(EventUtil.PROPERTY_JOB_QUEUE_NAME);
+                            info.event = new Event(info.event.getTopic(), 
(Dictionary<String, Object>)newEvent);
                         } else {
                             final boolean orderedQueue = 
info.event.getProperty(EventUtil.PROPERTY_JOB_QUEUE_ORDERED) != null;
                             final JobBlockingQueue jq = new 
JobBlockingQueue(queueName, orderedQueue, this.logger);