From 37fec98b9c0c7a369bb5ef65c67fbf83f1bfc422 Mon Sep 17 00:00:00 2001
From: vinnie <unknown>
Date: Fri, 11 Oct 2013 20:35:00 +0100
Subject: [PATCH] 8026301: DomainKeyStore doesn't cleanup correctly when
 storing to keystore Reviewed-by: mullan

---
 .../classes/sun/security/provider/DomainKeyStore.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/sun/security/provider/DomainKeyStore.java b/src/share/classes/sun/security/provider/DomainKeyStore.java
index 9c4072abc..1897fd5fb 100644
--- a/src/share/classes/sun/security/provider/DomainKeyStore.java
+++ b/src/share/classes/sun/security/provider/DomainKeyStore.java
@@ -652,9 +652,12 @@ abstract class DomainKeyStore extends KeyStoreSpi {
 
                     // Store the keystores
                     KeyStore keystore = keystores.get(builder.name);
-                    keystore.store(new FileOutputStream(builder.file),
-                        password);
 
+                    try (FileOutputStream stream =
+                        new FileOutputStream(builder.file)) {
+
+                        keystore.store(stream, password);
+                    }
                 } catch (KeyStoreException e) {
                     throw new IOException(e);
                 }
-- 
GitLab