Author: markt
Date: Sun Mar 23 15:38:21 2014
New Revision: 1580514
URL: http://svn.apache.org/r1580514
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/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1580514&r1=1580513&r2=1580514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sun
Mar 23 15:38:21 2014
@@ -279,7 +279,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/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1580514&r1=1580513&r2=1580514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Sun
Mar 23 15:38:21 2014
@@ -80,6 +80,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.listed=OK - Listed applications for virtual host {0}
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1580514&r1=1580513&r2=1580514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Mar
23 15:38:21 2014
@@ -687,7 +687,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
@@ -760,7 +762,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()) {
@@ -860,7 +864,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) {
@@ -1371,7 +1377,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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1580514&r1=1580513&r2=1580514&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 23 15:38:21 2014
@@ -76,6 +76,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ 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>
</section>
<section name="Tomcat 8.0.4 (markt)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
