Fix the Eclipse warnings for the host-manager

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

diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
index 82d6091..e88fc65 100644 (file)
--- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
@@ -396,7 +396,7 @@ public final class HTMLHostManagerServlet extends HostManagerServlet {
                      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 {

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 9b6e0f0..b4ba715 100644 (file)
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -100,12 +100,6 @@ public class HostManagerServlet
 
 
     /**
-     * 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 @@ public class HostManagerServlet
     /**
      * The associated host.
      */
-    protected Host host = null;
+    protected Host installedHost = null;
 
     
     /**
@@ -171,12 +165,12 @@ public class HostManagerServlet
         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 @@ public class HostManagerServlet
         }
 
         // 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 @@ public class HostManagerServlet
         }
 
         // 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 @@ public class HostManagerServlet
         }
 
         // 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 @@ public class HostManagerServlet
         if (engine != null) {
             configBase = new File(configBase, engine.getName());
         }
-        if (host != null) {
+        if (installedHost != null) {
             configBase = new File(configBase, hostName);
         }
         configBase.mkdirs();