billbarker 2004/12/22 22:11:52
Modified: catalina/src/share/org/apache/catalina/core
StandardEngine.java StandardHost.java
Log:
Fix the locating of orphaned Realms for JMX embedding.
Since Realms don't implement managedResource, this is the only way to get
this unused method to work.
Revision Changes Path
1.27 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StandardEngine.java 3 Oct 2004 08:53:56 -0000 1.26
+++ StandardEngine.java 23 Dec 2004 06:11:51 -0000 1.27
@@ -412,9 +412,10 @@
try {
realmName=new ObjectName( domain + ":type=Realm");
if( mserver.isRegistered(realmName ) ) {
- Realm nrealm = (Realm)mserver.getAttribute(realmName,
- "managedResource");
- setRealm(nrealm);
+ mserver.invoke(realmName, "init",
+ new Object[] {},
+ new String[] {}
+ );
}
} catch( Throwable t ) {
log.debug("No realm for this engine " + realmName);
1.36 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StandardHost.java 5 Oct 2004 17:12:51 -0000 1.35
+++ StandardHost.java 23 Dec 2004 06:11:51 -0000 1.36
@@ -676,9 +676,10 @@
try {
realmName=new ObjectName( domain + ":type=Realm,host=" +
getName());
if( mserver.isRegistered(realmName ) ) {
- Realm nrealm = (Realm)mserver.getAttribute(realmName,
- "managedResource");
- setRealm(nrealm);
+ mserver.invoke(realmName, "init",
+ new Object[] {},
+ new String[] {}
+ );
}
} catch( Throwable t ) {
log.debug("No realm for this host " + realmName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
