Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 39496 invoked from network); 26 Apr 2010 18:41:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Apr 2010 18:41:54 -0000 Received: (qmail 13655 invoked by uid 500); 26 Apr 2010 18:41:54 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 13636 invoked by uid 500); 26 Apr 2010 18:41:54 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 13626 invoked by uid 99); 26 Apr 2010 18:41:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:41:54 +0000 X-ASF-Spam-Status: No, hits=-1417.6 required=10.0 tests=ALL_TRUSTED,AWL 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, 26 Apr 2010 18:41:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 99CC72388978; Mon, 26 Apr 2010 18:41:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938182 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java Date: Mon, 26 Apr 2010 18:41:11 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100426184111.99CC72388978@eris.apache.org> Author: gnodet Date: Mon Apr 26 18:41:11 2010 New Revision: 938182 URL: http://svn.apache.org/viewvc?rev=938182&view=rev Log: Revert FELIX-2201 which cause regressions Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java?rev=938182&r1=938181&r2=938182&view=diff ============================================================================== --- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java (original) +++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java Mon Apr 26 18:41:11 2010 @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.TreeSet; import java.util.zip.CRC32; /** @@ -104,7 +103,7 @@ public class Scanner { { return null; } - Set/**/ files = new TreeSet/**/(new FileModificationTimeComparator()); + Set/**/ files = new HashSet/**/(); Set/**/ removed = new HashSet/**/(storedChecksums.keySet()); for (int i = 0; i < list.length; i++) { @@ -201,18 +200,4 @@ public class Scanner { } } - /** - * {@link Comparator} that sorts {@link File}s in increasing order of modification time - * ("oldest first"). - */ - private final static class FileModificationTimeComparator implements Comparator - { - public int compare(Object arg0, Object arg1) - { - File lhs = (File) arg0; - File rhs = (File) arg1; - return (int) (lhs.lastModified() - rhs.lastModified()); - } - } - }