tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r898115 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Date Mon, 11 Jan 2010 23:42:21 GMT
Author: kkolinko
Date: Mon Jan 11 23:42:20 2010
New Revision: 898115

URL: http://svn.apache.org/viewvc?rev=898115&view=rev
Log:
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.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=898115&r1=898114&r2=898115&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon Jan 11 23:42:20
2010
@@ -59,7 +59,7 @@
     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 @@
             }
             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));
         }
 



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


Mime
View raw message