Author: markt
Date: Fri Jun 5 13:17:28 2009
New Revision: 782010
URL: http://svn.apache.org/viewvc?rev=782010&view=rev
Log:
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.
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=782010&r1=782009&r2=782010&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri
Jun 5 13:17:28 2009
@@ -59,7 +59,8 @@
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 @@
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 @@
}
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));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
