From a58646d6636729c98681ebc14f7e9b72f267e1e9 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 22 Jul 2007 02:29:58 +0000 Subject: [PATCH] improve mailbox-not-found logic darcs-hash:20070722022958-5007d-a15e0ca02e3693f5d48a8d8903cc565f590a1e6f.gz --- src/org/ibex/mail/IMAP.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/org/ibex/mail/IMAP.java b/src/org/ibex/mail/IMAP.java index 27e6643..9de6241 100644 --- 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) { -- 1.7.10.4