geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r918171 - /geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
Date Tue, 02 Mar 2010 20:18:27 GMT
Author: gawor
Date: Tue Mar  2 20:18:27 2010
New Revision: 918171

URL: http://svn.apache.org/viewvc?rev=918171&view=rev
Log:
avoid NPE

Modified:
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java

Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java?rev=918171&r1=918170&r2=918171&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
(original)
+++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
Tue Mar  2 20:18:27 2010
@@ -209,8 +209,12 @@
         if (bt != null) {
             bt.close();
         }
-        eventDispatcher.destroy();
-        executor.shutdown();
+        if (eventDispatcher != null) {
+            eventDispatcher.destroy();
+        }
+        if (executor != null) {
+            executor.shutdown();
+        }
         
         LOGGER.debug("Web container extender stopped");
     }



Mime
View raw message