remm 2004/10/26 16:43:44
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Apply Keith's patch.
Revision Changes Path
1.156 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- StandardContext.java 26 Oct 2004 15:42:02 -0000 1.155
+++ StandardContext.java 26 Oct 2004 23:43:44 -0000 1.156
@@ -3890,7 +3890,7 @@
// Look for a realm - that may have been configured earlier.
// If the realm is added after context - it'll set itself.
- if( realm == null ) {
+ if( realm == null && mserver != null ) {
ObjectName realmName=null;
try {
realmName=new ObjectName( getEngineName() + ":type=Realm,host=" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
