Author: kkolinko
Date: Thu Jan 22 14:46:35 2015
New Revision: 1653888
URL: http://svn.apache.org/r1653888
Log:
Trivial followup to r1652938 (BZ 57446 fix). No change in functionality.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1653888&r1=1653887&r2=1653888&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 22
14:46:35 2015
@@ -214,7 +214,6 @@ public class StandardContext extends Con
* The set of application listeners that are required to have limited
access
* to ServletContext methods. See Servlet 3.1 section 4.4.
*/
-
private final Set<Object> noPluggabilityListeners = new HashSet<>();
/**
Modified: tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java?rev=1653888&r1=1653887&r2=1653888&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java Thu Jan
22 14:46:35 2015
@@ -34,10 +34,10 @@ public class TesterTldListener implement
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
+ servletContext = sc;
// Try and use one of the Servlet 3.0 methods that should be blocked
try {
- servletContext = sce.getServletContext();
sc.getEffectiveMajorVersion();
log.append("FAIL-01");
} catch (UnsupportedOperationException uoe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
