tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r898443 - in /tomcat/trunk/java/org/apache/catalina/manager/host: HTMLHostManagerServlet.java HostManagerServlet.java
Date Tue, 12 Jan 2010 17:57:56 GMT
Author: markt
Date: Tue Jan 12 17:57:55 2010
New Revision: 898443

URL: http://svn.apache.org/viewvc?rev=898443&view=rev
Log:
Fix the Eclipse warnings for the host-manager

Modified:
    tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=898443&r1=898442&r2=898443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Tue Jan
12 17:57:55 2010
@@ -396,7 +396,7 @@
                      URLEncoder.encode(hostName, "UTF-8"));
                 args[5] = hostsRemove;
                 args[6] = newNonce;
-                if (host == this.host) {
+                if (host == this.installedHost) {
                     writer.print(MessageFormat.format(
                         MANAGER_HOST_ROW_BUTTON_SECTION, args));
                 } else {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=898443&r1=898442&r2=898443&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Tue Jan 12
17:57:55 2010
@@ -100,12 +100,6 @@
 
 
     /**
-     * Path where context descriptors should be deployed.
-     */
-    protected File configBase = null;
-
-
-    /**
      * The Context container associated with our web application.
      */
     protected Context context = null;
@@ -120,7 +114,7 @@
     /**
      * The associated host.
      */
-    protected Host host = null;
+    protected Host installedHost = null;
 
     
     /**
@@ -171,12 +165,12 @@
         this.wrapper = wrapper;
         if (wrapper == null) {
             context = null;
-            host = null;
+            installedHost = null;
             engine = null;
         } else {
             context = (Context) wrapper.getParent();
-            host = (Host) context.getParent();
-            engine = (Engine) host.getParent();
+            installedHost = (Host) context.getParent();
+            engine = (Engine) installedHost.getParent();
         }
 
         // Retrieve the MBean server
@@ -493,7 +487,7 @@
         }
 
         // Prevent removing our own host
-        if (engine.findChild(name) == host) {
+        if (engine.findChild(name) == installedHost) {
             writer.println
                 (sm.getString("hostManagerServlet.cannotRemoveOwnHost", name));
             return;
@@ -578,7 +572,7 @@
         }
 
         // Prevent starting our own host
-        if (engine.findChild(name) == host) {
+        if (engine.findChild(name) == installedHost) {
             writer.println
                 (sm.getString("hostManagerServlet.cannotStartOwnHost", name));
             return;
@@ -627,7 +621,7 @@
         }
 
         // Prevent starting our own host
-        if (engine.findChild(name) == host) {
+        if (engine.findChild(name) == installedHost) {
             writer.println
                 (sm.getString("hostManagerServlet.cannotStopOwnHost", name));
             return;
@@ -666,7 +660,7 @@
         if (engine != null) {
             configBase = new File(configBase, engine.getName());
         }
-        if (host != null) {
+        if (installedHost != null) {
             configBase = new File(configBase, hostName);
         }
         configBase.mkdirs();



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


Mime
View raw message