Author: norman
Date: Sat Jan 15 11:01:57 2011
New Revision: 1059295
URL: http://svn.apache.org/viewvc?rev=1059295&view=rev
Log:
Merge fixes for IMAP IDLE command. See IMAP-245
Modified:
james/imap/branches/nio-refactoring/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
james/imap/branches/nio-refactoring/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Modified:
james/imap/branches/nio-refactoring/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
URL:
http://svn.apache.org/viewvc/james/imap/branches/nio-refactoring/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java?rev=1059295&r1=1059294&r2=1059295&view=diff
==============================================================================
---
james/imap/branches/nio-refactoring/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
(original)
+++
james/imap/branches/nio-refactoring/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
Sat Jan 15 11:01:57 2011
@@ -35,7 +35,7 @@ import org.apache.james.imap.message.req
public class IdleCommandParser extends AbstractImapCommandParser {
public IdleCommandParser() {
-
super(ImapCommand.selectedStateCommand(ImapConstants.IDLE_COMMAND_NAME));
+
super(ImapCommand.authenticatedStateCommand(ImapConstants.IDLE_COMMAND_NAME));
}
Modified:
james/imap/branches/nio-refactoring/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/branches/nio-refactoring/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java?rev=1059295&r1=1059294&r2=1059295&view=diff
==============================================================================
---
james/imap/branches/nio-refactoring/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
(original)
+++
james/imap/branches/nio-refactoring/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Sat Jan 15 11:01:57 2011
@@ -36,6 +36,7 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
+import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.message.request.IdleRequest;
@@ -99,12 +100,10 @@ public class IdleProcessor extends Abstr
});
MailboxManager mailboxManager = getMailboxManager();
MailboxSession mailboxSession =
ImapSessionUtils.getMailboxSession(session);
-
- try {
- mailboxManager.addListener(session.getSelected().getPath(),
new IdleMailboxListener(closed, session, responder), mailboxSession);
-
- } finally {
-
+
+ SelectedMailbox sm = session.getSelected();
+ if (sm != null) {
+ mailboxManager.addListener(sm.getPath(), new
IdleMailboxListener(closed, session, responder), mailboxSession);
}
} catch (MailboxException e) {
// TODO: What should we do here?
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
