Author: kfujino
Date: Mon May 7 09:13:18 2012
New Revision: 1334934
URL: http://svn.apache.org/viewvc?rev=1334934&view=rev
Log:
Make sure ContextMBean#findFilterDefs returns correct filter definitions.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/ContextMBean.java?rev=1334934&r1=1334933&r2=1334934&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/ContextMBean.java Mon
May 7 09:13:18 2012
@@ -201,14 +201,14 @@ public class ContextMBean extends Contai
} catch (InvalidTargetObjectTypeException e) {
throw new MBeanException(e);
}
-
- ApplicationParameter[] params = context.findApplicationParameters();
- String[] stringParams = new String[params.length];
- for(int counter=0; counter < params.length; counter++){
- stringParams[counter]=params[counter].toString();
+
+ FilterDef[] filterDefs = context.findFilterDefs();
+ String[] stringFilters = new String[filterDefs.length];
+ for(int counter=0; counter < filterDefs.length; counter++){
+ stringFilters[counter]=filterDefs[counter].toString();
}
-
- return stringParams;
+
+ return stringFilters;
}
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=1334934&r1=1334933&r2=1334934&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 7 09:13:18 2012
@@ -85,6 +85,10 @@
external entities may be used to include the content of external files
into server.xml. (markt)
</fix>
+ <fix>
+ Make sure ContextMBean#findFilterDefs returns correct filter
+ definitions. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
