geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r616570 - /geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Date Wed, 30 Jan 2008 00:09:52 GMT
Author: djencks
Date: Tue Jan 29 16:09:51 2008
New Revision: 616570

URL: http://svn.apache.org/viewvc?rev=616570&view=rev
Log:
GERONIMO-2971 fix most unbind exceptions.

Modified:
    geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java

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=616570&r1=616569&r2=616570&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
Tue Jan 29 16:09:51 2008
@@ -25,6 +25,7 @@
 
 import javax.naming.Name;
 import javax.naming.NamingException;
+import javax.naming.ContextNotEmptyException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -202,7 +203,9 @@
                 } else {
                     bindingsByName.remove(name);
                     try {
-                        removeDeepBinding(name, true, true);
+                        removeDeepBinding(name, true);
+                    } catch (ContextNotEmptyException e) {
+                        //ignore
                     } catch (NamingException e) {
                         log.error("Unable to remove binding " + name + " to " + abstractName,
e);
                     }



Mime
View raw message