Refactored additional line concatenation.

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

Change-Id: Id376f089cb9b8a78cfd9b3fb922e9cd9055c0e74

1 files changed, 2 insertions, 9 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 229c3779a..e5a1474a0 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -105,7 +105,6 @@ public final class CMSAdminServlet extends AdminServlet {
     private final static String PROP_INTERNAL_DB = "internaldb";
 
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
 
     // CMS must be instantiated before this admin servlet.
 
@@ -3390,7 +3389,6 @@ public final class CMSAdminServlet extends AdminServlet {
         rawData = object.getPublic().getEncoded();
 
         String key = null;
-        StringBuffer sb = new StringBuffer();
 
         // convert "rawData" into "base64Data"
         if (rawData != null) {
@@ -3398,14 +3396,9 @@ public final class CMSAdminServlet extends AdminServlet {
 
             base64Data = Utils.base64encode(rawData).trim();
 
-            // extract all line separators from the "base64Data"
-            for (int i = 0; i < base64Data.length(); i++) {
-                if (base64Data.substring(i, i).getBytes() != EOL) {
-                    sb.append(base64Data.substring(i, i));
-                }
-            }
+            // concatenate lines
+            key = base64Data.replace("\r", "").replace("\n", "");
         }
-        key = sb.toString();
 
         if (key != null) {
             key = key.trim();