From a1b5b2599e93b726905d3694fb2ee8c371977f80 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Jun 2010 18:54:24 +0000
Subject: [PATCH] Clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@957681 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/manager/host/HostManagerServlet.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index e34dd5091..b2106df14 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -567,15 +567,17 @@ public class HostManagerServlet
             return;
         }
 
+        Container host = engine.findChild(name);
+        
         // Check if host exists
-        if (engine.findChild(name) == null) {
+        if (host == null) {
             writer.println
                 (sm.getString("hostManagerServlet.noHost", name));
             return;
         }
 
         // Prevent starting our own host
-        if (engine.findChild(name) == installedHost) {
+        if (host == installedHost) {
             writer.println
                 (sm.getString("hostManagerServlet.cannotStartOwnHost", name));
             return;
@@ -583,7 +585,7 @@ public class HostManagerServlet
 
         // Start host
         try {
-            engine.findChild(name).start();
+            host.start();
             writer.println
                 (sm.getString("hostManagerServlet.started", name));
         } catch (Throwable t) {
@@ -617,15 +619,17 @@ public class HostManagerServlet
             return;
         }
 
+        Container host = engine.findChild(name);
+
         // Check if host exists
-        if (engine.findChild(name) == null) {
+        if (host == null) {
             writer.println
                 (sm.getString("hostManagerServlet.noHost", name));
             return;
         }
 
         // Prevent starting our own host
-        if (engine.findChild(name) == installedHost) {
+        if (host == installedHost) {
             writer.println
                 (sm.getString("hostManagerServlet.cannotStopOwnHost", name));
             return;
@@ -633,7 +637,7 @@ public class HostManagerServlet
 
         // Start host
         try {
-            engine.findChild(name).stop();
+            host.stop();
             writer.println
                 (sm.getString("hostManagerServlet.stopped", name));
         } catch (Throwable t) {
-- 
2.11.0