Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E54510BFF for ; Tue, 7 May 2013 06:12:34 +0000 (UTC) Received: (qmail 74961 invoked by uid 500); 7 May 2013 06:12:34 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 74922 invoked by uid 500); 7 May 2013 06:12:34 -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 74910 invoked by uid 99); 7 May 2013 06:12:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 06:12:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 07 May 2013 06:12:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B555C23888EA; Tue, 7 May 2013 06:12:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479770 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java Date: Tue, 07 May 2013 06:12:12 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130507061212.B555C23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue May 7 06:12:12 2013 New Revision: 1479770 URL: http://svn.apache.org/r1479770 Log: SLING-2829 : Ignore empty handler when closing queue Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java?rev=1479770&r1=1479769&r2=1479770&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java (original) +++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java Tue May 7 06:12:12 2013 @@ -51,6 +51,15 @@ public final class OrderedJobQueue exten @Override public int compare(final JobHandler o1, final JobHandler o2) { + if ( o1.getJob() == null ) { + if ( o2.getJob() == null ) { + return 0; + } + return -1; + } + if ( o2.getJob() == null ) { + return 1; + } return o1.getJob().getCreated().compareTo(o2.getJob().getCreated()); } });