Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@minotaur.apache.org Received: (qmail 37198 invoked from network); 26 Jun 2009 08:48:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jun 2009 08:48:25 -0000 Received: (qmail 52089 invoked by uid 500); 26 Jun 2009 08:48:36 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 52029 invoked by uid 500); 26 Jun 2009 08:48:36 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 52019 invoked by uid 99); 26 Jun 2009 08:48:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2009 08:48:36 +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, 26 Jun 2009 08:48:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 681DD23888E5; Fri, 26 Jun 2009 08:48:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r788635 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java Date: Fri, 26 Jun 2009 08:48:14 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090626084814.681DD23888E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Jun 26 08:48:13 2009 New Revision: 788635 URL: http://svn.apache.org/viewvc?rev=788635&view=rev Log: Reorder equals checks Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java?rev=788635&r1=788634&r2=788635&view=diff ============================================================================== --- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java (original) +++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java Fri Jun 26 08:48:13 2009 @@ -344,11 +344,11 @@ if ( isGet == o.isGet && isHtml == o.isHtml && numRequestSelectors == o.numRequestSelectors - && stringEquals(methodName, o.methodName) - && stringEquals(baseResourceType, o.baseResourceType) && stringEquals(resourceType, o.resourceType) && stringEquals(resourceSuperType, o.resourceSuperType) - && stringEquals(extension, o.extension) ) { + && stringEquals(extension, o.extension) + && stringEquals(baseResourceType, o.baseResourceType) + && stringEquals(methodName, o.methodName) ) { // now compare selectors for(int i=0;i