Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
| Navigation: |
|
Lists:
gentoo-commits:
< Prev
By Thread
Next >
< Prev
By Date
Next >
|
| Headers: |
|
To:
|
gentoo-commits@g.o
|
|
From:
|
"Petteri Raty (betelgeuse)" <betelgeuse@g.o>
|
|
Subject:
|
gentoo-x86 commit in www-servers/tomcat/files/5.5: 5.5.27-dynamic-JSSE13Factory.patch
|
|
Date:
|
Wed, 17 Sep 2008 20:19:17 +0000
|
|
betelgeuse 08/09/17 20:19:17
Added: 5.5.27-dynamic-JSSE13Factory.patch
Log:
Remove the need for com.sun.* classes at compile time.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Revision Changes Path
1.1 www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/5.5.27-dynamic-JSSE13Factory.patch?rev=1.1&content-type=text/plain
Index: 5.5.27-dynamic-JSSE13Factory.patch
===================================================================
Index: util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
===================================================================
--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (revision 696420)
+++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (working copy)
@@ -49,27 +49,22 @@
public JSSEImplementation() throws ClassNotFoundException {
// Check to see if JSSE is floating around somewhere
Class.forName(SSLSocketClass);
+ String className;
if( JdkCompat.isJava15() ) {
- try {
- Class factcl = Class.forName(JSSE15Factory);
- factory = (JSSEFactory)factcl.newInstance();
- } catch(Exception ex) {
- if(logger.isDebugEnabled())
- logger.debug("Error getting factory: " + JSSE15Factory, ex);
- }
+ className = JSSE15Factory;
}
- 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();
+ else if( JdkCompat.isJava14() ) {
+ className = JSSE14Factory;
+ } else {
+ className = JSSE13Factory;
}
+
+ try {
+ factory = (JSSEFactory) Class.forName(className).newInstance();
+ } catch(Exception ex) {
+ if(logger.isDebugEnabled())
+ logger.debug("Error getting factory: " + className, ex);
+ }
}
|
|
