Merge pull request #544 from jekh/fix-mitm-trustmanager-error

Reordered static final fields to avoid nulls during class initialization

Author: jekh

mitm/src/main/java/net/lightbody/bmp/mitm/trustmanager/InsecureExtendedTrustManager.java

@@ -23,11 +23,6 @@
 public class InsecureExtendedTrustManager extends X509ExtendedTrustManager {
     private static final Logger log = LoggerFactory.getLogger(InsecureExtendedTrustManager.class);
 
-    /**
-     * The default extended trust manager, which will be used to determine if certificates would otherwise be trusted.
-     */
-    protected static final X509ExtendedTrustManager DEFAULT_EXTENDED_TRUST_MANAGER = getDefaultExtendedTrustManager();
-
     /**
      * An {@link X509ExtendedTrustManager} that does no certificate validation whatsoever.
      */
@@ -62,6 +57,11 @@ public X509Certificate[] getAcceptedIssuers() {
         }
     };
 
+    /**
+     * The default extended trust manager, which will be used to determine if certificates would otherwise be trusted.
+     */
+    protected static final X509ExtendedTrustManager DEFAULT_EXTENDED_TRUST_MANAGER = getDefaultExtendedTrustManager();
+
     @Override
     public void checkClientTrusted(X509Certificate[] x509Certificates, String s, Socket socket) throws CertificateException {
         try {