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 2006/10/04 03:43:24 UTC

svn commit: r452692 - /geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java

Author: djencks
Date: Tue Oct  3 18:43:24 2006
New Revision: 452692

URL: http://svn.apache.org/viewvc?view=rev&rev=452692
Log:
fix NPE on shutdown for template instances

Modified:
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java?view=diff&rev=452692&r1=452691&r2=452692
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java Tue Oct  3 18:43:24 2006
@@ -154,7 +154,9 @@
     }
 
     public void doStop() throws Exception {
-        servletRegistration.unregisterServletHolder(servletHolder, servletHolder.getName(), null, objectName);
+        if (servletRegistration != null) {
+            servletRegistration.unregisterServletHolder(servletHolder, servletHolder.getName(), null, objectName);
+        }
     }
 
     public void doFail() {