Index: LocalStrings.properties
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties,v
retrieving revision 1.5
diff -u -r1.5 LocalStrings.properties
--- LocalStrings.properties	2 Sep 2004 19:13:38 -0000	1.5
+++ LocalStrings.properties	20 Dec 2004 12:44:07 -0000
@@ -40,6 +40,7 @@
 managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker
 managerServlet.configured=OK - Deployed application from context file {0}
 managerServlet.deployed=OK - Deployed application at context path {0}
+managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0}
 managerServlet.exception=FAIL - Encountered exception {0}
 managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
Index: ManagerServlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.25
diff -u -r1.25 ManagerServlet.java
--- ManagerServlet.java	16 Dec 2004 15:49:36 -0000	1.25
+++ ManagerServlet.java	20 Dec 2004 12:44:07 -0000
@@ -645,7 +645,7 @@
         }
         
         context = (Context) host.findChild(path);
-        if (context != null) {
+        if (context != null && context.getConfigured()) {
             writer.println(sm.getString("managerServlet.deployed", displayPath));
         } else {
             // Something failed
@@ -711,7 +711,7 @@
         }
         
         context = (Context) host.findChild(path);
-        if (context != null) {
+        if (context != null && context.getConfigured()) {
             writer.println(sm.getString("managerServlet.deployed", displayPath));
         } else {
             // Something failed
@@ -815,8 +815,13 @@
                     removeServiced(path);
                 }
             }
-            writer.println(sm.getString("managerServlet.deployed",
-                    displayPath));
+            context = (Context) host.findChild(path);
+            if (context != null && context.getConfigured()) {
+                writer.println(sm.getString("managerServlet.deployed", displayPath));
+            } else {
+                // Something failed
+                writer.println(sm.getString("managerServlet.deployFailed", displayPath));
+            }
         } catch (Throwable t) {
             log("ManagerServlet.install[" + displayPath + "]", t);
             writer.println(sm.getString("managerServlet.exception",