Fixes for Coverity Defects of Category : FB.SBSC_USE_STRINGBUFFER_CONCATENATION --Remaining

3 files changed, 17 insertions, 15 deletions

diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
index 22400cf67..c881decdf 100644
--- a/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -834,7 +834,7 @@ public class EnrollmentService implements IService {
             return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         }
 
-        String key = "";
+        StringBuffer key = new StringBuffer();
 
         // convert "rawData" into "base64Data"
         if (rawData != null) {
@@ -845,16 +845,14 @@ public class EnrollmentService implements IService {
             // extract all line separators from the "base64Data"
             StringTokenizer st = new StringTokenizer(base64Data, "\r\n");
             while (st.hasMoreTokens()) {
-                key += st.nextToken();
+                key.append(st.nextToken());
             }
         }
-
-        key = key.trim();
-
-        if (key.equals("")) {
+        String checkKey = key.toString().trim();
+        if (checkKey.equals("")) {
             return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         } else {
-            return key;
+            return checkKey;
         }
     }
 
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index 6579261f6..8aebebad0 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
@@ -1666,16 +1666,16 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
         // convert "rawData" into "base64Data"
         if (rawData != null) {
             String base64Data = CMS.BtoA(rawData).trim();
-            String key = "";
+            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 += base64Data.substring(i, i);
+                    key.append(base64Data.substring(i, i));
                 }
             }
 
-            return key;
+            return key.toString();
         }
 
         return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
@@ -1710,7 +1710,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
         }
 
         String key = null;
-
+        StringBuffer tempBuffer = new StringBuffer();
         // convert "rawData" into "base64Data"
         if (rawData != null) {
             String base64Data = null;
@@ -1720,11 +1720,15 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
             // extract all line separators from the "base64Data"
             for (int i = 0; i < base64Data.length(); i++) {
                 if (base64Data.substring(i, i).getBytes() != EOL) {
-                    key += base64Data.substring(i, i);
+                    tempBuffer.append(base64Data.substring(i, i));
                 }
             }
         }
 
+        if (tempBuffer.length() > 0) {
+            key = tempBuffer.toString();
+        }
+
         if (key != null) {
             key = key.trim();
 
diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
index 30a23594c..2d53552a0 100644
--- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
+++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
@@ -125,7 +125,7 @@ public class TokenKeyRecoveryService implements IService {
     }
 
     public static String normalizeCertStr(String s) {
-        String val = "";
+        StringBuffer val = new StringBuffer();
 
         for (int i = 0; i < s.length(); i++) {
             if (s.charAt(i) == '\\') {
@@ -139,9 +139,9 @@ public class TokenKeyRecoveryService implements IService {
             } else if (s.charAt(i) == ' ') {
                 continue;
             }
-            val += s.charAt(i);
+            val.append(s.charAt(i));
         }
-        return val;
+        return val.toString();
     }
 
     private static String base64Encode(byte[] bytes) throws IOException {