From 6e9bb24653cb30f34006eb63d88f4d984aa1bf95 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 11 Oct 2012 10:25:36 +0000
Subject: [PATCH] WW-3609 adds more logging when exception occurred

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1396976 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/dispatcher/Dispatcher.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 82ec80841..d30962e0c 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -817,6 +817,9 @@ public class Dispatcher {
     public void sendError(HttpServletRequest request, HttpServletResponse response, ServletContext ctx, int code, Exception e) {
         Boolean devModeOverride = FilterDispatcher.getDevModeOverride();
         if (devModeOverride != null ? devModeOverride : devMode) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Exception occurred during processing request: #0", e, e.getMessage());
+            }
             response.setContentType("text/html");
 
             try {
@@ -841,6 +844,9 @@ public class Dispatcher {
                 response.getWriter().close();
             } catch (Exception exp) {
                 try {
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug("Cannot show problem report!", exp);
+                    }
                     response.sendError(code, "Unable to show problem report: " + exp);
                 } catch (IOException ex) {
                     // we're already sending an error, not much else we can do if more stuff breaks
@@ -848,6 +854,9 @@ public class Dispatcher {
             }
         } else {
             try {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error("Exception occurred during processing request: #0", e, e.getMessage());
+                }
                 // WW-1977: Only put errors in the request when code is a 500 error
                 if (code == HttpServletResponse.SC_INTERNAL_SERVER_ERROR) {
                     // send a http error response to use the servlet defined error handler