[jboss-cvs] JBossAS SVN: r104083 - trunk/system/src/main/java/org/jboss/system/deployers.

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

Author: alesj
Date: 2010-04-20 11:44:51 -0400 (Tue, 20 Apr 2010)
New Revision: 104083

Modified:
   trunk/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java
Log:
[JBAS-7614]; fix order map creation.

Modified: trunk/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java	2010-04-20 15:18:34 UTC (rev 104082)
+++ trunk/system/src/main/java/org/jboss/system/deployers/LegacyDeploymentContextComparator.java	2010-04-20 15:44:51 UTC (rev 104083)
@@ -31,8 +31,6 @@
  * Legacy deployment sorter
  *
  * @author ales.justin at jboss.org
- * @see org.jboss.deployment.DeploymentSorter in system-jmx
- * @see org.jboss.deployment.SuffixOrderHelper in system-jmx
  */
 public class LegacyDeploymentContextComparator extends DefaultDeploymentContextComparator
 {
@@ -68,6 +66,7 @@
 
    private boolean useDefaults = true;
    private Map<String, Integer> suffixOrder;
+   private Map<String, Integer> orderMap;
    private int defaultOrder = 850;
 
    /**
@@ -100,7 +99,7 @@
    protected int getContextOrder(DeploymentContext context)
    {
       String simpleName = context.getSimpleName();
-      for (Map.Entry<String, Integer> entry : suffixOrder.entrySet())
+      for (Map.Entry<String, Integer> entry : getOrderMap().entrySet())
       {
          if (simpleName.endsWith(entry.getKey()))
             return entry.getValue();
@@ -108,14 +107,35 @@
       return defaultOrder;
    }
 
+   protected Map<String, Integer> getOrderMap()
+   {
+      if (orderMap == null)
+         orderMap = createOrderMap();
+
+      return orderMap;
+   }
+
    public void create()
    {
+      // do nothing -- back compatibility purpose only
+   }
+
+   /**
+    * Create order map.
+    *
+    * Legacy mappings first,
+    * then override it with custom suffix order.
+    *
+    * @return the new order map
+    */
+   public Map<String, Integer> createOrderMap()
+   {
       Map<String, Integer> map = new HashMap<String, Integer>();
       if (useDefaults)
          map.putAll(legacyOrder);
       if (suffixOrder != null)
          map.putAll(suffixOrder);
-      suffixOrder = map;
+      return map;
    }
 
    /**