[jboss-cvs] JBossAS SVN: r81280 - in trunk/profileservice/src: resources and 1 other directory.

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

Author: alesj
Date: 2008-11-19 06:38:25 -0500 (Wed, 19 Nov 2008)
New Revision: 81280

Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
   trunk/profileservice/src/resources/profileservice-jboss-beans.xml
Log:
Make KBRCD more safe.

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java	2008-11-19 11:18:55 UTC (rev 81279)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java	2008-11-19 11:38:25 UTC (rev 81280)
@@ -46,54 +46,54 @@
    private Kernel kernel;
    private String statePropertyName = "state";
 
+   @Deprecated
    public KernelBusRuntimeComponentDispatcher(KernelBus bus)
    {
       this(bus, null);
    }
 
+   @Deprecated
    public KernelBusRuntimeComponentDispatcher(KernelBus bus, MetaValueFactory valueFactory)
    {
       super(valueFactory);
       if (bus == null)
          throw new IllegalArgumentException("Null kernel bus.");
+
       this.bus = bus;
+      this.kernel = bus.getKernel();
    }
 
-   /**
-    * Get the kernel.
-    * 
-    * @return the kernel.
-    */
-   public Kernel getKernel()
+   public KernelBusRuntimeComponentDispatcher(Kernel kernel)
    {
-      return kernel;
+      this(kernel, null);
    }
-   /**
-    * Set the kernel.
-    * 
-    * @param kernel the kernel.
-    */
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-   }
 
-
-   public KernelBus getBus()
+   public KernelBusRuntimeComponentDispatcher(Kernel kernel, MetaValueFactory valueFactory)
    {
-      return bus;
-   }
+      super(valueFactory);
+      if (kernel == null)
+         throw new IllegalArgumentException("Null kernel");
 
-   public void setBus(KernelBus bus)
-   {
-      this.bus = bus;
+      this.kernel = kernel;
+      this.bus = kernel.getBus();
    }
 
-   public String getStatePropertyName()
+   /**
+    * Check kernel and bus.
+    */
+   public void start()
    {
-      return statePropertyName;
+      if (kernel == null)
+         throw new IllegalArgumentException("Null kernel");
+      if (bus == null)
+         throw new IllegalArgumentException("Null kernel bus");
    }
 
+   /**
+    * Set the state property name.
+    *
+    * @param statePropertyName the state property name
+    */
    public void setStatePropertyName(String statePropertyName)
    {
       this.statePropertyName = statePropertyName;
@@ -105,6 +105,7 @@
       {
          if(propertyName.equals(statePropertyName))
             return getState(componentName);
+
          return create(bus.get(componentName, propertyName));
       }
       catch (Throwable t)
@@ -141,6 +142,7 @@
     * Get the state of a bean
     * 
     * @param name the bean name
+    * @return state enum value
     */
    protected EnumValue getState(Object name)
    {
@@ -152,5 +154,4 @@
       ControllerState state = context.getState();
       return new EnumValueSupport(ControllerStateMetaType.TYPE, state.getStateString());
    }
-
 }

Modified: trunk/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-jboss-beans.xml	2008-11-19 11:18:55 UTC (rev 81279)
+++ trunk/profileservice/src/resources/profileservice-jboss-beans.xml	2008-11-19 11:38:25 UTC (rev 81280)
@@ -52,9 +52,8 @@
 
     <bean name="RuntimeComponentDispatcher" class="org.jboss.profileservice.management.KernelBusRuntimeComponentDispatcher">
        <constructor>
-          <parameter><inject bean="jboss.kernel:service=KernelBus"/></parameter>
+          <parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter>
        </constructor>
-        <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
     </bean>
 
     <!--