[Jboss-cvs] JBossAS SVN: r55435 - branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/profileservice

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

Author: scott.stark at jboss.org
Date: 2006-08-09 08:05:11 -0400 (Wed, 09 Aug 2006)
New Revision: 55435

Modified:
   branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
Log:
Restore the default ctor and only register the server in the kernel if not null.

Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2006-08-09 12:02:30 UTC (rev 55434)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2006-08-09 12:05:11 UTC (rev 55435)
@@ -71,6 +71,10 @@
    /** An explicit deployer-beans.xml URL to deploy */
    protected URL bootstrapURL;
 
+   public ProfileServiceBootstrap()
+   {
+      this("default", null);
+   }
    public ProfileServiceBootstrap(String name, Server server)
    {
       this.profileName = name;
@@ -181,15 +185,18 @@
     	  deploy(bootstrapURL);    	  
       }
 
-      // Register the Server instance in the kernel
       Kernel kernel = getKernel();
       KernelController controller = kernel.getController();
       KernelRegistry registry = kernel.getRegistry();
       KernelConfigurator config = kernel.getConfigurator();
-      BeanInfo info = config.getBeanInfo(server.getClass());;
-      AbstractBeanMetaData metaData = new AbstractBeanMetaData("org.jboss.system.server.Server", null);
-      AbstractKernelControllerContext serverEntry = new AbstractKernelControllerContext(info, metaData, server);
-      controller.install(serverEntry);
+      // Register the Server instance in the kernel
+      if( server != null )
+      {
+         BeanInfo info = config.getBeanInfo(server.getClass());;
+         AbstractBeanMetaData metaData = new AbstractBeanMetaData("org.jboss.system.server.Server", null);
+         AbstractKernelControllerContext serverEntry = new AbstractKernelControllerContext(info, metaData, server);
+         controller.install(serverEntry);
+      }
  
       // Validate that everything is ok
       kernelDeployer.validate();