You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/11/27 09:34:08 UTC

svn commit: r598554 - /incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java

Author: fmeschbe
Date: Tue Nov 27 00:34:07 2007
New Revision: 598554

URL: http://svn.apache.org/viewvc?rev=598554&view=rev
Log:
Fix logging to prevent NPE and ensure a servlet name of some sorts

Modified:
    incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java

Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java?rev=598554&r1=598553&r2=598554&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/servlets/SlingServletResolver.java Tue Nov 27 00:34:07 2007
@@ -131,8 +131,16 @@
             }
         }
 
-        if (servlet != null) {
-            String name = servlet.getServletConfig().getServletName();
+        if (servlet != null && log.isDebugEnabled()) {
+            String name;
+            if (servlet.getServletConfig() != null) {
+                name = servlet.getServletConfig().getServletName();
+            } else {
+                name = servlet.getServletInfo();
+            }
+            if (name == null) {
+                name = servlet.getClass().getName();
+            }
             log.debug("Using Component {} for {}", name, path);
         }