[exo-jcr-commits] exo-jcr SVN: r4630 - kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-07-14 05:11:41 -0400 (Thu, 14 Jul 2011)
New Revision: 4630

Modified:
   kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
Log:
EXOJCR-1425: Close all database connections, Bind datasources after context is replaced

Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java	2011-07-14 08:38:04 UTC (rev 4629)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java	2011-07-14 09:11:41 UTC (rev 4630)
@@ -118,16 +118,6 @@
 
       ValueParam bindingStorePathParam = params.getValueParam(BINDINGS_STORE_PATH);
 
-      // binder
-      if (bindingStorePathParam == null)
-      {
-         binder = new InitialContextBinder(this, DEFAULT_BINDING_STORE_PATH);
-      }
-      else
-      {
-         binder = new InitialContextBinder(this, bindingStorePathParam.getValue());
-      }
-      
       if (LOG.isDebugEnabled())
       {
          LOG.debug("The default initial context factory is " + DEFAULT_INITIAL_CONTEXT_FACTORY);         
@@ -140,6 +130,16 @@
             .setProperty(Context.INITIAL_CONTEXT_FACTORY, ExoContainerContextFactory.class.getName());
 
       }
+
+      // binder
+      if (bindingStorePathParam == null)
+      {
+         binder = new InitialContextBinder(this, DEFAULT_BINDING_STORE_PATH);
+      }
+      else
+      {
+         binder = new InitialContextBinder(this, bindingStorePathParam.getValue());
+      }
    }
 
    private void setSystemProperty(String propName, String propValue, String propParamName)