You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/12/19 14:01:24 UTC
svn commit: r1552306 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/jasper/servlet/JspCServletContext.java
webapps/docs/changelog.xml
Author: markt
Date: Thu Dec 19 13:01:23 2013
New Revision: 1552306
URL: http://svn.apache.org/r1552306
Log:
JspC passes configuration with ServletContext init params so a real implementation is required.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1552287
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1552306&r1=1552305&r2=1552306&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Dec 19 13:01:23 2013
@@ -31,6 +31,7 @@ import java.util.Hashtable;
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;
@@ -67,6 +68,12 @@ public class JspCServletContext implemen
/**
+ * Servlet context initialization parameters.
+ */
+ private final ConcurrentHashMap<String,String> myParameters;
+
+
+ /**
* The log writer we will write log messages to.
*/
protected PrintWriter myLogWriter;
@@ -95,6 +102,7 @@ public class JspCServletContext implemen
public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL) {
myAttributes = new Hashtable<String,Object>();
+ myParameters = new ConcurrentHashMap<String,String>();
myLogWriter = aLogWriter;
myResourceBaseURL = aResourceBaseURL;
@@ -159,9 +167,7 @@ public class JspCServletContext implemen
*/
@Override
public String getInitParameter(String name) {
-
- return (null);
-
+ return myParameters.get(name);
}
@@ -171,9 +177,7 @@ public class JspCServletContext implemen
*/
@Override
public Enumeration<String> getInitParameterNames() {
-
- return (new Vector<String>().elements());
-
+ return myParameters.keys();
}
@@ -580,7 +584,7 @@ public class JspCServletContext implemen
@Override
public boolean setInitParameter(String name, String value) {
- return false;
+ return myParameters.putIfAbsent(name, value) == null;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1552306&r1=1552305&r2=1552306&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Dec 19 13:01:23 2013
@@ -98,6 +98,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ JspC uses servlet context initialization parameters to pass
+ configuration so ensure that the servlet context used supports
+ initialization parameters. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org