jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1331508 - /jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java
Date Fri, 27 Apr 2012 17:28:37 GMT
Author: sebb
Date: Fri Apr 27 17:28:37 2012
New Revision: 1331508

URL: http://svn.apache.org/viewvc?rev=1331508&view=rev
Log:
Simplify

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java?rev=1331508&r1=1331507&r2=1331508&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/CustomX509TrustManager.java Fri Apr 27 17:28:37
2012
@@ -51,17 +51,15 @@ public class CustomX509TrustManager impl
      * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String)
      */
     public void checkClientTrusted(X509Certificate[] certificates,String authType) throws
CertificateException {
-        if (log.isDebugEnabled() && certificates != null) {
+        if (certificates != null && log.isDebugEnabled()) {
             for (int c = 0; c < certificates.length; c++) {
                 X509Certificate cert = certificates[c];
-                if (log.isDebugEnabled()){
-                    log.debug(" Client certificate " + (c + 1) + ":");
-                    log.debug("  Subject DN: " + cert.getSubjectDN());
-                    log.debug("  Signature Algorithm: " + cert.getSigAlgName());
-                    log.debug("  Valid from: " + cert.getNotBefore() );
-                    log.debug("  Valid until: " + cert.getNotAfter());
-                    log.debug("  Issuer: " + cert.getIssuerDN());
-                }
+                log.debug(" Client certificate " + (c + 1) + ":");
+                log.debug("  Subject DN: " + cert.getSubjectDN());
+                log.debug("  Signature Algorithm: " + cert.getSigAlgName());
+                log.debug("  Valid from: " + cert.getNotBefore() );
+                log.debug("  Valid until: " + cert.getNotAfter());
+                log.debug("  Issuer: " + cert.getIssuerDN());
             }
         }
 //        try {
@@ -75,7 +73,7 @@ public class CustomX509TrustManager impl
      * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],String)
      */
     public void checkServerTrusted(X509Certificate[] certificates,String authType) throws
CertificateException {
-        if (log.isDebugEnabled() && certificates != null) {
+        if (certificates != null && log.isDebugEnabled()) {
             for (int c = 0; c < certificates.length; c++) {
                 X509Certificate cert = certificates[c];
                 log.debug(" Server certificate " + (c + 1) + ":");



Mime
View raw message