[jboss-cvs] JBossAS SVN: r95633 - 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-27 17:11:41 -0400 (Tue, 27 Oct 2009)
New Revision: 95633

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java
Log:
[JBDEPLOY-201]; add reverted more exact check on pass-through deployers.


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-27 21:08:23 UTC (rev 95632)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/DominoOrdering.java	2009-10-27 21:11:41 UTC (rev 95633)
@@ -82,10 +82,16 @@
                   // although we should aviod singe dimension checks
                   // which are already part of match() check
                   // in order not to break comparator comparison
-                  if (twoHead.dimension() > 1 && oneTail.dimension() >= twoHead.dimension() && oneTail.contains(twoHead))
+                  if ((twoHead.dimension() > 1 && oneTail.dimension() >= twoHead.dimension() && oneTail.contains(twoHead)) ||
+                      (oneTail.dimension() > 1 && twoHead.dimension() >= oneTail.dimension() && twoHead.contains(oneTail)))
+                  {
                      relation = -1;
-                  else if (oneHead.dimension() > 1 && twoTail.dimension() >= oneHead.dimension() && twoTail.contains(oneHead))
+                  }
+                  else if ((oneHead.dimension() > 1 && twoTail.dimension() >= oneHead.dimension() && twoTail.contains(oneHead)) ||
+                           (twoTail.dimension() > 1 && oneHead.dimension() >= twoTail.dimension() && oneHead.contains(twoTail)))
+                  {
                      relation = 1;
+                  }
                   // make name compare lazy - might already be fixed with transitive order
                }
                else