Author: rdonkin
Date: Sat Sep 20 07:55:48 2008
New Revision: 697375
URL: http://svn.apache.org/viewvc?rev=697375&view=rev
Log:
Ensure good message when mailbox already exists IMAP-4
Modified:
james/protocols/imap/trunk/seda/src/test/resources/org/apache/james/test/functional/imap/scripts/Create.test
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Modified:
james/protocols/imap/trunk/seda/src/test/resources/org/apache/james/test/functional/imap/scripts/Create.test
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/resources/org/apache/james/test/functional/imap/scripts/Create.test?rev=697375&r1=697374&r2=697375&view=diff
==============================================================================
---
james/protocols/imap/trunk/seda/src/test/resources/org/apache/james/test/functional/imap/scripts/Create.test
(original)
+++
james/protocols/imap/trunk/seda/src/test/resources/org/apache/james/test/functional/imap/scripts/Create.test
Sat Sep 20 07:55:48 2008
@@ -52,6 +52,12 @@
S: \* LIST \(\) "." "alpha.beta.gamma"
S: 18 OK LIST completed.
+#
+# When mailbox already exists, ensure message is user friendly
+#
+C: 19 CREATE alpha
+S: 19 NO CREATE failed. Mailbox already exists.
+
# Cleanup
C: a1 DELETE test1.subfolder1
S: a1 OK DELETE completed.
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=697375&r1=697374&r2=697375&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Sat Sep 20 07:55:48 2008
@@ -138,7 +138,11 @@
}
index = namespaceName.indexOf(HIERARCHY_DELIMITER,
++index);
}
- doCreate(namespaceName);
+ if (existsMailbox(namespaceName)) {
+ throw new MailboxExistsException(namespaceName);
+ } else {
+ doCreate(namespaceName);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
