Refactored additional line concatenation.

The code that concatenates lines has been simplified using
String.replace().

Change-Id: Id376f089cb9b8a78cfd9b3fb922e9cd9055c0e74

2 files changed, 9 insertions, 29 deletions

diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
index 381fee8ea..a200c342f 100644
--- a/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -24,7 +24,6 @@ import java.security.InvalidKeyException;
 import java.security.PublicKey;
 import java.security.cert.CertificateException;
 import java.util.Arrays;
-import java.util.StringTokenizer;
 import java.util.Vector;
 
 import org.mozilla.jss.asn1.ASN1Util;
@@ -917,7 +916,7 @@ public class EnrollmentService implements IService {
             return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         }
 
-        StringBuffer key = new StringBuffer();
+        String key = "";
 
         // convert "rawData" into "base64Data"
         if (rawData != null) {
@@ -925,13 +924,10 @@ public class EnrollmentService implements IService {
 
             base64Data = CMS.BtoA(rawData).trim();
 
-            // extract all line separators from the "base64Data"
-            StringTokenizer st = new StringTokenizer(base64Data, "\r\n");
-            while (st.hasMoreTokens()) {
-                key.append(st.nextToken());
-            }
+            // concatenate lines
+            key = base64Data.replace("\r", "").replace("\n", "");
         }
-        String checkKey = key.toString().trim();
+        String checkKey = key.trim();
         if (checkKey.equals("")) {
             return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         } else {
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index 1df04db1b..ec920e682 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
@@ -136,7 +136,6 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
     public IRequestListener mReqInQListener = null;
 
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
     private final static String SIGNED_AUDIT_AGENT_DELIMITER = ", ";
     /**
      * Constructs an escrow authority.
@@ -1713,16 +1712,9 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
         // convert "rawData" into "base64Data"
         if (rawData != null) {
             String base64Data = CMS.BtoA(rawData).trim();
-            StringBuffer key = new StringBuffer();
 
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    key.append(base64Data.substring(i, i));
-                }
-            }
-
-            return key.toString();
+            // concatenate lines
+            return base64Data.replace("\r", "").replace("\n", "");
         }
 
         return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
@@ -1757,23 +1749,15 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
         }
 
         String key = null;
-        StringBuffer tempBuffer = new StringBuffer();
+
         // convert "rawData" into "base64Data"
         if (rawData != null) {
             String base64Data = null;
 
             base64Data = CMS.BtoA(rawData).trim();
 
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    tempBuffer.append(base64Data.substring(i, i));
-                }
-            }
-        }
-
-        if (tempBuffer.length() > 0) {
-            key = tempBuffer.toString();
+            // concatenate lines
+            key = base64Data.replace("\r", "").replace("\n", "");
         }
 
         if (key != null) {