[jboss-cvs] JBossAS SVN: r95746 - projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-10-29 07:50:26 -0400 (Thu, 29 Oct 2009)
New Revision: 95746

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java
Log:
No need to check dim for those 2 usages, we already know it's more than 1.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java	2009-10-29 11:46:56 UTC (rev 95745)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java	2009-10-29 11:50:26 UTC (rev 95746)
@@ -81,13 +81,11 @@
                   // lets try to do more exact match
                   // although we should aviod singe dimension checks
                   // which are already part of match() check
-                  if ((twoHead.dimension() > 1 && oneTail.dimension() > 1 && fstXsnd > 1) ||
-                      (oneTail.dimension() > 1 && twoHead.dimension() > 1 && twoHead.intersect(oneTail) > 1))
+                  if (fstXsnd > 1 || (oneTail.dimension() > 1 && twoHead.dimension() > 1 && twoHead.intersect(oneTail) > 1))
                   {
                      relation = -1;
                   }
-                  else if ((oneHead.dimension() > 1 && twoTail.dimension() > 1 && sndXfst > 1) ||
-                           (twoTail.dimension() > 1 && oneHead.dimension() > 1 && oneHead.intersect(twoTail) > 1))
+                  else if (sndXfst > 1 || (twoTail.dimension() > 1 && oneHead.dimension() > 1 && oneHead.intersect(twoTail) > 1))
                   {
                      relation = 1;
                   }