Bladeren bron

Use StreamUtil in CertificateManager

Change-Id: I01438bd22213fadffee63cd131efffbf1a77da18
Reviewed-on: http://gerrit.dmdirc.com/545
Automatic-Compile: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3b1
Chris Smith 14 jaren geleden
bovenliggende
commit
65f9d33e72
1 gewijzigde bestanden met toevoegingen van 3 en 7 verwijderingen
  1. 3
    7
      src/com/dmdirc/CertificateManager.java

+ 3
- 7
src/com/dmdirc/CertificateManager.java Bestand weergeven

28
 import com.dmdirc.logger.Logger;
28
 import com.dmdirc.logger.Logger;
29
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateAction;
29
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateAction;
30
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
30
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
31
+import com.dmdirc.util.StreamUtil;
31
 
32
 
32
 import java.io.File;
33
 import java.io.File;
33
 import java.io.FileInputStream;
34
 import java.io.FileInputStream;
57
 import javax.net.ssl.KeyManager;
58
 import javax.net.ssl.KeyManager;
58
 import javax.net.ssl.KeyManagerFactory;
59
 import javax.net.ssl.KeyManagerFactory;
59
 import javax.net.ssl.X509TrustManager;
60
 import javax.net.ssl.X509TrustManager;
61
+
60
 import net.miginfocom.Base64;
62
 import net.miginfocom.Base64;
61
 
63
 
62
 /**
64
 /**
201
             } catch (UnrecoverableKeyException ex) {
203
             } catch (UnrecoverableKeyException ex) {
202
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
204
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
203
             } finally {
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
 

Laden…
Annuleren
Opslaan