From ef733aa9ee0afc7199b630d67e8e057be6341e86 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 16 Feb 2014 20:08:30 +0100
Subject: [PATCH] WW-3887 Uses new version of Dispatcher#sendError

---
 .../main/java/org/apache/struts2/dispatcher/Dispatcher.java   | 4 ++--
 .../java/org/apache/struts2/dispatcher/FilterDispatcher.java  | 2 +-
 .../org/apache/struts2/dispatcher/ng/PrepareOperations.java   | 2 +-
 .../org/apache/struts2/dispatcher/FilterDispatcherTest.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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 36d858d6a..57a3dab39 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -555,10 +555,10 @@ public class Dispatcher {
             }
         } catch (ConfigurationException e) {
             logConfigurationException(request, e);
-            sendError(request, response, context, HttpServletResponse.SC_NOT_FOUND, e);
+            sendError(request, response, HttpServletResponse.SC_NOT_FOUND, e);
         } catch (Exception e) {
             if (handleException || devMode) {
-                sendError(request, response, context, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+                sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
             } else {
                 throw new ServletException(e);
             }
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index 6f38026ef..970311ce5 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -409,7 +409,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
                 mapping = actionMapper.getMapping(request, dispatcher.getConfigurationManager());
             } catch (Exception ex) {
                 log.error("error getting ActionMapping", ex);
-                dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
+                dispatcher.sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
                 return;
             }
 
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
index 93e105510..a26a8b2d5 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
@@ -163,7 +163,7 @@ public class PrepareOperations {
                     request.setAttribute(STRUTS_ACTION_MAPPING_KEY, mapping);
                 }
             } catch (Exception ex) {
-                dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
+                dispatcher.sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
             }
         }
 
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
index 3a6b761fe..2c2d747ba 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
@@ -127,7 +127,7 @@ public class FilterDispatcherTest extends StrutsInternalTestCase {
         }
 
         @Override
-        public void sendError(HttpServletRequest request, HttpServletResponse response, ServletContext ctx, int code, Exception e) {
+        public void sendError(HttpServletRequest request, HttpServletResponse response, int code, Exception e) {
             // NO-OP
         }
     }