3 files changed, 9 insertions, 10 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
index 6a5cb1abc..0e252f523 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
+++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
@@ -30,7 +30,6 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java
index e78ff0daf..b23e6fff4 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java
+++ b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java
@@ -354,7 +354,7 @@ public class RequestQueue
 
     }
 
-    protected Enumeration getRawList() {
+    protected Enumeration<RequestId> getRawList() {
         IDBSearchResults results = null;
         IDBSSession dbs = null;
 
@@ -517,7 +517,7 @@ public class RequestQueue
     public IRequestVirtualList
             getPagedRequestsByFilter(RequestId from, boolean jumpToEnd, String filter, int pageSize,
                     String sortKey) {
-        IDBVirtualList results = null;
+        IDBVirtualList<Object> results = null;
         IDBSSession dbs = null;
 
         try {
@@ -633,7 +633,7 @@ class SearchEnumeration
         return mResults.hasMoreElements();
     }
 
-    public Object nextElement() {
+    public RequestId nextElement() {
         return nextRequestId();
     }
 
@@ -699,11 +699,11 @@ class ListEnumeration
 
     }
 
-    ListEnumeration(RequestQueue queue, IDBVirtualList list) {
+    ListEnumeration(RequestQueue queue, IDBVirtualList<Object> list) {
         mQueue = queue;
         mList = list;
     }
 
     protected RequestQueue mQueue;
-    protected IDBVirtualList mList;
+    protected IDBVirtualList<Object> mList;
 }
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java
index 92c162ca8..0a4a4ebf9 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java
@@ -18,12 +18,12 @@
 package com.netscape.cmscore.request;
 
 import java.math.BigInteger;
-import java.util.Enumeration;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.dbs.EDBException;
 import com.netscape.certsrv.dbs.IDBSSession;
+import com.netscape.certsrv.dbs.IDBSearchResults;
 import com.netscape.certsrv.dbs.IDBSubsystem;
 import com.netscape.certsrv.dbs.Modification;
 import com.netscape.certsrv.dbs.ModificationSet;
@@ -109,10 +109,10 @@ class RequestRepository
     public void removeAllObjects() throws EBaseException {
         IDBSSession s = mDB.createSession();
         try {
-            Enumeration e = s.search(getBaseDN(),
+            IDBSearchResults sr = s.search(getBaseDN(),
                                "(" + RequestRecord.ATTR_REQUEST_ID + "=*)");
-            while (e.hasMoreElements()) {
-                RequestRecord r = (RequestRecord) e.nextElement();
+            while (sr.hasMoreElements()) {
+                RequestRecord r = (RequestRecord) sr.nextElement();
                 String name = "cn" + "=" +
                         r.getRequestId().toString() + "," + getBaseDN();
                 s.delete(name);