improve mailbox-not-found logic

[org.ibex.mail.git] / src / org / ibex / mail / IMAP.java

diff --git a/src/org/ibex/mail/IMAP.java b/src/org/ibex/mail/IMAP.java
index 27e6643..9de6241 100644 (file)
--- a/src/org/ibex/mail/IMAP.java
+++ b/src/org/ibex/mail/IMAP.java
@@ -117,11 +117,9 @@ public class IMAP {
             if (name.equalsIgnoreCase("inbox")) return inbox;
             if (name.equalsIgnoreCase("trash")) name = "trash";
             MailTree mt =  mailboxTree(name, create, throwexn);
-            /* FIXME: throw throwexn here
-            if (mt==null || mt.getMailbox()==null)
-                Log.error("mt==null", name);
-            */
-            return mt==null ? null : mt.getMailbox();
+            Mailbox ret = mt==null ? null : mt.getMailbox();
+            if (ret==null && throwexn) throw new Server.No("no such mailbox " + name);
+            return ret;
         }
         private MailTree mailboxTree(String name, boolean create) { return mailboxTree(name, create, true); }
         private MailTree mailboxTree(String name, boolean create, boolean throwexn) {