From: "Petteri Raty (betelgeuse)" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] 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 [thread overview]
Message-ID: <E1Kg3Ub-00027u-MZ@stork.gentoo.org> (raw)
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);
+ }
}
reply other threads:[~2008-09-17 20:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Kg3Ub-00027u-MZ@stork.gentoo.org \
--to=betelgeuse@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox