Author: norman
Date: Sun Jul 17 16:46:41 2011
New Revision: 1147681

URL: http://svn.apache.org/viewvc?rev=1147681&view=rev
Log:
Make sure ENABLE CONDSTORE and ENABLE QRESYNC does get treated as CONDSTORE 
enabling command as stated in the QRESYNC RFC. See IMAP-307

Modified:
    
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java

Modified: 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java?rev=1147681&r1=1147680&r2=1147681&view=diff
==============================================================================
--- 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
 (original)
+++ 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
 Sun Jul 17 16:46:41 2011
@@ -464,17 +464,16 @@ abstract class AbstractSelectionProcesso
             // QRESYNC or CONDSTORE
             //
             // See http://www.dovecot.org/list/dovecot/2008-March/029561.html
-            if (sm != null) {
-                if 
(capability.equalsIgnoreCase(ImapConstants.SUPPORTS_CONDSTORE)|| 
capability.equalsIgnoreCase(ImapConstants.SUPPORTS_QRESYNC)) {
-                    try {
-                        MessageManager mailbox = getSelectedMailbox(session);
-                        MetaData metaData = mailbox.getMetaData(false, 
ImapSessionUtils.getMailboxSession(session), FetchGroup.NO_COUNT);
-                        highestModSeq(responder, metaData, sm);
-                    } catch (MailboxException e) {
-                        throw new EnableException("Unable to enable " + 
capability, e);
-                    }
+            if 
(capability.equalsIgnoreCase(ImapConstants.SUPPORTS_CONDSTORE)|| 
capability.equalsIgnoreCase(ImapConstants.SUPPORTS_QRESYNC)) {
+                try {
+                    MessageManager mailbox = getSelectedMailbox(session);
+                    MetaData metaData = mailbox.getMetaData(false, 
ImapSessionUtils.getMailboxSession(session), FetchGroup.NO_COUNT);
+                    condstoreEnablingCommand(session, responder, metaData, sm 
!= null);
+                } catch (MailboxException e) {
+                    throw new EnableException("Unable to enable " + 
capability, e);
                 }
             }
+            
         }
     }
     



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to