diff options
Diffstat (limited to 'base/util/src/com')
4 files changed, 64 insertions, 24 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(); + } } - } diff --git a/base/util/src/com/netscape/cmsutil/util/Utils.java b/base/util/src/com/netscape/cmsutil/util/Utils.java index 75e63f2b0..c8d6b438d 100644 --- a/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -17,8 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.util; -import org.apache.commons.codec.binary.Base64; - import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -36,6 +34,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Vector; +import org.apache.commons.codec.binary.Base64; + public class Utils { /** * Checks if this is NT. @@ -152,10 +152,12 @@ public class Utils { InetAddress.getByName(hostname); } - public static void copy(String orig, String dest) { + public static void copy(String orig, String dest) throws Exception { + BufferedReader in = null; + PrintWriter out = null; try { - BufferedReader in = new BufferedReader(new FileReader(orig)); - PrintWriter out = new PrintWriter( + in = new BufferedReader(new FileReader(orig)); + out = new PrintWriter( new BufferedWriter(new FileWriter(dest))); String line = ""; while (in.ready()) { @@ -163,9 +165,20 @@ public class Utils { if (line != null) out.println(line); } - in.close(); - out.close(); } catch (Exception ee) { + ee.printStackTrace(); + throw ee; + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (out != null) { + out.close(); + } } } |