Author: kkolinko Date: Mon Jul 11 18:40:48 2011 New Revision: 1145285 URL: http://svn.apache.org/viewvc?rev=1145285&view=rev Log: Followup to r1145209 Do not expose TCN_FULL_VERSION as a public constant, but calculate it when needed. Using this way it will be easier to throw away the code in AprEndpoint when it becomes unneeded. I do not mind reintroducing the constant if it were used in two or more places.
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1145285&r1=1145284&r2=1145285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Mon Jul 11 18:40:48 2011 @@ -102,8 +102,6 @@ public final class Library { public static int TCN_PATCH_VERSION = 0; /* TCN_IS_DEV_VERSION */ public static int TCN_IS_DEV_VERSION = 0; - /* TCN_FULL_VERSION */ - public static int TCN_FULL_VERSION = 0; /* APR_MAJOR_VERSION */ public static int APR_MAJOR_VERSION = 0; /* APR_MINOR_VERSION */ @@ -180,9 +178,6 @@ public final class Library { TCN_MINOR_VERSION = version(0x02); TCN_PATCH_VERSION = version(0x03); TCN_IS_DEV_VERSION = version(0x04); - TCN_FULL_VERSION = TCN_MAJOR_VERSION * 1000 + - TCN_MINOR_VERSION * 100 + - TCN_PATCH_VERSION; APR_MAJOR_VERSION = version(0x11); APR_MINOR_VERSION = version(0x12); APR_PATCH_VERSION = version(0x13); Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1145285&r1=1145284&r2=1145285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jul 11 18:40:48 2011 @@ -473,7 +473,10 @@ public class AprEndpoint extends Abstrac // SSL protocol int value; // This branch can be removed, once the required version is at least 1.1.21. - if (Library.TCN_FULL_VERSION <= 1120) { + int tcnFullVersion = Library.TCN_MAJOR_VERSION * 1000 + + Library.TCN_MINOR_VERSION * 100 + + Library.TCN_PATCH_VERSION; + if (tcnFullVersion <= 1120) { value = SSL.SSL_PROTOCOL_ALL; if ("SSLv2".equalsIgnoreCase(SSLProtocol)) { value = SSL.SSL_PROTOCOL_SSLV2; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org