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

[do-not-reply at jboss.org]

Author: dkuleshov
Date: 2011-08-18 11:01:36 -0400 (Thu, 18 Aug 2011)
New Revision: 4775

Modified:
   kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/ExoContainerContextFactory.java
   kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java
Log:
EXOJCR-1445: changed DS binding for tomcat AS

Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/ExoContainerContextFactory.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/ExoContainerContextFactory.java	2011-08-18 08:47:38 UTC (rev 4774)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/ExoContainerContextFactory.java	2011-08-18 15:01:36 UTC (rev 4775)
@@ -111,6 +111,11 @@
          }
       }
 
+      protected void bindRefValue(String name, Object value) throws NamingException
+      {
+         bind(name, value, false);
+      }
+
       protected Map<String, Object> getBindings()
       {
          return bindingsRef.get();

Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java	2011-08-18 08:47:38 UTC (rev 4774)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java	2011-08-18 15:01:36 UTC (rev 4775)
@@ -18,7 +18,6 @@
  */
 package org.exoplatform.services.naming;
 
-import org.exoplatform.services.jdbc.impl.CloseableDataSource;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
@@ -121,7 +120,7 @@
                   }
 
                   // Re-bind with the object with its new value to be able to return the same ins
-                  bind(name, obj, false);
+                  bindRefValue(name, obj);
                }
                catch (Exception e)
                {
@@ -156,7 +155,7 @@
       bind(name, value, true);
    }
 
-   private void bind(String name, Object value, boolean checkIfExists) throws NamingException
+   protected void bind(String name, Object value, boolean checkIfExists) throws NamingException
    {
       if (name.isEmpty())
       {
@@ -192,6 +191,13 @@
    /**
     * {@inheritDoc}
     */
+   protected void bindRefValue(String name, Object value) throws NamingException
+   {
+   }
+
+   /**
+    * {@inheritDoc}
+    */
    public void rebind(Name name, Object value) throws NamingException
    {
       rebind(nameToString(name), value);