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

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

Author: alesj
Date: 2007-07-27 06:50:27 -0400 (Fri, 27 Jul 2007)
New Revision: 64320

Modified:
   projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
Log:
Added lazy compare on those who don't have order set.

Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java	2007-07-27 06:42:39 UTC (rev 64319)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java	2007-07-27 10:50:27 UTC (rev 64320)
@@ -79,7 +79,11 @@
             else
                relation = fstXsnd ? -1 : (sndXfst ? 1 : 0);
             if (relation == 0)
-               relation = one.getRelativeOrder() - two.getRelativeOrder();
+            {
+               // lazy compare on those who don't have order set
+               if (one.getRelativeOrder() != 0 && two.getRelativeOrder() != 0)
+                  relation = one.getRelativeOrder() - two.getRelativeOrder();
+            }
             connections[i][j] = relation;
             connections[j][i] = -connections[i][j];
          }