Author: rjung Date: Mon Jan 19 00:35:28 2009 New Revision: 735629 URL: http://svn.apache.org/viewvc?rev=735629&view=rev Log: Port r613809 from tc6 to oacc.
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357 Correct test for host's parent must be an engine. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=735629&r1=735628&r2=735629&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java Mon Jan 19 00:35:28 2009 @@ -147,7 +147,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 ; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
