geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r216114 - /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
Date Wed, 13 Jul 2005 05:19:26 GMT
Author: djencks
Date: Tue Jul 12 22:19:24 2005
New Revision: 216114

URL: http://svn.apache.org/viewcvs?rev=216114&view=rev
Log:
GERONIMO 750 simple NPE fix

Modified:
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?rev=216114&r1=216113&r2=216114&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
Tue Jul 12 22:19:24 2005
@@ -380,15 +380,17 @@
 
     private void shutdown() {
         // unregister all GBeans
-        for (Iterator i = objectNames.iterator(); i.hasNext();) {
-            ObjectName name = (ObjectName) i.next();
-            kernel.getDependencyManager().removeDependency(name, objectName);
-            try {
-                log.trace("Unregistering GBean " + name);
-                kernel.unloadGBean(name);
-            } catch (Exception e) {
-                // ignore
-                log.warn("Could not unregister child " + name, e);
+        if (objectNames != null) {
+            for (Iterator i = objectNames.iterator(); i.hasNext();) {
+                ObjectName name = (ObjectName) i.next();
+                kernel.getDependencyManager().removeDependency(name, objectName);
+                try {
+                    log.trace("Unregistering GBean " + name);
+                    kernel.unloadGBean(name);
+                } catch (Exception e) {
+                    // ignore
+                    log.warn("Could not unregister child " + name, e);
+                }
             }
         }
 



Mime
View raw message