Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 27351 invoked from network); 1 Jul 2009 19:38:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Jul 2009 19:38:43 -0000 Received: (qmail 21893 invoked by uid 500); 1 Jul 2009 19:38:53 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 21817 invoked by uid 500); 1 Jul 2009 19:38:53 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 21806 invoked by uid 99); 1 Jul 2009 19:38:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 19:38:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 19:38:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D531238888E; Wed, 1 Jul 2009 19:38:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090701193828.8D531238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + 46357: Corrected test for host's parent must be an engine. + (markt, rjung) + 45317: 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