From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../bku/online/applet/InternalSSLSocketFactory.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java') diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java index a02e56eb..c9bf81ca 100644 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java +++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java @@ -31,8 +31,8 @@ import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InternalSSLSocketFactory extends SSLSocketFactory { @@ -40,8 +40,7 @@ public class InternalSSLSocketFactory extends SSLSocketFactory { private static InternalSSLSocketFactory instance = new InternalSSLSocketFactory(); - private final static Log log = LogFactory - .getLog(InternalSSLSocketFactory.class); + private final Logger log = LoggerFactory.getLogger(InternalSSLSocketFactory.class); private SSLSocket sslSocket; @@ -107,19 +106,19 @@ public class InternalSSLSocketFactory extends SSLSocketFactory { } public boolean isEgovAgency() { - log.info("Checking if server is egov agency"); + log.info("Checking if server is egov agency."); if (sslSocket != null) { try { X509Certificate cert = (X509Certificate) sslSocket.getSession() .getPeerCertificates()[0]; - log.info("Server cert: " + cert); + log.info("Server cert: {}.", cert); return isGovAgency(cert); } catch (SSLPeerUnverifiedException e) { - log.error(e); + log.error("Failed to check server cert.", e); return false; } } - log.info("Not a SSL connection"); + log.info("Not a SSL connection."); return false; } @@ -146,7 +145,8 @@ public class InternalSSLSocketFactory extends SSLSocketFactory { } } } catch (CertificateParsingException e) { - log.error(e); + Logger log = LoggerFactory.getLogger(InternalSSLSocketFactory.class); + log.error("Failed to parse certificate.", e); } if ((cert.getExtensionValue("1.2.40.0.10.1.1.1") != null) || (cert.getExtensionValue("1.2.40.0.10.1.1.2") != null)) { -- cgit v1.2.3