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

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

Author: jesper.pedersen
Date: 2009-09-24 16:52:22 -0400 (Thu, 24 Sep 2009)
New Revision: 94006

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
Log:
[JBJCA-166] Rename internal datastructures

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-09-24 20:46:13 UTC (rev 94005)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-09-24 20:52:22 UTC (rev 94006)
@@ -69,13 +69,13 @@
    /** Deployments */
    private List<Deployment> deployments = Collections.synchronizedList(new LinkedList<Deployment>());
 
-   /** Services */
-   private ConcurrentMap<String, Object> services = new ConcurrentHashMap<String, Object>();
+   /** Beans */
+   private ConcurrentMap<String, Object> beans = new ConcurrentHashMap<String, Object>();
 
-   /** Services status */
-   private ConcurrentMap<String, ServiceLifecycle> servicesStatus = new ConcurrentHashMap<String, ServiceLifecycle>();
+   /** Bean status */
+   private ConcurrentMap<String, ServiceLifecycle> beanStatus = new ConcurrentHashMap<String, ServiceLifecycle>();
 
-   /** Services status */
+   /** Bean dependants */
    private ConcurrentMap<String, Set<String>> beanDependants = new ConcurrentHashMap<String, Set<String>>();
 
    /** Executor service */
@@ -417,7 +417,7 @@
     */
    ServiceLifecycle getBeanStatus(String name)
    {
-      return servicesStatus.get(name);
+      return beanStatus.get(name);
    }
 
    /**
@@ -427,7 +427,7 @@
     */
    void setBeanStatus(String name, ServiceLifecycle status)
    {
-      servicesStatus.put(name, status);
+      beanStatus.put(name, status);
    }
 
    /**
@@ -435,21 +435,21 @@
     * @param name The name of the bean
     * @param bean The bean
     */
-   synchronized void addBean(String name, Object bean)
+   void addBean(String name, Object bean)
    {
       startup.add(name);
-      services.put(name, bean);
+      beans.put(name, bean);
    }
 
    /**
     * Remove a bean
     * @param name The name of the bean
     */
-   synchronized void removeBean(String name)
+   void removeBean(String name)
    {
       startup.remove(name);
-      services.remove(name);
-      servicesStatus.remove(name);
+      beans.remove(name);
+      beanStatus.remove(name);
    }
 
    /**
@@ -459,7 +459,7 @@
     */
    public Object getBean(String name)
    {
-      return services.get(name);
+      return beans.get(name);
    }
 
    /**