svn commit: r1552287 - /tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

[markt]

Author: markt
Date: Thu Dec 19 11:54:29 2013
New Revision: 1552287

URL: http://svn.apache.org/r1552287
Log:
JspC passes configuration with ServletContext init params so a real 
implementation is required.

Modified:
    tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1552287&r1=1552286&r2=1552287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Dec 
19 11:54:29 2013
@@ -31,6 +31,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;
@@ -76,6 +77,12 @@ public class JspCServletContext implemen
 
 
     /**
+     * Servlet context initialization parameters.
+     */
+    private final ConcurrentHashMap<String,String> myParameters;
+
+
+    /**
      * The log writer we will write log messages to.
      */
     private final PrintWriter myLogWriter;
@@ -114,6 +121,7 @@ public class JspCServletContext implemen
         throws JasperException {
 
         myAttributes = new HashMap<>();
+        myParameters = new ConcurrentHashMap<>();
         myLogWriter = aLogWriter;
         myResourceBaseURL = aResourceBaseURL;
         this.loader = classLoader;
@@ -232,7 +240,7 @@ public class JspCServletContext implemen
      */
     @Override
     public String getInitParameter(String name) {
-        return null;
+        return myParameters.get(name);
     }
 
 
@@ -242,7 +250,7 @@ public class JspCServletContext implemen
      */
     @Override
     public Enumeration<String> getInitParameterNames() {
-        return new Vector<String>().elements();
+        return myParameters.keys();
     }
 
 
@@ -619,7 +627,7 @@ public class JspCServletContext implemen
 
     @Override
     public boolean setInitParameter(String name, String value) {
-        return false;
+        return myParameters.putIfAbsent(name, value) == null;
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org