1 files changed, 7 insertions, 15 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index c9e36585e..1e123b17a 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -442,11 +442,11 @@ class PWsdrCache {
      */
     public void addEntry(String tag, String pwd, Hashtable<String, String> tagPwds) throws IOException {
         System.out.println("PWsdrCache: in addEntry");
-        String stringToAdd = null;
+        StringBuffer stringToAdd = new StringBuffer();
         String bufs = null;
 
         if (tagPwds == null) {
-            stringToAdd = tag + ":" + pwd + "\n";
+            stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
         } else {
             Enumeration<String> enum1 = tagPwds.keys();
 
@@ -455,11 +455,7 @@ class PWsdrCache {
                 pwd = tagPwds.get(tag);
                 debug("password tag: " + tag + " stored in " + mPWcachedb);
 
-                if (stringToAdd == null) {
-                    stringToAdd = tag + ":" + pwd + "\n";
-                } else {
-                    stringToAdd += tag + ":" + pwd + "\n";
-                }
+                stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
             }
         }
 
@@ -480,7 +476,7 @@ class PWsdrCache {
             bufs = hashtable2String(ht);
         } else {
             debug("adding new tag: " + tag);
-            bufs = stringToAdd;
+            bufs = stringToAdd.toString();
         }
 
         // write update to cache
@@ -671,19 +667,15 @@ class PWsdrCache {
 
     public String hashtable2String(Hashtable<String, String> ht) {
         Enumeration<String> enum1 = ht.keys();
-        String returnString = null;
+        StringBuffer returnString = new StringBuffer();
 
         while (enum1.hasMoreElements()) {
             String tag = enum1.nextElement();
             String pwd = ht.get(tag);
+            returnString.append(tag + ":" + pwd + System.getProperty("line.separator"));
 
-            if (returnString == null) {
-                returnString = tag + ":" + pwd + "\n";
-            } else {
-                returnString += tag + ":" + pwd + "\n";
-            }
         }
-        return returnString;
+        return returnString.toString();
     }
 
     public Hashtable<String, String> string2Hashtable(String cache) {