Author: markt
Date: Wed Jan 14 15:47:39 2009
New Revision: 734560
URL: http://svn.apache.org/viewvc?rev=734560&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
Correct test for host's parent must be an engine
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:47:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,730250,732859
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734560&r1=734559&r2=734560&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:47:39 2009
@@ -141,12 +141,6 @@
possibly be exploited by a malicious webapp.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
- Correct test for host's parent must be an engine
- http://svn.apache.org/viewvc?rev=729567&view=rev
- +1: markt, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381
Composite expressions used for attribute values must be coerced to Strings
http://svn.apache.org/viewvc?rev=729569&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=734560&r1=734559&r2=734560&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Wed Jan 14 15:47:39 2009
@@ -148,7 +148,7 @@
// Check to correct engine and host setup
Container econtainer = host.getParent();
- if(econtainer == null && econtainer instanceof Engine) {
+ if(!(econtainer instanceof Engine)) {
log.error("FarmWarDeployer can only work if parent of " +
host.getName()+ " is an engine!");
return ;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=734560&r1=734559&r2=734560&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:47:39 2009
@@ -370,6 +370,10 @@
<fix>
Fix small memory leak in FarmWarDeployer. (markt)
</fix>
+ <fix>
+ <bug>46357</bug>: Corrected test for host's parent must be an engine.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
