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/09 06:28:42 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java
costin 2003/04/08 21:28:41
Modified: catalina/src/share/org/apache/catalina/loader
WebappLoader.java
catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Get the domain from the context - it works better if the context
happen to be defined before the engine. ( i know it sounds
crazy - but in JMX world components can start and disapear
at any time )
Revision Changes Path
1.14 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Index: WebappLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebappLoader.java 8 Apr 2003 19:41:56 -0000 1.13
+++ WebappLoader.java 9 Apr 2003 04:28:41 -0000 1.14
@@ -688,7 +688,7 @@
if (path.equals("")) {
path = "/";
}
- oname=new ObjectName(eng.getName() + ":type=Loader,path=" +
+ oname=new ObjectName(ctx.getDomain() + ":type=Loader,path=" +
path + ",host=" + ctx.getParent().getName());
Registry.getRegistry().registerComponent(this, oname, null);
controller=oname;
1.16 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ManagerBase.java 20 Mar 2003 05:43:49 -0000 1.15
+++ ManagerBase.java 9 Apr 2003 04:28:41 -0000 1.16
@@ -622,7 +622,7 @@
try {
StandardContext ctx=(StandardContext)this.getContainer();
Engine eng=(Engine)ctx.getParent().getParent();
- domain=eng.getName();
+ domain=ctx.getDomain();
StandardHost hst=(StandardHost)ctx.getParent();
String path = ctx.getPath();
if (path.equals("")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org