From 9419bb4f59249ff35e1790cedc5c62247cc674b0 Mon Sep 17 00:00:00 2001
From: Jason Uh <juh@openjdk.org>
Date: Thu, 17 Oct 2013 12:00:20 -0700
Subject: [PATCH] 8026233: test/sun/security/tools/keytool/StorePasswords.java
 needs to clean up files

Reviewed-by: vinnie
---
 .../sun/security/tools/keytool/StorePasswords.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jdk/test/sun/security/tools/keytool/StorePasswords.java b/jdk/test/sun/security/tools/keytool/StorePasswords.java
index e1f0c275b94..573947f656e 100644
--- a/jdk/test/sun/security/tools/keytool/StorePasswords.java
+++ b/jdk/test/sun/security/tools/keytool/StorePasswords.java
@@ -77,6 +77,8 @@ public class StorePasswords {
         }
         System.out.println("\nStored " + storeCount + " user passwords, " +
             "recovered " + recoverCount + " user passwords");
+
+        new File(KEYSTORE).delete();
     }
 
     private static int store() throws Exception {
@@ -144,7 +146,9 @@ public class StorePasswords {
 
         // Store the PKCS#12 keystore
         System.out.println("Storing PKCS#12 keystore to: " + KEYSTORE);
-        keystore.store(new FileOutputStream(KEYSTORE), KEYSTORE_PWD);
+        try (FileOutputStream out = new FileOutputStream(KEYSTORE)) {
+            keystore.store(out, KEYSTORE_PWD);
+        }
 
         return count;
     }
@@ -154,7 +158,9 @@ public class StorePasswords {
         // Load the PKCS#12 keystore
         KeyStore keystore = KeyStore.getInstance("PKCS12");
         System.out.println("\nLoading PKCS#12 keystore from: " + KEYSTORE);
-        keystore.load(new FileInputStream(KEYSTORE), KEYSTORE_PWD);
+        try (FileInputStream in = new FileInputStream(KEYSTORE)) {
+            keystore.load(in, KEYSTORE_PWD);
+        }
 
         SecretKey key;
         SecretKeyFactory factory;