You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/02/08 01:48:23 UTC
svn commit: r619712 - in /geronimo/server/trunk/framework:
configs/rmi-naming/src/main/plan/plan.xml
modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Author: djencks
Date: Thu Feb 7 16:48:22 2008
New Revision: 619712
URL: http://svn.apache.org/viewvc?rev=619712&view=rev
Log:
GERONIMO-3808 fix npe on shutdown. Not convinced this is compatible with resource bindings
Modified:
geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=619712&r1=619711&r2=619712&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Thu Feb 7 16:48:22 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/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java?rev=619712&r1=619711&r2=619712&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java Thu Feb 7 16:48:22 2008
@@ -203,7 +203,7 @@
} else {
bindingsByName.remove(name);
try {
- removeDeepBinding(name, true);
+ removeDeepBinding(name, true, true);
} catch (ContextNotEmptyException e) {
//ignore
} catch (NamingException e) {