You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/02/01 14:13:43 UTC
svn commit: r617494 -
/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
Author: bdelacretaz
Date: Fri Feb 1 05:13:41 2008
New Revision: 617494
URL: http://svn.apache.org/viewvc?rev=617494&view=rev
Log:
fail more gracefully is Servlet service not found in destroyServlet()
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=617494&r1=617493&r2=617494&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Fri Feb 1 05:13:41 2008
@@ -575,15 +575,19 @@
Servlet servlet = (Servlet) context.locateService(REF_SERVLET,
reference);
- String name = servlet.getServletConfig().getServletName();
- log.debug("unbindServlet: Servlet {} removed", name);
-
- try {
- servlet.destroy();
- } catch (Throwable t) {
- log.error(
- "unbindServlet: Unexpected problem destroying servlet "
- + name, t);
+ if(servlet == null) {
+ log.error("destroyServlet: Servlet not found for reference {}", reference.toString());
+ } else {
+ String name = servlet.getServletConfig().getServletName();
+ log.debug("unbindServlet: Servlet {} removed", name);
+
+ try {
+ servlet.destroy();
+ } catch (Throwable t) {
+ log.error(
+ "unbindServlet: Unexpected problem destroying servlet "
+ + name, t);
+ }
}
}
}