You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/05/06 12:49:03 UTC

svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Posted by Konstantin Kolinko <kn...@gmail.com>.
2009/5/12 Mark Thomas <ma...@apache.org>:
> Given I can get engine from host - I went with that. Slightly cleaner and I
> don't think remembering the engine is worth it. If we were going to remember
> anything extra, we should remember the server but I'm not sure it is worth it.
>

OK with that. It is reasonable.

Best regards
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Posted by Mark Thomas <ma...@apache.org>.
Konstantin Kolinko wrote:
> 2009/5/6 Mark Thomas <ma...@apache.org>:
>> Remy Maucherat wrote:
>>> On Wed, 2009-05-06 at 10:49 +0000, markt@apache.org wrote:
>>>>          // Acquire global JNDI resources if available
>>>> -        Server server = ServerFactory.getServer();
>>>> +        Server server =
>>>> +            ((Engine)context.getParent().getParent()).getService().getServer();
>>> Ouch, not pretty.
>> Any better ideas? I thought about pulling it out into a separate method but as
>> all of those parents should be non-null it seemed like overkill.
>>
> 
> See how setWrapper() is already implemented in ManagerServlet.
> You can remember Engine reference that it calculates there, like host
> reference that is already remembered.

Given I can get engine from host - I went with that. Slightly cleaner and I
don't think remembering the engine is worth it. If we were going to remember
anything extra, we should remember the server but I'm not sure it is worth it.

Mark


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Posted by Konstantin Kolinko <kn...@gmail.com>.
2009/5/6 Mark Thomas <ma...@apache.org>:
> Remy Maucherat wrote:
>> On Wed, 2009-05-06 at 10:49 +0000, markt@apache.org wrote:
>>>          // Acquire global JNDI resources if available
>>> -        Server server = ServerFactory.getServer();
>>> +        Server server =
>>> +            ((Engine)context.getParent().getParent()).getService().getServer();
>>
>> Ouch, not pretty.
>
> Any better ideas? I thought about pulling it out into a separate method but as
> all of those parents should be non-null it seemed like overkill.
>

See how setWrapper() is already implemented in ManagerServlet.
You can remember Engine reference that it calculates there, like host
reference that is already remembered.

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Posted by Mark Thomas <ma...@apache.org>.
Remy Maucherat wrote:
> On Wed, 2009-05-06 at 10:49 +0000, markt@apache.org wrote:
>>          // Acquire global JNDI resources if available
>> -        Server server = ServerFactory.getServer();
>> +        Server server =
>> +            ((Engine)context.getParent().getParent()).getService().getServer();
> 
> Ouch, not pretty.

Any better ideas? I thought about pulling it out into a separate method but as
all of those parents should be non-null it seemed like overkill.

Mark


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r772142 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Posted by Remy Maucherat <re...@apache.org>.
On Wed, 2009-05-06 at 10:49 +0000, markt@apache.org wrote:
>          // Acquire global JNDI resources if available
> -        Server server = ServerFactory.getServer();
> +        Server server =
> +            ((Engine)context.getParent().getParent()).getService().getServer();

Ouch, not pretty.

Rémy



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org