diff options
Diffstat (limited to 'base/util/src/netscape/security/x509')
6 files changed, 71 insertions, 16 deletions
diff --git a/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/base/util/src/netscape/security/x509/CRLDistributionPoint.java index 442957449..2c70bf3e6 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPoint.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPoint.java @@ -252,13 +252,14 @@ public class CRLDistributionPoint implements ASN1Value { } public static void main(String args[]) { + ByteArrayOutputStream bos = null; try { if (args.length != 1) { System.out.println("Usage: CRLDistributionPoint <outfile>"); System.exit(-1); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + bos = new ByteArrayOutputStream(); SEQUENCE cdps = new SEQUENCE(); @@ -336,6 +337,14 @@ public class CRLDistributionPoint implements ASN1Value { } catch (Exception e) { e.printStackTrace(); + } finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } diff --git a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 4180473d4..d8dee03a7 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -243,7 +243,7 @@ public class CRLDistributionPointsExtension extends Extension * Test driver. */ public static void main(String args[]) { - + BufferedOutputStream bos = null; try { if (args.length != 1) { @@ -252,7 +252,7 @@ public class CRLDistributionPointsExtension extends Extension System.exit(-1); } - BufferedOutputStream bos = new BufferedOutputStream( + bos = new BufferedOutputStream( new FileOutputStream(args[0])); // URI only @@ -291,10 +291,16 @@ public class CRLDistributionPointsExtension extends Extension crldpExt.setCritical(true); crldpExt.encode(bos); - bos.close(); - } catch (Exception e) { e.printStackTrace(); + } finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } diff --git a/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java index f108b4599..222a5e959 100644 --- a/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -248,7 +248,7 @@ public class FreshestCRLExtension extends Extension * Test driver. */ public static void main(String args[]) { - + BufferedOutputStream bos = null; try { if (args.length != 1) { @@ -257,7 +257,7 @@ public class FreshestCRLExtension extends Extension System.exit(-1); } - BufferedOutputStream bos = new BufferedOutputStream( + bos = new BufferedOutputStream( new FileOutputStream(args[0])); // URI only @@ -296,10 +296,16 @@ public class FreshestCRLExtension extends Extension crldpExt.setCritical(true); crldpExt.encode(bos); - bos.close(); - } catch (Exception e) { e.printStackTrace(); + } finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java index 504587bf4..06638f2dd 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPoint.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java @@ -272,6 +272,7 @@ public class IssuingDistributionPoint implements ASN1Value { } public static void main(String args[]) { + BufferedOutputStream bos = null; try { if (args.length != 1) { @@ -279,7 +280,7 @@ public class IssuingDistributionPoint implements ASN1Value { System.exit(-1); } - BufferedOutputStream bos = new BufferedOutputStream( + bos = new BufferedOutputStream( new FileOutputStream(args[0])); SEQUENCE idps = new SEQUENCE(); @@ -306,9 +307,16 @@ public class IssuingDistributionPoint implements ASN1Value { idps.addElement(idp); idps.encode(bos); - bos.close(); } catch (Exception e) { e.printStackTrace(); + } finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index 0f8c8835c..b78a891c2 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -361,6 +361,7 @@ public class IssuingDistributionPointExtension extends Extension */ public static void main(String args[]) { + BufferedOutputStream bos = null; try { if (args.length != 1) { @@ -369,7 +370,7 @@ public class IssuingDistributionPointExtension extends Extension System.exit(-1); } - BufferedOutputStream bos = new BufferedOutputStream( + bos = new BufferedOutputStream( new FileOutputStream(args[0])); // URI only @@ -410,10 +411,18 @@ public class IssuingDistributionPointExtension extends Extension idpExt.setCritical(false); idpExt.encode(bos); - bos.close(); + } catch (Exception e) { e.printStackTrace(); + } finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } } diff --git a/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java index 17573a019..4cebcf2c8 100644 --- a/base/util/src/netscape/security/x509/OIDMap.java +++ b/base/util/src/netscape/security/x509/OIDMap.java @@ -165,12 +165,20 @@ public class OIDMap { if (!namesMap.exists()) { loadNamesDefault(props); } else { + FileInputStream fis = null; try { - FileInputStream fis = new FileInputStream(namesMap); + fis = new FileInputStream(namesMap); props.load(fis); - fis.close(); } catch (IOException e) { loadNamesDefault(props); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } @@ -193,11 +201,20 @@ public class OIDMap { if (!classMap.exists()) { loadClassDefault(props); } else { + FileInputStream fis = null; try { - FileInputStream fis = new FileInputStream(classMap); + fis = new FileInputStream(classMap); props.load(fis); } catch (IOException e) { loadClassDefault(props); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } |