mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Violette Roche-Montane
13.00.2014 d7957f366c832d05c20c003c7b6855715e3a457d
trivial code cleanup.
2 files modified
18 ■■■■ changed files
opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java 10 ●●●● patch | view | raw | blame | history
opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java 8 ●●●● patch | view | raw | blame | history
opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
@@ -58,7 +58,7 @@
 * parallel.
 */
final class ApplicationKeyManager implements X509KeyManager {
    static private final Logger LOG = Logger.getLogger(ApplicationKeyManager.class.getName());
    private static final Logger LOG = Logger.getLogger(ApplicationKeyManager.class.getName());
    /**
     * The default keyManager.
@@ -124,19 +124,19 @@
                }
            } catch (final NoSuchAlgorithmException e) {
                // Nothing to do. Maybe we should avoid this and be strict, but
                // we are in a best effor mode.
                // we are in a best effort mode.
                LOG.log(Level.WARNING, "Error with the algorithm", e);
            } catch (final KeyStoreException e) {
                // Nothing to do. Maybe we should avoid this and be strict, but
                // we are in a best effor mode..
                // we are in a best effort mode..
                LOG.log(Level.WARNING, "Error with the keystore", e);
            } catch (final UnrecoverableKeyException e) {
                // Nothing to do. Maybe we should avoid this and be strict, but
                // we are in a best effor mode.
                // we are in a best effort mode.
                LOG.log(Level.WARNING, "Error with the key", e);
            } catch (final NoSuchProviderException e) {
                // Nothing to do. Maybe we should avoid this and be strict, but
                // we are in a best effor mode.
                // we are in a best effort mode.
                LOG.log(Level.WARNING, "Error with the provider", e);
            }
        }
opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
@@ -59,10 +59,10 @@
     * Enumeration description server certificate trust option.
     */
    private static enum TrustOption {
        UNTRUSTED(1, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO.get()), SESSION(2,
                INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION.get()), PERMANENT(3,
                INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS.get()), CERTIFICATE_DETAILS(4,
                INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS.get());
        UNTRUSTED(1, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO.get()),
        SESSION(2, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION.get()),
        PERMANENT(3, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS.get()),
        CERTIFICATE_DETAILS(4, INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS.get());
        private Integer choice;