From 4e5abfdabb2b5525f4a2a1f2dac7c9ef04f53426 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 5 Jun 2009 13:17:28 +0000 Subject: [PATCH] Allow trunk to work with native trunk (1.2.x) and the 1.1.x branch. Update recommended version to latest. Note minor version number changes are meant to be binary compatible with previous versions. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@782010 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/AprLifecycleListener.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index 93220cfe1..c0b749895 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -59,7 +59,8 @@ public class AprLifecycleListener protected static final int TCN_REQUIRED_MAJOR = 1; protected static final int TCN_REQUIRED_MINOR = 1; protected static final int TCN_REQUIRED_PATCH = 8; - protected static final int TCN_RECOMMENDED_PV = 10; + protected static final int TCN_RECOMMENDED_MIN = 1; + protected static final int TCN_RECOMMENDED_PV = 16; // ---------------------------------------------- Properties @@ -139,7 +140,7 @@ public class AprLifecycleListener return false; } if ((major != TCN_REQUIRED_MAJOR) || - (minor != TCN_REQUIRED_MINOR) || + (minor < TCN_REQUIRED_MINOR) || (patch < TCN_REQUIRED_PATCH)) { log.error(sm.getString("aprListener.tcnInvalid", major + "." + minor + "." + patch, @@ -155,11 +156,12 @@ public class AprLifecycleListener } return false; } - if (patch < TCN_RECOMMENDED_PV) { + if (minor < TCN_RECOMMENDED_MIN || + (minor >= TCN_RECOMMENDED_MIN && patch < TCN_RECOMMENDED_PV)) { log.info(sm.getString("aprListener.tcnVersion", major + "." + minor + "." + patch, TCN_REQUIRED_MAJOR + "." + - TCN_REQUIRED_MINOR + "." + + TCN_RECOMMENDED_MIN + "." + TCN_RECOMMENDED_PV)); } -- 2.11.0