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 34A9110D6C for ; Mon, 3 Nov 2014 07:20:18 +0000 (UTC) Received: (qmail 86179 invoked by uid 500); 3 Nov 2014 07:20:18 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 86125 invoked by uid 500); 3 Nov 2014 07:20:18 -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 86115 invoked by uid 99); 3 Nov 2014 07:20:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 07:20:18 +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; Mon, 03 Nov 2014 07:19:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54A8523889E2; Mon, 3 Nov 2014 07:18:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1636283 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java Date: Mon, 03 Nov 2014 07:18:54 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141103071854.54A8523889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Mon Nov 3 07:18:53 2014 New Revision: 1636283 URL: http://svn.apache.org/r1636283 Log: SLING-4122 : Folders might be created concurrently resulting in SNS nodes Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java?rev=1636283&r1=1636282&r2=1636283&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java (original) +++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java Mon Nov 3 07:18:53 2014 @@ -252,14 +252,22 @@ public abstract class Utility { @Override public int compare(final Resource o1, final Resource o2) { - final int value1 = Integer.valueOf(o1.getName()); - final int value2 = Integer.valueOf(o2.getName()); - if ( value1 < value2 ) { - return -1; - } else if ( value1 > value2 ) { - return 1; + Integer value1 = null; + try { + value1 = Integer.valueOf(o1.getName()); + } catch ( final NumberFormatException nfe) { + // ignore } - return 0; + Integer value2 = null; + try { + value2 = Integer.valueOf(o2.getName()); + } catch ( final NumberFormatException nfe) { + // ignore + } + if ( value1 != null && value2 != null ) { + return value1.compareTo(value2); + } + return o1.getName().compareTo(o2.getName()); } };