[jboss-cvs] JBossAS SVN: r94309 - in projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal: deployment and 1 other directories.

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

Author: jesper.pedersen
Date: 2009-10-03 08:37:17 -0400 (Sat, 03 Oct 2009)
New Revision: 94309

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/bootstrap/Unmarshaller.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
Log:
Use a synchronized list for the bean names

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/bootstrap/Unmarshaller.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/bootstrap/Unmarshaller.java	2009-10-03 08:34:14 UTC (rev 94308)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/bootstrap/Unmarshaller.java	2009-10-03 12:37:17 UTC (rev 94309)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.fungal.bootstrap;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -77,6 +78,8 @@
             throw new IOException("Unsupport protocol: " + url);
          }
 
+         is = new BufferedInputStream(is, 4096);
+
          XMLInputFactory xmlInputFactory = null;
 
          try

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2009-10-03 08:34:14 UTC (rev 94308)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2009-10-03 12:37:17 UTC (rev 94309)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.fungal.deployment;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -77,6 +78,8 @@
             throw new IOException("Unsupport protocol: " + url);
          }
 
+         is = new BufferedInputStream(is, 4096);
+
          XMLInputFactory xmlInputFactory = null;
 
          try

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	2009-10-03 08:34:14 UTC (rev 94308)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2009-10-03 12:37:17 UTC (rev 94309)
@@ -36,6 +36,7 @@
 import java.net.InetAddress;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -86,7 +87,7 @@
       if (url == null || !url.toString().endsWith(".xml"))
          return null;
 
-      List<String> beans = new ArrayList<String>(1);
+      List<String> beans = Collections.synchronizedList(new ArrayList<String>(1));
 
       try
       {
@@ -189,7 +190,7 @@
 
                Object bean = createBean(bt, classLoader);
 
-               kernel.addBean(bt.getName(), bean);
+               kernel.addBean(bt.getName(), bean); 
                beans.add(bt.getName());
 
                kernel.setBeanStatus(bt.getName(), ServiceLifecycle.STARTED);