|
@@ -28,6 +28,7 @@ import com.dmdirc.logger.ErrorLevel;
|
28
|
28
|
import com.dmdirc.logger.Logger;
|
29
|
29
|
import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateAction;
|
30
|
30
|
import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
|
|
31
|
+import com.dmdirc.util.StreamUtil;
|
31
|
32
|
|
32
|
33
|
import java.io.File;
|
33
|
34
|
import java.io.FileInputStream;
|
|
@@ -57,6 +58,7 @@ import javax.naming.ldap.Rdn;
|
57
|
58
|
import javax.net.ssl.KeyManager;
|
58
|
59
|
import javax.net.ssl.KeyManagerFactory;
|
59
|
60
|
import javax.net.ssl.X509TrustManager;
|
|
61
|
+
|
60
|
62
|
import net.miginfocom.Base64;
|
61
|
63
|
|
62
|
64
|
/**
|
|
@@ -201,13 +203,7 @@ public class CertificateManager implements X509TrustManager {
|
201
|
203
|
} catch (UnrecoverableKeyException ex) {
|
202
|
204
|
Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
|
203
|
205
|
} finally {
|
204
|
|
- if (fis != null) {
|
205
|
|
- try {
|
206
|
|
- fis.close();
|
207
|
|
- } catch (IOException ex) {
|
208
|
|
- // ...
|
209
|
|
- }
|
210
|
|
- }
|
|
206
|
+ StreamUtil.close(fis);
|
211
|
207
|
}
|
212
|
208
|
}
|
213
|
209
|
|