3 files changed, 6 insertions, 7 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
index d8b298126..7078c3440 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
@@ -28,17 +28,17 @@ import netscape.security.x509.X509CertImpl;
  * @author kanda
  * @version $Revision$, $Date$
  */
-public class CertDateCompare implements Comparator {
+public class CertDateCompare implements Comparator<X509CertImpl> {
     public CertDateCompare() {
     }
 
-    public int compare(Object cert1, Object cert2) {
+    public int compare(X509CertImpl cert1, X509CertImpl cert2) {
         Date d1 = null;
         Date d2 = null;
 
         try {
-            d1 = ((X509CertImpl) cert1).getNotAfter();
-            d2 = ((X509CertImpl) cert2).getNotAfter();
+            d1 = cert1.getNotAfter();
+            d2 = cert2.getNotAfter();
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
index 12965a52e..a5c6fec90 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
@@ -1001,7 +1001,6 @@ public class CertUtils {
     public static boolean verifySystemCerts() {
         String auditMessage = null;
         IConfigStore config = CMS.getConfigStore();
-        String certlsit = "";
         boolean verifyResult = true;
         boolean r = true; /* the final return value */
         try {
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
index 89a229216..de5e233c9 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
@@ -227,7 +227,7 @@ public class X500NameSubsystem implements ISubsystem {
     private static String BMPSTRING = "BMPString";
     private static String UNIVERSALSTRING = "UniversalString";
     private static String UFT8STRING = "UTF8String";
-    private static Hashtable mDerStr2TagHash = new Hashtable();
+    private static Hashtable<String, Byte> mDerStr2TagHash = new Hashtable<String, Byte>();
 
     static {
         mDerStr2TagHash.put(
@@ -249,7 +249,7 @@ public class X500NameSubsystem implements ISubsystem {
     private byte derStr2Tag(String s) {
         if (s == null || s.length() == 0)
             throw new IllegalArgumentException();
-        Byte tag = (Byte) mDerStr2TagHash.get(s);
+        Byte tag = mDerStr2TagHash.get(s);
 
         if (tag == null)
             throw new IllegalArgumentException();