Author: norman
Date: Mon May 30 19:07:18 2011
New Revision: 1129298
URL: http://svn.apache.org/viewvc?rev=1129298&view=rev
Log:
Fix possible NPE
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java?rev=1129298&r1=1129297&r2=1129298&view=diff
==============================================================================
---
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
(original)
+++
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
Mon May 30 19:07:18 2011
@@ -296,6 +296,7 @@ public abstract class AbstractMessageMap
} else {
+
final List<Message<Id>> hits = new ArrayList<Message<Id>>();
findInMailbox(mailbox, MessageRange.all(), new
MailboxMembershipCallback<Id>() {
@@ -311,7 +312,7 @@ public abstract class AbstractMessageMap
});
Collections.sort(hits);
- return new SearchQueryIterator(new Iterator<Message<?>>() {
+ Iterator<Message<?>> it = new Iterator<Message<?>>() {
final Iterator<Message<Id>> it = hits.iterator();
public boolean hasNext() {
return it.hasNext();
@@ -325,7 +326,13 @@ public abstract class AbstractMessageMap
it.remove();
}
- }, query, mailboxSession.getLog());
+ };
+
+ if (mailboxSession == null) {
+ return new SearchQueryIterator(it, query);
+ } else {
+ return new SearchQueryIterator(it, query,
mailboxSession.getLog());
+ }
}
} else {
return index.search(mailboxSession, mailbox, query);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
