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<numRequestSelectors;i++) {
if ( !stringEquals(requestSelectors[i], o.requestSelectors[i])
) {
