[sling-org-apache-sling-jcr-webdav] 05/29: Catch and log uncaught exceptions

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git

commit 827bdb0672d1c42d9b22eca5f0431c013652a138
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri Jan 28 11:17:06 2011 +0000

    Catch and log uncaught exceptions
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1064628 13f79535-47bb-0310-9956-ffa450edef68
---
 .../webdav/impl/servlets/SlingSimpleWebDavServlet.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
index 30e999e..01ec634 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 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.helper.SlingResourceConfig;
  */
 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 extends SimpleWebdavServlet {
     @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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.