remm 2003/08/11 06:18:03
Modified: catalina/src/share/org/apache/coyote/tomcat5
MapperListener.java
Log:
- Remove some stack trace dumping. This class would need more
similar cleanups.
Revision Changes Path
1.11 +23 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java
Index: MapperListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MapperListener.java 23 Jul 2003 17:44:37 -0000 1.10
+++ MapperListener.java 11 Aug 2003 13:18:03 -0000 1.11
@@ -213,7 +213,7 @@
engineName = (String)
mBeanServer.getAttribute(objectName, "engineName");
} catch (Exception e) {
- e.printStackTrace();
+ // Ignore
}
}
}
@@ -334,12 +334,16 @@
// name attribute is the same... - then it's ours
String targetDomain=objectName.getDomain();
if( ! domain.equals( targetDomain )) {
- targetDomain=(String) mBeanServer.getAttribute(objectName,
"engineName");
+ try {
+ targetDomain = (String) mBeanServer.getAttribute
+ (objectName, "engineName");
+ } catch (Exception e) {
+ // Ignore
+ }
if( ! domain.equals( targetDomain )) {
// not ours
return;
}
-
}
String hostName = null;
@@ -384,6 +388,22 @@
throws Exception {
String name = objectName.getKeyProperty("name");
+
+ // If the domain is the same with ours or the engine
+ // name attribute is the same... - then it's ours
+ String targetDomain=objectName.getDomain();
+ if( ! domain.equals( targetDomain )) {
+ try {
+ targetDomain = (String) mBeanServer.getAttribute
+ (objectName, "engineName");
+ } catch (Exception e) {
+ // Ignore
+ }
+ if( ! domain.equals( targetDomain )) {
+ // not ours
+ return;
+ }
+ }
String hostName = null;
String contextName = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
