diff --git a/src/share/classes/sun/security/provider/DomainKeyStore.java b/src/share/classes/sun/security/provider/DomainKeyStore.java
index 9c4072abc49cfd04e237382915cba1c7ae6ac031..1897fd5fb501b296d4aaa4e5df56eeb4622cb573 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);
                 }