Author: norman
Date: Thu Oct 6 06:31:16 2011
New Revision: 1179518
URL: http://svn.apache.org/viewvc?rev=1179518&view=rev
Log:
Remove batchSize parameter from MessageManager.getMessages(...). See MAILBOX-148
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1179518&r1=1179517&r2=1179518&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Thu Oct 6 06:31:16 2011
@@ -137,7 +137,7 @@ abstract public class AbstractStorageQuo
List<MailboxMetaData> mList = manager.search(new
MailboxQuery(MailboxPath.inbox(session), "", session.getPathDelimiter()),
session);
for (int i = 0; i < mList.size(); i++) {
MessageManager mailbox =
manager.getMailbox(mList.get(i).getPath(), session);
- Iterator<MessageResult> results =
mailbox.getMessages(MessageRange.all(), FetchGroupImpl.MINIMAL, -1, session);
+ Iterator<MessageResult> results =
mailbox.getMessages(MessageRange.all(), FetchGroupImpl.MINIMAL, session);
while (results.hasNext()) {
size += results.next().getSize();
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=1179518&r1=1179517&r2=1179518&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
Thu Oct 6 06:31:16 2011
@@ -83,7 +83,7 @@ public class RetrCmdHandler implements C
MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
- Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP, -1,
mailboxSession);
+ Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP,
mailboxSession);
if (results.hasNext()) {
MessageResult result = results.next();
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=1179518&r1=1179517&r2=1179518&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
Thu Oct 6 06:31:16 2011
@@ -82,7 +82,7 @@ public class RsetCmdHandler implements C
MailboxSession mailboxSession = (MailboxSession)
session.getState().get(POP3Session.MAILBOX_SESSION);
List<MessageMetaData> uids = new ArrayList<MessageMetaData>();
- Iterator<MessageResult> it =
session.getUserMailbox().getMessages(MessageRange.all(), GROUP, -1,
mailboxSession);
+ Iterator<MessageResult> it =
session.getUserMailbox().getMessages(MessageRange.all(), GROUP, mailboxSession);
while (it.hasNext()) {
MessageResult result = it.next();
uids.add(new MessageMetaData(result.getUid(),
result.getSize()));
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=1179518&r1=1179517&r2=1179518&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
Thu Oct 6 06:31:16 2011
@@ -106,7 +106,7 @@ public class TopCmdHandler extends RetrC
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
- Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP, -1,
mailboxSession);
+ Iterator<MessageResult> results =
session.getUserMailbox().getMessages(MessageRange.one(uid), GROUP,
mailboxSession);
if (results.hasNext()) {
MessageResult result = results.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
