You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by jo...@apache.org on 2006/11/16 10:11:46 UTC

svn commit: r475648 - in /james/server/trunk/src: java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java

Author: joachim
Date: Thu Nov 16 01:11:45 2006
New Revision: 475648

URL: http://svn.apache.org/viewvc?view=rev&rev=475648
Log:
 - TorqueMailbox.getUidNext() used wrong property for MailboxRowPeer.retrieveByPK()
 - now updates internal instance of MailboxRow
 - corresponding test: AbstractImapMailboxSelfTestCase.testGetUidNext() 

Modified:
    james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
    james/server/trunk/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java

Modified: james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?view=diff&rev=475648&r1=475647&r2=475648
==============================================================================
--- james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Thu Nov 16 01:11:45 2006
@@ -483,8 +483,9 @@
     public synchronized long getUidNext() throws MailboxManagerException {
         checkAccess();
         try {
-            MailboxRow myMailboxRow = MailboxRowPeer.retrieveByPK(mailboxRow.getLastUid());
+            MailboxRow myMailboxRow = MailboxRowPeer.retrieveByPK(mailboxRow.getPrimaryKey());
             if (myMailboxRow != null) {
+                mailboxRow=myMailboxRow;
                 getUidChangeTracker().foundLastUid(mailboxRow.getLastUid());
                 return getUidChangeTracker().getLastUid() + 1;
             } else {

Modified: james/server/trunk/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java?view=diff&rev=475648&r1=475647&r2=475648
==============================================================================
--- james/server/trunk/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java (original)
+++ james/server/trunk/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java Thu Nov 16 01:11:45 2006
@@ -133,6 +133,13 @@
         checkMessageResults(new long[] {1,8,10},new int[] {1,2,3},getResult5);
     }
     
+    public void testGetUidNext() throws MessagingException {
+        assertEquals(1, mailbox.getUidNext());
+        MessageResult mr=mailbox.appendMessage(TestUtil.createMessage(), new Date(), MessageResult.UID | MessageResult.MSN);
+        assertEquals(1,mr.getUid());
+        assertEquals(2, mailbox.getUidNext());
+    }
+    
     public void testAddedEvents() throws MailboxManagerException, MessagingException {
         assertEquals(0,mailbox.getFlagEvents(false).length);
         MessageResult mr=mailbox.appendMessage(TestUtil.createMessage(), new Date(), MessageResult.UID | MessageResult.MSN);
@@ -154,7 +161,6 @@
             assertEquals("Uid at pos "+i,uids[i], messageResults[i].getUid());
             assertEquals("Msn at pos "+i,msns[i], messageResults[i].getMsn());
         }
-        
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org