[dmdirc commit] r5808 - trunk/src/com/dmdirc

[com...@dmdirc.com]

Author: chris87
Date: 2010-01-18 07:55:26 +0000 (Mon, 18 Jan 2010)
New Revision: 5808

Modified:
trunk/src/com/dmdirc/CertificateManager.java
Log:
Use StreamUtil in CertificateManager

Git-version: 0.6.3m2-333-g65f9d33

Modified: trunk/src/com/dmdirc/CertificateManager.java
===================================================================
--- trunk/src/com/dmdirc/CertificateManager.java 2010-01-18 07:55:20 UTC (rev 5807)
+++ trunk/src/com/dmdirc/CertificateManager.java 2010-01-18 07:55:26 UTC (rev 5808)
@@ -28,6 +28,7 @@
import com.dmdirc.logger.Logger;
import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateAction;
import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
+import com.dmdirc.util.StreamUtil;

import java.io.File;
import java.io.FileInputStream;
@@ -57,6 +58,7 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.X509TrustManager;
+
import net.miginfocom.Base64;

/**
@@ -201,13 +203,7 @@
} catch (UnrecoverableKeyException ex) {
Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
} finally {
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException ex) {
- // ...
- }
- }
+ StreamUtil.close(fis);
}
}

[com...@dmdirc.com]