Author: rdonkin
Date: Sun May 10 21:22:40 2009
New Revision: 773406
URL: http://svn.apache.org/viewvc?rev=773406&view=rev
Log:
Use text from MailboxExceptions. IMAP-72
https://issues.apache.org/jira/browse/IMAP-72
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=773406&r1=773405&r2=773406&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Sun May 10 21:22:40 2009
@@ -97,8 +97,19 @@
logger.info(e.getMessage());
logger.debug("Processing failed:", e);
}
- response = factory.taggedNo(tag, command,
- HumanReadableTextKey.GENERIC_FAILURE_DURING_PROCESSING);
+ final HumanReadableTextKey key;
+ if (e instanceof MailboxException) {
+ final MailboxException mailboxException = (MailboxException) e;
+ final HumanReadableTextKey exceptionKey =
mailboxException.getKey();
+ if (exceptionKey == null) {
+ key =
HumanReadableTextKey.GENERIC_FAILURE_DURING_PROCESSING;
+ } else {
+ key = exceptionKey;
+ }
+ } else {
+ key = HumanReadableTextKey.GENERIC_FAILURE_DURING_PROCESSING;
+ }
+ response = factory.taggedNo(tag, command, key);
}
responder.respond(response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
