[cvs] expresso commit by lhamel: use searchAndRetrieveList()

[JCorporate Ltd]

Log Message:
-----------
use searchAndRetrieveList()

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job:
        ClearOldValidation.java

Revision Data
-------------
Index: ClearOldValidation.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java
@@ -63,13 +63,12 @@
  */
 package com.jcorporate.expresso.services.job;
 
-import java.util.ArrayList;
-
-import org.apache.log4j.Logger;
-
-import com.jcorporate.expresso.core.db.DBConnection;
 import com.jcorporate.expresso.core.security.SuperUser;
 import com.jcorporate.expresso.services.dbobj.ValidationQueue;
+import org.apache.log4j.Logger;
+
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * This job clears all expired validation queue entries.  It is typically run
@@ -120,25 +119,20 @@
 
             ValidationQueue vq = new ValidationQueue(SuperUser.INSTANCE);
             vq.setDataContext(this.getDataContext());
-            ArrayList al = new ArrayList();
-            DBConnection connection = vq.createAndExecuteSearch(al);
-
-            ValidationQueue oneEntry = new ValidationQueue(SuperUser.INSTANCE);
-            oneEntry.setDataContext(this.getDataContext());
-            while (connection.next()) {
-                oneEntry.clear();
-                vq.loadFromConnection(oneEntry, connection, al);
-                if (oneEntry.isExpired()) {
+            List list = vq.searchAndRetrieveList();
+            for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+                ValidationQueue queue = (ValidationQueue) iterator.next();
+                if (queue.isExpired()) {
                     if (log.isDebugEnabled()) {
                         log.debug("Deleting validation entry: " + vq.getKey());
                     }
 
-                    oneEntry.delete(true);
+                    queue.delete(true);
                     recordsDeleted++;
                 }
             }
 
-            finish("Validation Queue Clearance Complete.\n\n\t+ " + recordsDeleted
+            finish("Validation Queue Clearance Complete.\n\n\t " + recordsDeleted
                     + " expired validation entries were deleted.");
         } catch (Throwable t) {
             log.error("Caught exception finishing job " + THIS_CLASS, t);