[Amavisadmin-svn] SF.net SVN: amavisadmin: [27] amavisadmin/trunk/src/java/de/sreindl/ amavisadmin/jobs/RetentionCleanupJob.java

[<str...@us...>]

Revision: 27
          http://amavisadmin.svn.sourceforge.net/amavisadmin/?rev=27&view=rev
Author:   streindl
Date:     2007-01-18 11:53:33 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Fix for #1638910:
* Msgs already marked as deleted are not remarked again (performance)

Modified Paths:
--------------
    amavisadmin/trunk/src/java/de/sreindl/amavisadmin/jobs/RetentionCleanupJob.java

Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/jobs/RetentionCleanupJob.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/jobs/RetentionCleanupJob.java	2007-01-18 19:52:45 UTC (rev 26)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/jobs/RetentionCleanupJob.java	2007-01-18 19:53:33 UTC (rev 27)
@@ -66,8 +66,11 @@
         retentionDay.add(Calendar.DAY_OF_MONTH, -user.getRetention().intValue());
         log.debug("Retention will be run for everything before " + retentionDay.getTime());
         Session session = HibernateSessionFactory.getSession();
-        Query qry = session.createQuery("from MsgReceipient mr where mr.maddr.email = :email and (mr.rs IN ('v', ' ', 'R') or mr.msgs.content IN ('C', 's', 'T')) and mr.msgs.timeIso < :time_set");
-        //qry.setInteger("user_id", user.getId());
+        Query qry = session.createQuery("from MsgReceipient mr " +
+                "WHERE mr.maddr.email = :email " +
+                "  AND (mr.rs <> 'D') " +         // #1638910
+                "  AND (mr.rs IN ('v', ' ', 'R') OR mr.msgs.content IN ('C', 's', 'T')) " +
+                "  AND mr.msgs.timeIso < :time_set");
         qry.setString("email", user.getEmail());
         qry.setDate("time_set", retentionDay.getTime());
         Iterator i = qry.iterate();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.