Increases ServletContext visibility

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c7ca9144
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c7ca9144
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c7ca9144

Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: c7ca91446b33689913aaab7243f1d6fc2c520220
Parents: 8be797f
Author: Lukasz Lenart <[email protected]>
Authored: Tue Feb 18 08:52:39 2014 +0100
Committer: Lukasz Lenart <[email protected]>
Committed: Tue Feb 18 08:52:39 2014 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/struts2/dispatcher/Dispatcher.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/c7ca9144/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
----------------------------------------------------------------------
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 d45f706..2cdf260 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -186,12 +186,15 @@ public class Dispatcher {
         dispatcherListeners.remove(listener);
     }
 
-    private ServletContext servletContext;
-    private Map<String, String> initParams;
-
     private ValueStackFactory valueStackFactory;
 
     /**
+     * Keeps current reference to external world and must be protected to 
support class inheritance
+     */
+    protected ServletContext servletContext;
+    protected Map<String, String> initParams;
+
+    /**
      * Create the Dispatcher instance for a given ServletContext and set of 
initialization parameters.
      *
      * @param servletContext Our servlet context

Reply via email to