From f7d6c8588405d69dbb8a4bcabf3c8da174b1b218 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Mon, 11 Jan 2010 23:42:20 +0000 Subject: [PATCH] Rename TCN_RECOMMENDED_MIN -> TCN_RECOMMENDED_MINOR to match the naming of TCN_REQUIRED_MINOR and to resolve ambiguity, because "min" usually means "minimum". This field does not exist in tc6.0.x code. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898115 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/AprLifecycleListener.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index d293fc051..3e6594a7e 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -59,7 +59,7 @@ 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 = 17; - protected static final int TCN_RECOMMENDED_MIN = 1; + protected static final int TCN_RECOMMENDED_MINOR = 1; protected static final int TCN_RECOMMENDED_PV = 19; @@ -161,12 +161,12 @@ public class AprLifecycleListener } return; } - if (minor < TCN_RECOMMENDED_MIN || - (minor == TCN_RECOMMENDED_MIN && patch < TCN_RECOMMENDED_PV)) { + if (minor < TCN_RECOMMENDED_MINOR || + (minor == TCN_RECOMMENDED_MINOR && patch < TCN_RECOMMENDED_PV)) { log.info(sm.getString("aprListener.tcnVersion", major + "." + minor + "." + patch, TCN_REQUIRED_MAJOR + "." + - TCN_RECOMMENDED_MIN + "." + + TCN_RECOMMENDED_MINOR + "." + TCN_RECOMMENDED_PV)); } -- 2.11.0