You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/11/05 03:04:20 UTC

directory-kerby git commit: DIRKRB-443 Fix checkstyle issue: EmptyBlock: Must have at least one statement.

Repository: directory-kerby
Updated Branches:
  refs/heads/pkinit-support 886053113 -> 1b1d4c152


DIRKRB-443 Fix checkstyle issue: EmptyBlock: Must have at least one statement.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1b1d4c15
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1b1d4c15
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1b1d4c15

Branch: refs/heads/pkinit-support
Commit: 1b1d4c1524a7444c67aa1f40603f88859af528d1
Parents: 8860531
Author: plusplusjiajia <ji...@intel.com>
Authored: Thu Nov 5 10:10:41 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Thu Nov 5 10:10:41 2015 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/commons/ssl/Certificates.java   | 8 ++++++++
 .../src/main/java/org/apache/commons/ssl/KeyMaterial.java    | 1 +
 .../main/java/org/apache/commons/ssl/KeyStoreBuilder.java    | 6 ++++++
 .../src/main/java/org/apache/commons/ssl/SSLEchoServer.java  | 1 +
 .../src/main/java/org/apache/commons/ssl/SSLProxyServer.java | 2 ++
 5 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1b1d4c15/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Certificates.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Certificates.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Certificates.java
index 674318e..0af39ea 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Certificates.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Certificates.java
@@ -313,6 +313,7 @@ public class Certificates {
         byte[] bytes = cert.getExtensionValue("2.5.29.31");
         if (bytes == null) {
             // log.warn( "Cert doesn't contain X509v3 CRL Distribution Points (2.5.29.31): " + name );
+            System.err.println("Cert doesn't contain X509v3 CRL Distribution Points (2.5.29.31)");
         } else {
             List crlList = getCRLs(cert);
             Iterator it = crlList.iterator();
@@ -432,6 +433,7 @@ public class Certificates {
                             setReadTimeout.invoke(httpConn, Integer.valueOf(5000));
                         } catch (NoSuchMethodException nsme) {
                             // oh well, java 1.4 users can suffer.
+                            System.err.println(nsme);
                         } catch (Exception e) {
                             throw new RuntimeException("can't set timeout", e);
                         }
@@ -454,6 +456,7 @@ public class Certificates {
                     this.creationTime = System.currentTimeMillis();
                 } catch (IOException ioe) {
                     // log.warn( "Cannot check CRL: " + e );
+                    System.err.println(ioe);
                 }
             }
 
@@ -476,9 +479,11 @@ public class Certificates {
                 } catch (IOException ioe) {
                     // couldn't load CRL that's supposed to be stored in Temp file.
                     // log.warn(  );
+                    System.err.println(ioe);
                 } catch (CRLException crle) {
                     // something is wrong with the CRL
                     // log.warn(  );
+                    System.err.println(crle);
                 }
             }
             return crl != null;
@@ -506,7 +511,9 @@ public class Certificates {
                             cnList.add(value.toString());
                         }
                     } catch (NoSuchElementException ignore) {
+                        System.err.println(ignore);
                     } catch (NamingException ignore) {
+                        System.err.println(ignore);
                     }
                 }
             }
@@ -514,6 +521,7 @@ public class Certificates {
                 return cnList.toArray(new String[cnList.size()]);
             }
         } catch (InvalidNameException ignore) {
+            System.err.println(ignore);
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1b1d4c15/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
index 44ff77e..0ec2040 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
@@ -205,6 +205,7 @@ public class KeyMaterial extends TrustMaterial {
 
                 } catch (GeneralSecurityException gse) {
                     // oh well, we can't use that KeyStore alias.
+                    System.err.println(gse);
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1b1d4c15/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
index cad7b87..828b99d 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
@@ -333,6 +333,7 @@ public class KeyStoreBuilder {
             throw pbpe;
         } catch (GeneralSecurityException gse) {
             // no luck
+            System.err.println(gse);
         }
 
         List pemItems = PEMUtil.decode(stuff);
@@ -371,6 +372,7 @@ public class KeyStoreBuilder {
             }
         } catch (Exception e) {
             // isProbablyPKCS12 and isASN are set properly by now.
+            System.err.println(e);
         }
 
         ByteArrayInputStream stuffStream = new ByteArrayInputStream(stuff);
@@ -415,6 +417,7 @@ public class KeyStoreBuilder {
                 }
             } catch (CertificateException ce) {
                 // oh well
+                System.err.println(ce);
             }
 
             stuffStream.reset();
@@ -431,6 +434,7 @@ public class KeyStoreBuilder {
                 }
             } catch (CertificateException ce) {
                 // oh well
+                System.err.println(ce);
             }
         }
 
@@ -483,6 +487,7 @@ public class KeyStoreBuilder {
                         uke = e;  // We might throw this one later. 
                     } catch (GeneralSecurityException gse) {
                         // Swallow... keep looping.
+                        System.err.println(gse);
                     }
                 }
                 if (isPKCS12 && en.hasMoreElements()) {
@@ -594,6 +599,7 @@ public class KeyStoreBuilder {
                 }
             } catch (Exception e) {
                 // oh well, try next one.
+                System.err.println(e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1b1d4c15/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
index a05a437..437ccc4 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
@@ -131,6 +131,7 @@ public class SSLEchoServer {
                     }
                     s.close();
                 } catch (Exception e) {
+                    System.err.println(e);
                 }
 
                 if (ioe instanceof InterruptedIOException) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1b1d4c15/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
index dd2540f..c2ca551 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
@@ -165,6 +165,7 @@ public class SSLProxyServer {
                     }
                     s.close();
                 } catch (Exception e) {
+                    System.err.println(e);
                 }
 
                 try {
@@ -176,6 +177,7 @@ public class SSLProxyServer {
                     }
                     newSocket.close();
                 } catch (Exception e) {
+                    System.err.println(e);
                 }