diff options
| author | Jiri Vanek <jvanek@redhat.com> | 2013-09-25 18:50:18 +0200 |
|---|---|---|
| committer | Jiri Vanek <jvanek@redhat.com> | 2013-09-25 18:50:18 +0200 |
| commit | 19e74fe5dacd03e0cb5582f840e15262e39fe24f (patch) | |
| tree | 38ffc4f47f7641f8d20ba0e0e8a97a97ffb1db64 /netx/net/sourceforge/jnlp/security/CertificateUtils.java | |
| parent | fcd5c4c69fc5ea84b04f309eb40e295eab921fd8 (diff) | |
Introduced logging bottleneck
Diffstat (limited to 'netx/net/sourceforge/jnlp/security/CertificateUtils.java')
| -rw-r--r-- | netx/net/sourceforge/jnlp/security/CertificateUtils.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/netx/net/sourceforge/jnlp/security/CertificateUtils.java b/netx/net/sourceforge/jnlp/security/CertificateUtils.java index 6987d8c..a8984b3 100644 --- a/netx/net/sourceforge/jnlp/security/CertificateUtils.java +++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.java @@ -61,6 +61,7 @@ import java.util.Random; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.replacements.BASE64Encoder; import sun.security.provider.X509Factory; @@ -77,9 +78,8 @@ public class CertificateUtils { */ public static final void addToKeyStore(File file, KeyStore ks) throws CertificateException, IOException, KeyStoreException { - if (JNLPRuntime.isDebug()) { - System.out.println("Importing certificate from " + file + " into " + ks); - } + + OutputController.getLogger().log("Importing certificate from " + file + " into " + ks); BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); CertificateFactory cf = CertificateFactory.getInstance("X509"); @@ -100,9 +100,8 @@ public class CertificateUtils { */ public static final void addToKeyStore(X509Certificate cert, KeyStore ks) throws KeyStoreException { - if (JNLPRuntime.isDebug()) { - System.out.println("Importing " + cert.getSubjectX500Principal().getName()); - } + + OutputController.getLogger().log("Importing " + cert.getSubjectX500Principal().getName()); String alias = null; @@ -173,16 +172,13 @@ public class CertificateUtils { String alias = aliases.nextElement(); if (c.equals(keyStores[i].getCertificate(alias))) { - if (JNLPRuntime.isDebug()) { - System.out.println(Translator.R("LCertFoundIn", c.getSubjectX500Principal().getName(), KeyStores.getPathToKeystore(keyStores[i].hashCode()))); - } - + OutputController.getLogger().log(Translator.R("LCertFoundIn", c.getSubjectX500Principal().getName(), KeyStores.getPathToKeystore(keyStores[i].hashCode()))); return true; } // else continue } } catch (KeyStoreException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); // continue } } |