From a4db0f39e257950a5c89203452c1184c7080e5bd Mon Sep 17 00:00:00 2001 From: Abhishek Koneru 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 --- base/java-tools/src/com/netscape/cmstools/AtoB.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/CMCEnroll.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/CMCRequest.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/CMCRevoke.java | 6 +++--- base/java-tools/src/com/netscape/cmstools/DRMTool.java | 4 ++-- base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java | 10 +++++----- base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java | 10 +++++----- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'base/java-tools/src/com/netscape/cmstools') diff --git a/base/java-tools/src/com/netscape/cmstools/AtoB.java b/base/java-tools/src/com/netscape/cmstools/AtoB.java index fe743fc5c..e3059b0d1 100644 --- a/base/java-tools/src/com/netscape/cmstools/AtoB.java +++ b/base/java-tools/src/com/netscape/cmstools/AtoB.java @@ -60,8 +60,8 @@ public class AtoB { public static void main(String argv[]) { BufferedReader inputBlob = null; - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; byte binaryBASE64Blob[] = null; FileOutputStream outputBlob = null; diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index bed5d8334..ba8d71f3d 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -393,8 +393,8 @@ public class CMCEnroll { // blob into a String() object throwing away any // headers beginning with HEADER and any trailers beginning // with TRAILER - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; try { while ((asciiBASE64BlobChunk = inputBlob.readLine()) != null) { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index f2205ed5c..e46b746aa 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -1005,8 +1005,8 @@ public class CMCRequest { // blob into a String() object throwing away any // headers beginning with HEADER and any trailers beginning // with TRAILER - String asciiBASE64BlobChunk = new String(); - String asciiBASE64Blob = new String(); + String asciiBASE64BlobChunk = ""; + String asciiBASE64Blob = ""; try { while ((asciiBASE64BlobChunk = inputBlob.readLine()) != null) { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java index 8dffa13e3..d76e93a52 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java @@ -82,7 +82,7 @@ public class CMCRevoke { if (s.startsWith("\"") && s.endsWith("\"")) return s.substring(1, s.length() - 2); else if (s.startsWith("\'") && s.endsWith("\'")) - return new String(s.substring(1, s.length() - 2)); + return s.substring(1, s.length() - 2); else return s; } @@ -140,7 +140,7 @@ public class CMCRevoke { } // optional parameter if (cValue == null) - cValue = new String(); + cValue = ""; if (dValue == null || nValue == null || iValue == null || sValue == null || mValue == null || hValue == null) bWrongParam = true; @@ -280,7 +280,7 @@ public class CMCRevoke { SignerIdentifier si = null; ContentInfo fullEnrollmentReq = null; String tokenname = "internal"; - String asciiBASE64Blob = new String(); + String asciiBASE64Blob = ""; try { diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java index c6b2c575f..f67d735e6 100644 --- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -1445,8 +1445,8 @@ public class DRMTool { */ private static PublicKey getPublicKey() { BufferedReader inputCert = null; - String encodedBASE64CertChunk = new String(); - String encodedBASE64Cert = new String(); + String encodedBASE64CertChunk = ""; + String encodedBASE64Cert = ""; byte decodedBASE64Cert[] = null; X509CertImpl cert = null; PublicKey key = null; diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java index 88d8cb05b..fdb988dd5 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java @@ -27,8 +27,6 @@ import java.io.InputStreamReader; import java.security.cert.CertificateException; import java.util.Locale; -import com.netscape.cmsutil.util.Utils; - import netscape.security.util.CertPrettyPrint; import netscape.security.x509.CertificateSubjectName; import netscape.security.x509.RDN; @@ -36,6 +34,8 @@ import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509CertInfo; +import com.netscape.cmsutil.util.Utils; + /** * The PrettyPrintCert class is a utility program designed to "pretty print" * a certificate. It assumes that the name of a data file is passed to the @@ -79,13 +79,13 @@ public class PrettyPrintCert { public static void main(String argv[]) { BufferedReader inputCert = null; - String encodedBASE64CertChunk = new String(); - String encodedBASE64Cert = new String(); + String encodedBASE64CertChunk = ""; + String encodedBASE64Cert = ""; byte decodedBASE64Cert[] = null; X509CertImpl cert = null; Locale aLocale = null; CertPrettyPrint certDetails = null; - String pp = new String(); + String pp = ""; FileOutputStream outputCert = null; boolean mSimpleInfo = false; String inputfile = null; diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java index 6bb43aee7..8bd4f9ed5 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java @@ -28,8 +28,6 @@ import java.security.cert.CRLException; import java.security.cert.CertificateException; import java.util.Locale; -import com.netscape.cmsutil.util.Utils; - import netscape.security.util.CrlPrettyPrint; import netscape.security.x509.DeltaCRLIndicatorExtension; import netscape.security.x509.HoldInstructionExtension; @@ -39,6 +37,8 @@ import netscape.security.x509.OIDMap; import netscape.security.x509.X509CRLImpl; import netscape.security.x509.X509ExtensionException; +import com.netscape.cmsutil.util.Utils; + /** * The PrettyPrintCrl class is a utility program designed to "pretty print" * a CRL. It assumes that the name of a data file is passed to the @@ -72,13 +72,13 @@ public class PrettyPrintCrl { public static void main(String argv[]) { BufferedReader inputCrl = null; - String encodedBASE64CrlChunk = new String(); - String encodedBASE64Crl = new String(); + String encodedBASE64CrlChunk = ""; + String encodedBASE64Crl = ""; byte decodedBASE64Crl[] = null; X509CRLImpl crl = null; Locale aLocale = null; CrlPrettyPrint CrlDetails = null; - String pp = new String(); + String pp = ""; FileOutputStream outputCrl = null; // (1) Check that at least one argument was submitted to the program -- cgit