commit a44c8ef8b288205a1759c77f78c85a5954b09300
author Lukasz Lenart <lukaszlenart@apache.org> Thu Mar 06 21:42:26 2014 +0100
committer Lukasz Lenart <lukaszlenart@apache.org> Thu Mar 06 21:42:26 2014 +0100
tree d56ecea40094f751a289e15daf2b3fe88b457a94
parent 817762697dda3894ba578b801f000b2a5f1dadce
parent ff34b3401363b92783ef1dcfaf07327d2ba27eb5

Merge branch 'master' into develop

src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java

diff --git a/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java b/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
index e20722f..a3bf453 100644
--- a/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
+++ b/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
@@ -119,8 +119,7 @@
                 session,
                 new ApplicationMap(pageContext.getServletContext()),
                 request,
-                response,
-                pageContext.getServletContext());
+                response);
         // let's not set the locale -- there is a test that checks if Dispatcher actually picks this up...
         // ... but generally we want to just use no locale (let it stay system default)
         extraContext.remove(ActionContext.LOCALE);