You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/12/27 00:37:33 UTC

svn commit: r729567 - /tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java

Author: markt
Date: Fri Dec 26 15:37:33 2008
New Revision: 729567

URL: http://svn.apache.org/viewvc?rev=729567&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/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=729567&r1=729566&r2=729567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Fri Dec 26 15:37:33 2008
@@ -149,7 +149,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 ;
         }



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