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/06/12 20:34:53 UTC
svn commit: r1492336 - in /tomcat/trunk/java/org/apache/catalina:
core/StandardContext.java deploy/ApplicationListener.java
Author: markt
Date: Wed Jun 12 18:34:53 2013
New Revision: 1492336
URL: http://svn.apache.org/r1492336
Log:
Better name
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/deploy/ApplicationListener.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=1492336&r1=1492335&r2=1492336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jun 12 18:34:53 2013
@@ -4730,7 +4730,7 @@ public class StandardContext extends Con
ApplicationListener listener = listeners[i];
results[i] = instanceManager.newInstance(
listener.getClassName());
- if (listener.isFromTLD()) {
+ if (listener.isAllowedPluggability()) {
tldListeners.add(results[i]);
}
} catch (Throwable t) {
@@ -4792,7 +4792,7 @@ public class StandardContext extends Con
new ServletContextEvent(getServletContext());
ServletContextEvent tldEvent = null;
if (tldListeners.size() > 0) {
- tldEvent = new ServletContextEvent(new TldListenerServletContext(
+ tldEvent = new ServletContextEvent(new NoPluggabilityServletContext(
getServletContext()));
}
for (int i = 0; i < instances.length; i++) {
@@ -6538,11 +6538,12 @@ public class StandardContext extends Con
}
- private static class TldListenerServletContext implements ServletContext {
+ private static class NoPluggabilityServletContext
+ implements ServletContext {
private final ServletContext sc;
- public TldListenerServletContext(ServletContext sc) {
+ public NoPluggabilityServletContext(ServletContext sc) {
this.sc = sc;
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ApplicationListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ApplicationListener.java?rev=1492336&r1=1492335&r2=1492336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ApplicationListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ApplicationListener.java Wed Jun 12 18:34:53 2013
@@ -23,11 +23,12 @@ package org.apache.catalina.deploy;
public class ApplicationListener {
private final String className;
- private final boolean fromTLD;
+ private final boolean allowedPluggability;
- public ApplicationListener(String className, boolean fromTLD) {
+ public ApplicationListener(String className,
+ boolean allowedPluggability) {
this.className = className;
- this.fromTLD = fromTLD;
+ this.allowedPluggability = allowedPluggability;
}
@@ -36,7 +37,7 @@ public class ApplicationListener {
}
- public boolean isFromTLD() {
- return fromTLD;
+ public boolean isAllowedPluggability() {
+ return allowedPluggability;
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org