incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1144206 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Date Fri, 08 Jul 2011 09:23:12 GMT
Author: cziegeler
Date: Fri Jul  8 09:23:12 2011
New Revision: 1144206

URL: http://svn.apache.org/viewvc?rev=1144206&view=rev
Log:
Add sanity null check for servlet

Modified:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java?rev=1144206&r1=1144205&r2=1144206&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
(original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Fri Jul  8 09:23:12 2011
@@ -211,7 +211,7 @@ public class RequestData {
         Servlet servlet = sr.resolveServlet(slingRequest);
         requestProgressTracker.logTimer("ServletResolution",
             "URI={0} handled by Servlet={1}",
-            getServletRequest().getRequestURI(), RequestUtil.getServletName(servlet));
+            getServletRequest().getRequestURI(), (servlet == null ? "-none-" : RequestUtil.getServletName(servlet)));
         contentData.setServlet(servlet);
     }
 



Mime
View raw message