Author: norman
Date: Tue Jun 29 14:55:45 2010
New Revision: 959000
URL: http://svn.apache.org/viewvc?rev=959000&view=rev
Log:
We should throw a MailboxNotFoundException if the mailbox could not get found.
This fixes the POP3ServerTest's in james-server
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java?rev=959000&r1=958999&r2=959000&view=diff
==============================================================================
---
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
(original)
+++
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
Tue Jun 29 14:55:45 2010
@@ -30,9 +30,7 @@ import org.apache.james.imap.store.Store
import org.apache.james.imap.store.StoreMessageManager;
import org.apache.james.imap.store.Subscriber;
import org.apache.james.imap.store.UidConsumer;
-import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.transaction.TransactionalMapper;
public class InMemoryMailboxManager extends StoreMailboxManager<Long> {
@@ -70,10 +68,6 @@ public class InMemoryMailboxManager exte
((InMemoryMailboxSessionMapperFactory)
mailboxSessionMapperFactory).deleteAll();
}
- public long reserveNextUid(Mailbox<Long> mailbox, MailboxSession session)
throws MailboxException {
- // TODO Auto-generated method stub
- return 0;
- }
}
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java?rev=959000&r1=958999&r2=959000&view=diff
==============================================================================
---
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
(original)
+++
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
Tue Jun 29 14:55:45 2010
@@ -63,7 +63,12 @@ public class InMemoryMailboxMapper imple
* @see
org.apache.james.imap.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
*/
public Mailbox<Long> findMailboxById(Long mailboxId) throws
StorageException, MailboxNotFoundException {
- return mailboxesById.get(mailboxesById);
+ Mailbox<Long> mailbox = mailboxesById.get(mailboxesById);
+ if (mailbox == null) {
+ throw new MailboxNotFoundException(mailboxId);
+ } else {
+ return mailbox;
+ }
}
/*
@@ -78,7 +83,11 @@ public class InMemoryMailboxMapper imple
break;
}
}
- return result;
+ if (result == null) {
+ throw new MailboxNotFoundException(name);
+ } else {
+ return result;
+ }
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
