tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r790340 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 01 Jul 2009 19:38:28 GMT
Author: rjung
Date: Wed Jul  1 19:38:27 2009
New Revision: 790340

URL: http://svn.apache.org/viewvc?rev=790340&view=rev
Log:
BZ 46357: Correct test for host's parent must be an engine.
Backport of r734560 from TC6 and r735629 from OACC.

Modified:
    tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=790340&r1=790339&r2=790340&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Wed Jul  1 19:38:27 2009
@@ -146,7 +146,7 @@
         // Check to correct engine and host setup
         host = (Host) hcontainer;
         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/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790340&r1=790339&r2=790340&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul  1 19:38:27 2009
@@ -217,6 +217,9 @@
   <subsection name="Cluster">
     <changelog>
       <fix>
+        <bug>46357</bug>: Corrected test for host's parent must be an engine.
+        (markt, rjung)
+      </fix>
       <update>
         <bug>45317</bug>: Properly log the value of the state transfer timeout
flag.
         (fhanik, rjung)

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790340&r1=790339&r2=790340&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul  1 19:38:27 2009
@@ -67,13 +67,6 @@
   +1: markt - patch does much more than fix a memory leak
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
-  Correct test for host's parent must be an engine
-  Backport of http://svn.apache.org/viewvc?view=rev&revision=734560 from tc6
-  resp. http://svn.apache.org/viewvc?view=rev&revision=735629 from OACC.
-  +1: rjung, kkolinko, markt
-  -1:
-
 * Remove obsolete classpath entry for commons-logging from start script.
   The cl jar is contained in the cp via the manifest of the bootstrap.jar.
   The cl jar file name in the startup script also is no longer correct,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message