From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 24 May 2009 17:32:49 +0000 (+0000)
Subject: Remove another ServerFactory reference
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=425258424a5f46a8fbe5a562a1b821ae9caf08ea;p=tomcat7.0

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 a1c770aa5..8fddd4e38 100644
--- 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);
         }