svn commit: r1492359 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/deploy/ApplicationListener.java

[markt]

Author: markt
Date: Wed Jun 12 18:45:29 2013
New Revision: 1492359

URL: http://svn.apache.org/r1492359
Log:
Align name with logic

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1492343,1492358

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1492359&r1=1492358&r2=1492359&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed 
Jun 12 18:45:29 2013
@@ -4836,7 +4836,7 @@ public class StandardContext extends Con
                 ApplicationListener listener = listeners[i];
                 results[i] = instanceManager.newInstance(
                         listener.getClassName());
-                if (listener.isAllowedPluggability()) {
+                if (listener.isPluggabilityBlocked()) {
                     tldListeners.add(results[i]);
                 }
             } catch (Throwable t) {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java?rev=1492359&r1=1492358&r2=1492359&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java 
Wed Jun 12 18:45:29 2013
@@ -23,12 +23,12 @@ package org.apache.catalina.deploy;
 public class ApplicationListener {
 
     private final String className;
-    private final boolean allowedPluggability;
+    private final boolean pluggabilityBlocked;
 
     public ApplicationListener(String className,
-            boolean allowedPluggability) {
+            boolean pluggabilityBlocked) {
         this.className = className;
-        this.allowedPluggability = allowedPluggability;
+        this.pluggabilityBlocked = pluggabilityBlocked;
     }
 
 
@@ -37,7 +37,7 @@ public class ApplicationListener {
     }
 
 
-    public boolean isAllowedPluggability() {
-        return allowedPluggability;
+    public boolean isPluggabilityBlocked() {
+        return pluggabilityBlocked;
     }
 }
\ No newline at end of file



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