From a4db0f39e257950a5c89203452c1184c7080e5bd Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Fri, 18 May 2012 13:17:34 -0400
Subject: Fixes for Coverity Defects of Category : FB.DM_NUMBER_CTOR,
 FB.DM_STRING_CTOR, FB.DM_STRING_VOID_CTOR

---
 .../netscape/pkisilent/argparser/ArgParser.java    |  2 +-
 .../netscape/pkisilent/common/CMSProperties.java   |  4 ++--
 .../com/netscape/pkisilent/common/TestClient.java  | 24 ++++++----------------
 3 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'base/silent')

diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
index d2791c1e2..29c1c394d 100755
--- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
@@ -1877,7 +1877,7 @@ public class ArgParser {
             ObjectHolder ndescHolder = new ObjectHolder();
             Record rec = getRecord(args[idx], ndescHolder);
             if (rec == null || (rec.convertCode == 'h' && !helpOptionsEnabled)) { // didn't match
-                unmatchedArg = new String(args[idx]);
+                unmatchedArg = args[idx];
                 return idx + 1;
             }
             NameDesc ndesc = (NameDesc) ndescHolder.value;
diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
index 241d13f06..16f18500c 100644
--- a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
@@ -215,7 +215,7 @@ class CMSProperties extends Hashtable<String, String> {
                         String nextLine = in.readLine();
 
                         if (nextLine == null) {
-                            nextLine = new String("");
+                            nextLine = "";
                         }
                         String loppedLine = line.substring(0, line.length() - 1);
                         // Advance beyond whitespace on new line
@@ -229,7 +229,7 @@ class CMSProperties extends Hashtable<String, String> {
                         }
                         nextLine = nextLine.substring(startIndex,
                                 nextLine.length());
-                        line = new String(loppedLine + nextLine);
+                        line = loppedLine + nextLine;
                     }
 
                     // Find start of key
diff --git a/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
index f3d96085d..22275ede5 100644
--- a/base/silent/src/com/netscape/pkisilent/common/TestClient.java
+++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
@@ -452,16 +452,6 @@ public class TestClient implements SSLCertificateApprovalCallback {
 
     }
 
-    /**
-     * returns a String representation of an interger
-     */
-    public String getString(int m) {
-        Integer x = new Integer(m);
-        String s = x.toString();
-
-        return s;
-    }
-
     /**
      * returns FreePort in this machine . Takes a parmater portnumber. For example getFreePort("4026").
      */
@@ -477,21 +467,19 @@ public class TestClient implements SSLCertificateApprovalCallback {
             p = ss1.getLocalPort();
             System.out.println("Obtained Free Port = " + p);
             ss1.close();
-            return (getString(p));
         } catch (Exception e) {
             System.out.println("Unable to get Free Port");
             e.printStackTrace();
             p = 0;
-            return (getString(p));
         }
-
+        return (String.valueOf(p));
         // This following method doesn't Always get a free port.
         // while (st) {
         // if(isSocketUnused(host,p) )
         // st=false;
         // p++;
         // }
-        // return (getString(p));
+        // return (String.valueOf(p));
 
     }
 
@@ -708,7 +696,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
          {System.out.println("CRMFClient : could not submit  request");}
 
 
-         checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(CrmfClient.getRequestId()),"false");
+         checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),String.valueOf(CrmfClient.getRequestId()),"false");
          cr.checkRequestStatus();
          System.out.println("Serial num " + cr.getSerialNumber());
          System.out.println("cert pack " + cr.getCert());
@@ -861,7 +849,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
          Request re = new Request (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority());
          re.setAgentCertName(t.GetAdminCertName());
          re.ListPendingRequests("2","70");
-         re.ApproveRequests(t.getString(ue.getRequestId()));
+         re.ApproveRequests(String.valueOf(ue.getRequestId()));
          */
 
         /*
@@ -872,7 +860,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
 
          /*
          // check request status and Revoke cert
-         checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(ue.getRequestId()),"false");
+         checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),String.valueOf(ue.getRequestId()),"false");
          checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),"1","false");
 
          cr.checkRequestStatus();
@@ -893,7 +881,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
          /*
 
          /*
-         Revoke rr = new Revoke (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority(),t.getString(cr.getSerialNumber()));
+         Revoke rr = new Revoke (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority(),String.valueOf(cr.getSerialNumber()));
          rr.revokeCerts();
          */
 
-- 
cgit