Remove another ServerFactory reference

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@778195 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index a1c770a..8fddd4e 100644 (file)
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -662,10 +662,9 @@ public class StandardService
             
         }
         if( server==null ) {
-            // Register with the server 
-            // HACK: ServerFactory should be removed...
-            
-            ServerFactory.getServer().addService(this);
+            // If no server was defined - create one
+            server = new StandardServer();
+            server.addService(this);
         }