costin 2003/03/20 08:01:34
Modified: catalina/src/share/org/apache/catalina/valves ValveBase.java
Log:
add object name attribute
Revision Changes Path
1.5 +22 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java
Index: ValveBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValveBase.java 17 Mar 2003 07:43:49 -0000 1.4
+++ ValveBase.java 20 Mar 2003 16:01:33 -0000 1.5
@@ -83,6 +83,7 @@
import org.apache.catalina.Service;
import org.apache.catalina.Host;
import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
@@ -222,6 +223,10 @@
return oname;
}
+ public void setObjectName(ObjectName oname) {
+ this.oname = oname;
+ }
+
public String getDomain() {
return domain;
}
@@ -279,13 +284,22 @@
} else if (container instanceof Host) {
parentName=",host=" +container.getName();
} else if (container instanceof Context) {
- String path = ((Context)container).getPath();
+ String path = ((Context)container).getPath();
+ if (path.length() < 1) {
+ path = "/";
+ }
+ Host host = (Host) container.getParent();
+ parentName=",path=" + path + ",host=" +
+ host.getName();
+ } else if (container instanceof Wrapper) {
+ Context ctx = (Context) container.getParent();
+ String path = ctx.getPath();
if (path.length() < 1) {
path = "/";
}
- Host host = (Host) container.getParent();
- parentName=",path=" + path + ",host=" +
- host.getName();
+ Host host = (Host) ctx.getParent();
+ parentName=",servlet=" + container.getName() +
+ ",path=" + path + ",host=" + host.getName();
}
log.info("valve parent=" + parentName + " " + parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
