From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 6 May 2009 10:49:03 +0000 (+0000)
Subject: More ServerFactory surgery
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=cf1aa666025b7d304a5720cfb15e56e5e8ba6b79;p=tomcat7.0

More ServerFactory surgery

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

diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 39d623b90..d9cef75e8 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -49,7 +49,6 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Role;
 import org.apache.catalina.Server;
-import org.apache.catalina.ServerFactory;
 import org.apache.catalina.Session;
 import org.apache.catalina.UserDatabase;
 import org.apache.catalina.Wrapper;
@@ -446,7 +445,8 @@ public class ManagerServlet
         }
 
         // Acquire global JNDI resources if available
-        Server server = ServerFactory.getServer();
+        Server server =
+            ((Engine)context.getParent().getParent()).getService().getServer();
         if ((server != null) && (server instanceof StandardServer)) {
             global = ((StandardServer) server).getGlobalNamingContext();
         }
@@ -505,7 +505,8 @@ public class ManagerServlet
      */
     protected synchronized void save(PrintWriter writer, String path) {
 
-        Server server = ServerFactory.getServer();
+        Server server =
+            ((Engine)context.getParent().getParent()).getService().getServer();
 
         if (!(server instanceof StandardServer)) {
             writer.println(sm.getString("managerServlet.saveFail", server));