geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r619719 - in /geronimo/server/branches/2.1/framework: configs/rmi-naming/src/main/plan/plan.xml modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Date Fri, 08 Feb 2008 00:59:58 GMT
Author: djencks
Date: Thu Feb  7 16:59:35 2008
New Revision: 619719

URL: http://svn.apache.org/viewvc?rev=619719&view=rev
Log:
GERONIMO-3808 NPE fix ported from trunk

Modified:
    geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java

Modified: geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=619719&r1=619718&r2=619719&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml Thu Feb
 7 16:59:35 2008
@@ -32,9 +32,7 @@
 
     <gbean name="GlobalContext" class="org.apache.geronimo.gjndi.GlobalContextGBean"/>
 
-    <gbean name="JavaCompContext" class="org.apache.geronimo.gjndi.JavaCompContextGBean">
-        <dependency><name>GlobalContext</name></dependency>
-    </gbean>
+    <gbean name="JavaCompContext" class="org.apache.geronimo.gjndi.JavaCompContextGBean"/>
 
     <gbean name="JavaContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
         <attribute name="nameInNamespace">java:</attribute>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java?rev=619719&r1=619718&r2=619719&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Thu Feb  7 16:59:35 2008
@@ -203,7 +203,7 @@
                 } else {
                     bindingsByName.remove(name);
                     try {
-                        removeDeepBinding(name, true);
+                        removeDeepBinding(name, true, true);
                     } catch (ContextNotEmptyException e) {
                         //ignore
                     } catch (NamingException e) {



Mime
View raw message