tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1067462 - in /tomcat/tc5.5.x/trunk: ./ connectors/util/java/org/apache/tomcat/util/net/jsse/ container/webapps/docs/
Date Sat, 05 Feb 2011 16:05:36 GMT
Author: kkolinko
Date: Sat Feb  5 16:05:35 2011
New Revision: 1067462

URL: http://svn.apache.org/viewvc?rev=1067462&view=rev
Log:
Remove JSSE13Factory, JSSE13SocketFactory classes, because
 - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
   so these classes are no more needed.
 - JSSE13SocketFactory directly references com.sun.net.* classes in its
   source code without using reflection, which impedes compiling.
   Rather than fixing it I am removing the unneeded class.

Removed:
    tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java
    tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1067462&r1=1067461&r2=1067462&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Feb  5 16:05:35 2011
@@ -25,22 +25,6 @@ $Id$
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Remove JSSE13Factory, JSSE13SocketFactory classes,
-  because
-    - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
-      so these classes are no more needed.
-    - JSSE13SocketFactory directly references com.sun.net.* classes in its
-      source code without using reflection, and that causes compilation failure
-      with my IDE/JRE settings.
-  1)
-    svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java
-    svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
-  2)
-    http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory_v2.patch
-  +1: kkolinko, markt, pero
-  -O: jim
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50325
   Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746
   support)

Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1067462&r1=1067461&r2=1067462&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++ tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Sat Feb  5 16:05:35 2011
@@ -58,17 +58,8 @@ public class JSSEImplementation extends 
                     logger.debug("Error getting factory: " + JSSE15Factory, ex);
             }
         }
-        if(factory == null && JdkCompat.isJava14() ) {
-            try {
-                Class factcl = Class.forName(JSSE14Factory);
-                factory = (JSSEFactory)factcl.newInstance();
-            } catch(Exception ex) {
-                if(logger.isDebugEnabled()) {
-                    logger.debug("Error getting factory: " + JSSE14Factory, ex);
-                }
-            }
-        } if(factory == null) {
-            factory = new JSSE13Factory();
+        if(factory == null) {
+            factory = new JSSE14Factory();
         }
     }
 

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1067462&r1=1067461&r2=1067462&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Feb  5 16:05:35 2011
@@ -78,6 +78,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <update>
+        Remove <code>JSSE13Factory</code>, <code>JSSE13SocketFactory</code>
+        classes, as Tomcat 5.5 always runs on JRE 1.4 or later. (kkolinko)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 5.5.32 (jim)" rtext="released 2011-02-01">
   <subsection name="General">



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


Mime
View raw message