When deployment succeeds but the context still fails to start, provide instant feedback

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

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index a6a95bb..a33bab4 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -60,6 +60,7 @@ managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
 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.deployedButNotStarted=FAIL - Deployed application at context path {0} but context failed to start
 managerServlet.exception=FAIL - Encountered exception {0}
 managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.invalidPath=FAIL - Invalid context path {0} was specified

diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 63b6ab9..790f941 100644 (file)
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -801,8 +801,10 @@ public class ManagerServlet
                 }
             }
             context = (Context) host.findChild(path);
-            if (context != null && context.getConfigured()) {
+            if (context != null && context.getConfigured() && context.getAvailable()) {
                 writer.println(sm.getString("managerServlet.deployed", displayPath));
+            } else if (context!=null && !context.getAvailable()) {
+                writer.println(sm.getString("managerServlet.deployedButNotStarted", displayPath));
             } else {
                 // Something failed
                 writer.println(sm.getString("managerServlet.deployFailed", displayPath));