[Carbon-commits] [Carbon] svn commit r91838 - trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init

[azeez at wso2.com]

Author: azeez
Date: Sun Apr 17 06:18:39 2011
New Revision: 91838
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=91838

Log:
No need to wait for 5 seconds when restarting in standalone mode

Modified:
   trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java

Modified: trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java?rev=91838&r1=91837&r2=91838&view=diff
==============================================================================
--- trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java	(original)
+++ trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java	Sun Apr 17 06:18:39 2011
@@ -763,22 +763,24 @@
             } else {
                 log.info("Restarting " + serverName + "...");
             }
-            int waitFor = 5;
-            log.info("Waiting for " + waitFor + " sec before initiating restart");
-            Thread.sleep(waitFor * 1000); // The H2 DB connections do not get closed if this is not done
             try {
                 ServerStatus.setServerRestarting();
             } catch (AxisFault e) {
                 String msg = "Cannot set server to restarting mode";
                 log.error(msg, e);
             }
-//            MBeanRegistrar.unregisterAllMBeans();
-//            CarbonContextHolderBase.unloadTenant(MultitenantConstants.SUPER_TENANT_ID);
+            MBeanRegistrar.unregisterAllMBeans();
+            CarbonContextHolderBase.unloadTenant(MultitenantConstants.SUPER_TENANT_ID);
             ClusteringAgent clusteringAgent =
                     serverConfigContext.getAxisConfiguration().getClusteringAgent();
             if (clusteringAgent != null) {
                 clusteringAgent.finalize();
             }
+            if (!CarbonUtils.isRunningInStandaloneMode()) {
+                int waitFor = 5;
+                log.info("Waiting for " + waitFor + " sec before initiating restart");
+                Thread.sleep(waitFor * 1000); // The H2 DB connections do not get closed if this is not done
+            }
             new Thread(new FrameworkRestarter()).start();
         } catch (Exception e) {
             String msg = "Cannot set server to restarting mode";