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/08 21:14:07 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm RealmBase.java
costin 2003/04/08 12:14:06
Modified: catalina/src/share/org/apache/catalina/realm RealmBase.java
Log:
Ordering, don't try to register if the parent is not loaded yet.
Revision Changes Path
1.10 +14 -12 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RealmBase.java 27 Mar 2003 03:06:39 -0000 1.9
+++ RealmBase.java 8 Apr 2003 19:14:06 -0000 1.10
@@ -1040,13 +1040,13 @@
protected boolean initialized=false;
public void init() {
- if( initialized ) return;
+ if( initialized && container != null ) return;
initialized=true;
if( container== null ) {
+ ObjectName parent=null;
// Register with the parent
try {
- ObjectName parent=null;
if( host == null ) {
// global
parent=new ObjectName(domain +":type=Engine");
@@ -1055,13 +1055,15 @@
":type=Host,host=" + host);
} else {
parent=new ObjectName(domain +":j2eeType=WebModule,name=//" +
- host + "/" + path);
+ host + path);
+ }
+ if( mserver.isRegistered(parent )) {
+ log.info("Register with " + parent);
+ mserver.invoke(parent, "setRealm", new Object[] {this},
+ new String[] {"org.apache.catalina.Realm"});
}
- log.info("Register with " + parent);
- mserver.invoke(parent, "setRealm", new Object[] {this},
- new String[] {"org.apache.catalina.Realm"});
} catch (Exception e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
+ log.info("Parent not available yet: " + parent);
}
}
@@ -1073,7 +1075,7 @@
Registry.getRegistry().registerComponent(this, oname, null );
log.info("Register Realm "+oname);
} catch (Throwable e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
+ log.error( "Can't register " + oname, e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org