2 files changed, 9 insertions, 8 deletions

diff --git a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 2d6fe7d88..12bf8d95a 100644
--- a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -539,7 +539,7 @@ public final class JssSubsystem implements ICryptoSubsystem {
         if (tokenList.length()==0)
             return Constants.PR_INTERNAL_TOKEN;
         else
-            return tokenList.append(",").append(Constants.PR_INTERNAL_TOKEN).toString();
+            return tokenList.append("," + Constants.PR_INTERNAL_TOKEN).toString();
     }
 
     public boolean isTokenLoggedIn(String name) throws EBaseException {
@@ -610,9 +610,11 @@ public final class JssSubsystem implements ICryptoSubsystem {
                 for (int i = 0; i < list.length; i++) {
                     String nickname = list[i].getNickname();
 
-                    if (i > 0)
-                        certNames.append(",");
-                    certNames.append(nickname);
+                    if (certNames.length() < 1) {
+                        certNames.append(nickname);
+                    } else {
+                        certNames.append("," + nickname);
+                    }
                 }
             }
         } catch (TokenException e) {
diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
index e4e8a432b..17cc9f0a7 100644
--- a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
+++ b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
@@ -230,13 +230,12 @@ public class PWsdrCache {
      * add passwd in pwcache.
      */
     public void addEntry(String tag, String pwd, Hashtable<String, String> tagPwds) throws EBaseException {
-
         StringBuffer stringToAdd = new StringBuffer();
 
         String bufs = null;
 
         if (tagPwds == null) {
-            stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
+            stringToAdd.append(tag + ":" + pwd + "\n");
         } else {
             Enumeration<String> enum1 = tagPwds.keys();
 
@@ -245,7 +244,7 @@ public class PWsdrCache {
                 pwd = tagPwds.get(tag);
                 debug("password tag: " + tag + " stored in " + mPWcachedb);
 
-                stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
+                stringToAdd.append(tag + ":" + pwd + "\n");
             }
         }
 
@@ -438,7 +437,7 @@ public class PWsdrCache {
         while (enum1.hasMoreElements()) {
             String tag = enum1.nextElement();
             String pwd = ht.get(tag);
-            returnString.append(tag + ":" + pwd + System.getProperty("line.separator"));
+            returnString.append(tag + ":" + pwd + "\n");
         }
         return returnString.toString();
     }