From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 Jun 2009 13:47:50 +0000 (+0000)
Subject: Fix the logic for the min version tests
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=384f7f2efbe6532975142c9cdb37a31bbd9d54a7;p=tomcat7.0

Fix the logic for the min version tests

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

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index c0b749895..4c5771c5b 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -141,7 +141,7 @@ public class AprLifecycleListener
         }
         if ((major != TCN_REQUIRED_MAJOR)  ||
             (minor < TCN_REQUIRED_MINOR) ||
-            (patch <  TCN_REQUIRED_PATCH)) {
+            (minor == TCN_REQUIRED_MINOR && patch <  TCN_REQUIRED_PATCH)) {
             log.error(sm.getString("aprListener.tcnInvalid", major + "."
                     + minor + "." + patch,
                     TCN_REQUIRED_MAJOR + "." +
@@ -157,7 +157,7 @@ public class AprLifecycleListener
             return false;
         }
         if (minor < TCN_RECOMMENDED_MIN ||
-                (minor >= TCN_RECOMMENDED_MIN && patch <  TCN_RECOMMENDED_PV)) {
+                (minor == TCN_RECOMMENDED_MIN && patch <  TCN_RECOMMENDED_PV)) {
             log.info(sm.getString("aprListener.tcnVersion", major + "."
                     + minor + "." + patch,
                     TCN_REQUIRED_MAJOR + "." +