Fixes for Coverity issues of type Stringbuffer, NO_EQUALS_METHOD , REVERSE_INULL,Wrong_Map_Iterators

7 files changed, 90 insertions, 49 deletions

diff --git a/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
index 0f95ad2e3..30491cdd0 100644
--- a/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
+++ b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
@@ -18,6 +18,7 @@
 package com.netscape.certsrv.common;
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
@@ -43,12 +44,11 @@ public class NameValuePairs extends LinkedHashMap<String, String> {
      * @return string representation
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
-        for (String name : keySet()) {
-            String value = get(name);
+        for (Map.Entry<String, String> entry : entrySet()) {
 
-            buf.append(name + "=" + value);
+            buf.append(String.format("%s=%s", entry.getKey(), entry.getValue()));
             buf.append("\n");
         }
 
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
index 527b4f694..c1ec27a8c 100644
--- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
+++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
@@ -453,4 +453,30 @@ public class SimpleProperties extends Hashtable<String, String> {
             h.put(key, get(key));
         }
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((defaults == null) ? 0 : defaults.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        SimpleProperties other = (SimpleProperties) obj;
+        if (defaults == null) {
+            if (other.defaults != null)
+                return false;
+        } else if (!defaults.equals(other.defaults))
+            return false;
+        return true;
+    }
+
 }
diff --git a/base/common/src/com/netscape/cmscore/logging/Auditor.java b/base/common/src/com/netscape/cmscore/logging/Auditor.java
index eef4ad14b..f0bcb5bee 100644
--- a/base/common/src/com/netscape/cmscore/logging/Auditor.java
+++ b/base/common/src/com/netscape/cmscore/logging/Auditor.java
@@ -18,9 +18,7 @@
 
 package com.netscape.cmscore.logging;
 
-import java.util.Collection;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.Map;
 
 import com.netscape.certsrv.apps.CMS;
@@ -98,62 +96,62 @@ public class Auditor implements IAuditor {
 
         // if no signed audit object exists, bail
         if (signedAuditLogger == null) return null;
-
-        String parameters = SIGNED_AUDIT_EMPTY_NAME_VALUE_PAIR;
+        StringBuilder parameters = new StringBuilder();
 
         // always identify the scope of the request
         if (scope != null) {
-            parameters = SIGNED_AUDIT_SCOPE
+            parameters.append(SIGNED_AUDIT_SCOPE
                     + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                    + scope;
+                    + scope);
+        } else {
+            parameters.append(SIGNED_AUDIT_EMPTY_NAME_VALUE_PAIR);
         }
 
         // identify the operation type of the request
         if (type != null) {
-            parameters += SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER;
+            parameters.append(SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER);
 
-            parameters += SIGNED_AUDIT_OPERATION
+            parameters.append(SIGNED_AUDIT_OPERATION
                     + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                    + type;
+                    + type);
         }
 
         // identify the resource type of the request
         if (id != null) {
-            parameters += SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER;
+            parameters.append(SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER);
 
-            parameters += SIGNED_AUDIT_RESOURCE
+            parameters.append(SIGNED_AUDIT_RESOURCE
                     + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                    + id;
+                    + id);
         }
 
-        if (params == null) return parameters;
+        if (params == null) return parameters.toString();
 
         // identify any remaining request parameters
-        Collection<String> names = params.keySet();
 
-        for (Iterator<String> i = names.iterator(); i.hasNext(); ) {
-            String name = i.next();
+        for (Map.Entry<String,String> entry : params.entrySet() ) {
+            String name = entry.getKey();
 
             // skip "RULENAME" parameter
             if (name.equals(SIGNED_AUDIT_RULENAME)) continue;
 
-            parameters += SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER;
+            parameters.append(SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER);
 
-            String value = params.get(name);
+            String value = entry.getValue();
 
             if (value == null) {
-                parameters += name
+                parameters.append(name
                         + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                        + ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+                        + ILogger.SIGNED_AUDIT_EMPTY_VALUE);
                 continue;
             }
 
             value = value.trim();
 
             if (value.equals("")) {
-                parameters += name
+                parameters.append(name
                         + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                        + ILogger.SIGNED_AUDIT_EMPTY_VALUE;
+                        + ILogger.SIGNED_AUDIT_EMPTY_VALUE);
                 continue;
             }
 
@@ -182,19 +180,19 @@ public class Auditor implements IAuditor {
                     name.equals(Constants.PR_TOKEN_PASSWD)) {
 
                 // hide password value
-                parameters += name
-                            + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                            + SIGNED_AUDIT_PASSWORD_VALUE;
+                parameters.append(name
+                        + SIGNED_AUDIT_NAME_VALUE_DELIMITER
+                        + SIGNED_AUDIT_PASSWORD_VALUE);
 
             } else {
                 // process normally
-                parameters += name
-                            + SIGNED_AUDIT_NAME_VALUE_DELIMITER
-                            + value;
+                parameters.append(name
+                        + SIGNED_AUDIT_NAME_VALUE_DELIMITER
+                        + value);
             }
         }
 
-        return parameters;
+        return parameters.toString();
     }
 
     @Override
diff --git a/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/common/src/com/netscape/cmscore/realm/ACL.java
index 6c06c92c1..13fcdac44 100644
--- a/base/common/src/com/netscape/cmscore/realm/ACL.java
+++ b/base/common/src/com/netscape/cmscore/realm/ACL.java
@@ -150,15 +150,15 @@ public class ACL  {
      *         <resource name>[<ACLEntry1>,<ACLEntry 2>,...<ACLEntry N>]
      */
     public String toString() {
-        String entries = "";
+        StringBuilder entries = new StringBuilder();
         Enumeration<ACLEntry> e = entries();
 
         for (; e.hasMoreElements();) {
             ACLEntry entry = e.nextElement();
 
-            entries += entry.toString();
+            entries.append(entry);
             if (e.hasMoreElements())
-                entries += ",";
+                entries.append(",");
         }
         return getName() + "[" + entries + "]";
     }
diff --git a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
index abd27fddf..0576bcf58 100644
--- a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
+++ b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
@@ -869,9 +869,6 @@ public class PKIJNDIRealm extends JNDIRealm {
     private synchronized void loadAuthzProperties(Context context) {
 
         if (authzProperties == null && context != null) {
-            ClassLoader loader = this.getClass().getClassLoader();
-            if (loader == null)
-                loader = ClassLoader.getSystemClassLoader();
 
             InputStream inputStream = context.getServletContext().getResourceAsStream(PROP_AUTH_FILE_PATH);
 
diff --git a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
index b7bd43793..317b8e56c 100644
--- a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
+++ b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
@@ -1,9 +1,7 @@
 package com.netscape.cmscore.request;
 
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Subclass of Hashtable returned by IRequest.getExtDataInHashtable. Its
@@ -56,14 +54,6 @@ public class ExtDataHashtable<V> extends Hashtable<String, V> {
         return super.put(oKey.toLowerCase(), val);
     }
 
-    public void putAll(Map<? extends String, ? extends V> map) {
-        Set<? extends String> keys = map.keySet();
-        for (Iterator<? extends String> i = keys.iterator(); i.hasNext();) {
-            Object key = i.next();
-            put((String) key, map.get(key));
-        }
-    }
-
     public V remove(Object o) {
         if (o instanceof String) {
             String key = (String) o;
diff --git a/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java
index 0e98ab084..7a655fd08 100644
--- a/base/common/test/com/netscape/cmscore/request/RequestTest.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java
@@ -631,6 +631,36 @@ public class RequestTest extends CMSBaseTestCase {
             getEncodedCalled = true;
             return new byte[] {};
         }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = super.hashCode();
+            result = prime * result + getOuterType().hashCode();
+            result = prime * result + (getEncodedCalled ? 1231 : 1237);
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj))
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            X509CertInfoStub other = (X509CertInfoStub) obj;
+            if (!getOuterType().equals(other.getOuterType()))
+                return false;
+            if (getEncodedCalled != other.getEncodedCalled)
+                return false;
+            return true;
+        }
+
+        private RequestTest getOuterType() {
+            return RequestTest.this;
+        }
+
     }
 
     class RevokedCertImplStub extends RevokedCertImpl {