Author: markt
Date: Wed May 6 10:49:03 2009
New Revision: 772142
URL: http://svn.apache.org/viewvc?rev=772142&view=rev
Log:
More ServerFactory surgery
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=772142&r1=772141&r2=772142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed May
6 10:49:03 2009
@@ -49,7 +49,6 @@
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 @@
}
// 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 @@
*/
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
