| commit | 6af9d96c7f7ec0f00161f1334708dc0755f8cb13 | [log] [tgz] |
|---|---|---|
| author | Konstantin Kolinko <kkolinko@apache.org> | Fri Jan 23 09:15:31 2015 +0000 |
| committer | Konstantin Kolinko <kkolinko@apache.org> | Fri Jan 23 09:15:31 2015 +0000 |
| tree | 53b01c49370600263eb3175012f8d89686e2cff3 | |
| parent | 4be743e68993472258bdc964064395def2ee3d0f [diff] |
Trivial followup to r1652938 (BZ 57446 fix). No change in functionality. Merged r1653888 from tomcat/trunk. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1654152 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 4e3f987..fd0543c 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java
@@ -214,7 +214,6 @@ * 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<>(); /**
diff --git a/test/org/apache/catalina/core/TesterTldListener.java b/test/org/apache/catalina/core/TesterTldListener.java index 6850cff..7844886 100644 --- a/test/org/apache/catalina/core/TesterTldListener.java +++ b/test/org/apache/catalina/core/TesterTldListener.java
@@ -34,10 +34,10 @@ 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) {