You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/04/25 00:12:40 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardPipeline.java
costin 2003/04/24 15:12:40
Modified: catalina/src/share/org/apache/catalina/core
StandardPipeline.java
Log:
Fix registration of valves ( in the engine domain, not jsr77 )
Revision Changes Path
1.8 +13 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardPipeline.java 28 Mar 2003 14:58:08 -0000 1.7
+++ StandardPipeline.java 24 Apr 2003 22:12:40 -0000 1.8
@@ -344,8 +344,17 @@
if( valve instanceof ValveBase &&
((ValveBase)valve).getObjectName()==null ) {
try {
+
+ String domain=((ContainerBase)container).getDomain();
+ if( container instanceof StandardContext ) {
+ domain=((StandardContext)container).getEngineName();
+ }
+ if( container instanceof StandardWrapper) {
+ Container ctx=((StandardWrapper)container).getParent();
+ domain=((StandardContext)ctx).getEngineName();
+ }
ObjectName vname=((ValveBase)valve).createObjectName(
- ((ContainerBase)container).getDomain(),
+ domain,
((ContainerBase)container).getObjectName());
if( vname != null ) {
((ValveBase)valve).setObjectName(vname);
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org