Author: wstrzalka
Date: Wed Apr 13 22:27:04 2011
New Revision: 1091964
URL: http://svn.apache.org/viewvc?rev=1091964&view=rev
Log:
small fixes to recent EXPUNGE improvements
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java?rev=1091964&r1=1091963&r2=1091964&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
Wed Apr 13 22:27:04 2011
@@ -177,19 +177,19 @@ public class JPAMessageMapper extends JP
}
private int deleteDeletedMessagesInMailboxAfterUID(Mailbox<Long> mailbox,
long uid) {
- return
getEntityManager().createNamedQuery("findDeletedMessagesInMailboxAfterUID")
+ return
getEntityManager().createNamedQuery("deleteDeletedMessagesInMailboxAfterUID")
.setParameter("idParam", mailbox.getMailboxId())
.setParameter("uidParam", uid).executeUpdate();
}
private int deleteDeletedMessagesInMailboxWithUID(Mailbox<Long> mailbox,
long uid) {
- return
getEntityManager().createNamedQuery("findDeletedMessagesInMailboxWithUID")
+ return
getEntityManager().createNamedQuery("deleteDeletedMessagesInMailboxWithUID")
.setParameter("idParam", mailbox.getMailboxId())
.setParameter("uidParam", uid).setMaxResults(1).executeUpdate();
}
private int deleteDeletedMessagesInMailboxBetweenUIDs(Mailbox<Long>
mailbox, long from, long to) {
- return
getEntityManager().createNamedQuery("findDeletedMessagesInMailboxBetweenUIDs")
+ return
getEntityManager().createNamedQuery("deleteDeletedMessagesInMailboxBetweenUIDs")
.setParameter("idParam", mailbox.getMailboxId())
.setParameter("fromParam", from)
.setParameter("toParam", to).executeUpdate();
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1091964&r1=1091963&r2=1091964&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Wed Apr 13 22:27:04 2011
@@ -554,7 +554,7 @@ public abstract class StoreMessageManage
return messageMapper.execute(new Mapper.Transaction<Iterator<Long>>() {
public Iterator<Long> run() throws MailboxException {
- return
messageMapper.deleteMarkedForDeletionInMailbox(getMailboxEntity(), range);
+ return
messageMapper.expungeMarkedForDeletionInMailbox(getMailboxEntity(), range);
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
