svn commit: r1064628 - /sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java

[fm...@apache.org]

Author: fmeschbe
Date: Fri Jan 28 11:17:06 2011
New Revision: 1064628

URL: http://svn.apache.org/viewvc?rev=1064628&view=rev
Log:
Catch and log uncaught exceptions

Modified:
    sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java

Modified: sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java?rev=1064628&r1=1064627&r2=1064628&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java (original)
+++ sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java Fri Jan 28 11:17:06 2011
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletRes
 import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The <code>SlingSimpleWebDavServlet</code> extends the
@@ -36,6 +38,9 @@ import org.apache.sling.jcr.webdav.impl.
  */
 public class SlingSimpleWebDavServlet extends SimpleWebdavServlet {
 
+    /** default log */
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private final SlingResourceConfig resourceConfig;
 
     private final Repository repository;
@@ -58,6 +63,19 @@ public class SlingSimpleWebDavServlet ex
     @Override
     protected void service(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
+        try {
+            doService(request, response);
+        } catch (RuntimeException re) {
+            log.error("service: Uncaught RuntimeException", re);
+            throw new ServletException("Uncaught RuntimeException: " + re);
+        } catch (Error e) {
+            log.error("service: Uncaught Error", e);
+            throw new ServletException("Uncaught Error: " + e);
+        }
+    }
+
+    protected void doService(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
 
         // According to the spec the path info is either null or
         // a string starting with a slash. Thus a string of length 1