[jboss-cvs] JBossAS SVN: r99187 - projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl.

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

Author: jesper.pedersen
Date: 2010-01-10 07:56:38 -0500 (Sun, 10 Jan 2010)
New Revision: 99187

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
Log:
Optimize memory requirements for dependencies during startup

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-10 12:33:09 UTC (rev 99186)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-10 12:56:38 UTC (rev 99187)
@@ -309,7 +309,7 @@
          List<DependsType> dts = bt.getDepends();
          if (dts.size() > 0)
          {
-            result = new HashSet<String>();
+            result = new HashSet<String>(dts.size());
             for (DependsType dt : dts)
             {
                result.add(dt.getValue());
@@ -320,15 +320,15 @@
          List<PropertyType> pts = bt.getProperty();
          if (pts.size() > 0)
          {
-            if (result == null)
-               result = new HashSet<String>();
-
             for (PropertyType pt : pts)
             {
                Object element = pt.getContent().get(0);
 
                if (element != null && element instanceof InjectType)
                {
+                  if (result == null)
+                     result = new HashSet<String>(1);
+
                   InjectType it = (InjectType)element;
                   result.add(it.getBean());
                   kernel.addBeanDependants(bt.getName(), it.getBean());
@@ -342,12 +342,13 @@
             if (ct.getFactory() != null)
             {
                if (result == null)
-                  result = new HashSet<String>();
+                  result = new HashSet<String>(1);
 
                result.add(ct.getFactory().getBean());
                kernel.addBeanDependants(bt.getName(), ct.getFactory().getBean());
             }
-            else if (ct.getParameter() != null && ct.getParameter().size() > 0)
+            
+            if (ct.getParameter() != null && ct.getParameter().size() > 0)
             {
                for (ParameterType pt : ct.getParameter())
                {
@@ -355,7 +356,7 @@
                   if (v instanceof InjectType)
                   {
                      if (result == null)
-                        result = new HashSet<String>();
+                        result = new HashSet<String>(1);
 
                      InjectType it = (InjectType)v;
                      result.add(it.getBean());