diff options
Diffstat (limited to 'base/util/src/com/netscape/cmsutil/password')
3 files changed, 44 insertions, 17 deletions
diff --git a/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java index adad6ee37..990d0c156 100644 --- a/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java +++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java @@ -37,10 +37,15 @@ public class PlainPasswordFile implements IPasswordStore { mPwdStore = new Properties(); // initialize mPwdStore mPwdPath = pwdPath; - - FileInputStream file = new FileInputStream(mPwdPath); - mPwdStore.load(file); - file.close(); + FileInputStream file = null; + try { + file = new FileInputStream(mPwdPath); + mPwdStore.load(file); + } finally { + if (file != null) { + file.close(); + } + } } public String getPassword(String tag) { @@ -63,8 +68,14 @@ public class PlainPasswordFile implements IPasswordStore { public void commit() throws IOException, ClassCastException, NullPointerException { - FileOutputStream file = new FileOutputStream(mPwdPath); - mPwdStore.store(file, PASSWORD_WRITER_HEADER); - file.close(); + FileOutputStream file = null; + try { + file = new FileOutputStream(mPwdPath); + mPwdStore.store(file, PASSWORD_WRITER_HEADER); + } finally { + if (file != null) { + file.close(); + } + } } } diff --git a/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java index 3a75097ec..d4de53bca 100644 --- a/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java +++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java @@ -37,9 +37,15 @@ public class PlainPasswordReader implements IPasswordReader { mPwdPath = pwdPath; mPwdStore = new Properties(); - FileInputStream file = new FileInputStream(mPwdPath); - mPwdStore.load(file); - file.close(); + FileInputStream file = null; + try { + file = new FileInputStream(mPwdPath); + mPwdStore.load(file); + } finally { + if (file != null) { + file.close(); + } + } } public String getPassword(String tag) { diff --git a/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java index 3ceac4bd6..0965b7b31 100644 --- a/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java +++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java @@ -37,9 +37,15 @@ public class PlainPasswordWriter implements IPasswordWriter { mPwdPath = pwdPath; mPwdStore = new Properties(); - FileInputStream file = new FileInputStream(mPwdPath); - mPwdStore.load(file); - file.close(); + FileInputStream file = null; + try { + file = new FileInputStream(mPwdPath); + mPwdStore.load(file); + } finally { + if (file != null) { + file.close(); + } + } } public Object putPassword(String tag, String password) { @@ -48,9 +54,13 @@ public class PlainPasswordWriter implements IPasswordWriter { public void commit() throws IOException, ClassCastException, NullPointerException { - FileOutputStream file = new FileOutputStream(mPwdPath); - mPwdStore.store(file, PASSWORD_WRITER_HEADER); - file.close(); + FileOutputStream file = null; + try { + file = new FileOutputStream(mPwdPath); + mPwdStore.store(file, PASSWORD_WRITER_HEADER); + } finally { + if (file != null) + file.close(); + } } - } |