Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357

Correct test for host's parent must be an engine

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729567 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index c69d3a0..26bbd17 100644 (file)
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -149,7 +149,7 @@ public class FarmWarDeployer extends ClusterListener implements ClusterDeployer,
     
         // 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 ;
         }