diff -up ./src/org/apache/tomcat/util/net/jss/JSSSupport.java.cfu ./src/org/apache/tomcat/util/net/jss/JSSSupport.java
--- ./src/org/apache/tomcat/util/net/jss/JSSSupport.java.cfu	2015-05-05 12:12:38.897296507 -0700
+++ ./src/org/apache/tomcat/util/net/jss/JSSSupport.java	2015-05-05 12:13:22.064157121 -0700
@@ -19,16 +19,18 @@
 
 package org.apache.tomcat.util.net.jss;
 
-import org.apache.tomcat.util.net.*;
-import java.io.*;
-import java.net.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import org.mozilla.jss.ssl.*;
-import java.security.cert.*;
 
-class JSSSupport implements SSLSupport{
-    private static org.apache.commons.logging.Log log =
-        org.apache.commons.logging.LogFactory.getLog(JSSSupport.class);
+import org.apache.tomcat.util.net.SSLSupport;
+import org.mozilla.jss.ssl.SSLSecurityStatus;
+import org.mozilla.jss.ssl.SSLSocket;
+
+class JSSSupport implements SSLSupport {
+    private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
+            .getLog(JSSSupport.class);
 
     private SSLSocket ssl = null;
     private SSLSecurityStatus status = null;
@@ -41,15 +43,16 @@ class JSSSupport implements SSLSupport{
         }
     }
 
-    public X509Certificate[] getPeerCertificateChain(boolean force) throws
- IOException {
+    public X509Certificate[] getPeerCertificateChain(boolean force)
+            throws IOException {
         // retrieve the status when we need it. status cache
         // the client certificate which may not be available
         // at the creation of JSSSupport
         status = ssl.getStatus();
         if (status != null) {
-            org.mozilla.jss.crypto.X509Certificate peerCert = status.getPeerCertificate();
-       
+            org.mozilla.jss.crypto.X509Certificate peerCert = status
+                    .getPeerCertificate();
+
             if (peerCert == null) {
                 ssl.requireClientAuth(SSLSocket.SSL_REQUIRE_NO_ERROR);
                 try {
@@ -65,10 +68,10 @@ class JSSSupport implements SSLSupport{
                 X509Certificate[] certs = new X509Certificate[1];
                 try {
                     byte[] b = peerCert.getEncoded();
-                    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                    ByteArrayInputStream stream =
-                      new ByteArrayInputStream(b);
-                    certs[0] = (X509Certificate)cf.generateCertificate(stream);
+                    CertificateFactory cf = CertificateFactory
+                            .getInstance("X.509");
+                    ByteArrayInputStream stream = new ByteArrayInputStream(b);
+                    certs[0] = (X509Certificate) cf.generateCertificate(stream);
                 } catch (Exception e) {
                 }
                 return certs;
@@ -98,5 +101,3 @@ class JSSSupport implements SSLSupport{
         return null;
     }
 }
-
-