Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 76404 invoked from network); 5 Mar 2010 15:28:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Mar 2010 15:28:44 -0000 Received: (qmail 88530 invoked by uid 500); 5 Mar 2010 15:28:30 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 88487 invoked by uid 500); 5 Mar 2010 15:28:30 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 88474 invoked by uid 99); 5 Mar 2010 15:28:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 15:28:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 15:28:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AB20023889EA; Fri, 5 Mar 2010 15:28:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r919450 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Date: Fri, 05 Mar 2010 15:28:06 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100305152806.AB20023889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Mar 5 15:28:06 2010 New Revision: 919450 URL: http://svn.apache.org/viewvc?rev=919450&view=rev Log: SLING-1426 : Spurious wakeups are not handled correctly 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=919450&r1=919449&r2=919450&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 Fri Mar 5 15:28:06 2010 @@ -1227,15 +1227,15 @@ * @see org.apache.sling.event.impl.job.JobStatusNotifier#sendAcknowledge(org.osgi.service.event.Event, java.lang.String) */ public boolean sendAcknowledge(Event job, String eventNodePath) { + final Object ack; synchronized ( this.processingEventsList ) { - // if the event is still in the processing list, we confirm the ack - final Object ack = this.processingEventsList.remove(eventNodePath); - if ( ack != null ) { - this.sendNotification(EventUtil.TOPIC_JOB_STARTED, job); - } - return ack != null; + ack = this.processingEventsList.remove(eventNodePath); } - + // if the event is still in the processing list, we confirm the ack + if ( ack != null ) { + this.sendNotification(EventUtil.TOPIC_JOB_STARTED, job); + } + return ack != null; } public static final class RescheduleInfo {