Author: markt
Date: Sun Mar 23 17:50:11 2014
New Revision: 1580552
URL: http://svn.apache.org/r1580552
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56273
If the Manager web application does not perform an operation because the web
application is already being serviced, report an error rather than reporting
success.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1580514
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1580552&r1=1580551&r2=1580552&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Sun Mar 23 17:50:11 2014
@@ -276,7 +276,9 @@ public final class HTMLManagerServlet ex
break;
}
- if (!isServiced(name)) {
+ if (isServiced(name)) {
+ message = smClient.getString("managerServlet.inService",
name);
+ } else {
addServiced(name);
try {
warPart.write(file.getAbsolutePath());
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1580552&r1=1580551&r2=1580552&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Sun Mar 23 17:50:11 2014
@@ -79,6 +79,7 @@ managerServlet.exception=FAIL - Encounte
managerServlet.findleaksFail=FAIL - Find leaks failed: Host not instance of
StandardHost
managerServlet.findleaksList=OK - Found potential memory leaks in the
following applications:
managerServlet.findleaksNone=OK - No memory leaks found
+managerServlet.inService=FAIL - The application [{0}] is already being serviced
managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command
[{0}]
managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1580552&r1=1580551&r2=1580552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Sun Mar 23 17:50:11 2014
@@ -685,7 +685,9 @@ public class ManagerServlet extends Http
}
try {
- if (!isServiced(name)) {
+ if (isServiced(name)) {
+ writer.println(smClient.getString("managerServlet.inService",
displayPath));
+ } else {
addServiced(name);
try {
// Upload WAR
@@ -758,7 +760,9 @@ public class ManagerServlet extends Http
// Copy WAR to appBase
try {
- if (!isServiced(name)) {
+ if (isServiced(name)) {
+ writer.println(smClient.getString("managerServlet.inService",
displayPath));
+ } else {
addServiced(name);
try {
if (!deployedWar.delete()) {
@@ -858,7 +862,9 @@ public class ManagerServlet extends Http
}
try {
- if (!isServiced(name)) {
+ if (isServiced(name)) {
+ writer.println(smClient.getString("managerServlet.inService",
displayPath));
+ } else {
addServiced(name);
try {
if (config != null) {
@@ -1392,7 +1398,9 @@ public class ManagerServlet extends Http
return;
}
- if (!isServiced(name)) {
+ if (isServiced(name)) {
+ writer.println(smClient.getString("managerServlet.inService",
displayPath));
+ } else {
addServiced(name);
try {
// Try to stop the context first to be nicer
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1580552&r1=1580551&r2=1580552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Mar 23 17:50:11 2014
@@ -209,6 +209,11 @@
Add definition of <code>org.apache.catalina.ant.FindLeaksTask</code>.
(kfujino)
</fix>
+ <fix>
+ <bug>56273</bug>: If the Manager web application does not perform an
+ operation because the web application is already being serviced, report
+ an error rather than reporting success. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
