costin 2003/03/17 11:16:13
Modified: catalina/src/share/org/apache/catalina ServerFactory.java
Log:
Default.
I'm trying a different path that will reduce the breakage and make /admin
work with embeded as well.
Basically I'm creating the Service and Server, even for embeded ( where only
engine is used ). That will make the model consistent - even if Server and Service
are barely used.
Revision Changes Path
1.2 +8 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ServerFactory.java
Index: ServerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ServerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerFactory.java 18 Jul 2002 16:47:36 -0000 1.1
+++ ServerFactory.java 17 Mar 2003 19:16:13 -0000 1.2
@@ -64,6 +64,8 @@
package org.apache.catalina;
+import org.apache.catalina.core.StandardServer;
+
/**
* <p><strong>ServerFactory</strong> allows the registration of the
@@ -95,7 +97,8 @@
* Return the singleton <code>Server</code> instance for this JVM.
*/
public static Server getServer() {
-
+ if( server==null )
+ server=new StandardServer();
return (server);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
