Author: norman
Date: Mon Aug  2 12:09:56 2010
New Revision: 981472

URL: http://svn.apache.org/viewvc?rev=981472&view=rev
Log:
 Remove the getSize() method of MailboxMembership (IMAP-184)

Modified:
    
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
    
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
    
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
    
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
    
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
    
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
    
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
    
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
    
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
    
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
    
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java

Modified: 
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
 (original)
+++ 
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
 Mon Aug  2 12:09:56 2010
@@ -124,6 +124,7 @@ public class JCRHostSystem extends ImapH
     private void delete(File home) throws Exception{
         if (home.exists()) {
             File[] files = home.listFiles();
+            if (files == null) return;
             for (int i = 0;i < files.length; i++) {
                 File f = files[i];
                 if (f.isDirectory()) {

Modified: 
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
 (original)
+++ 
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
 Mon Aug  2 12:09:56 2010
@@ -66,7 +66,7 @@ public class JCRMessage extends Abstract
     private String mailboxUUID;
     private long uid;
     private Date internalDate;
-    private int size;
+    private long size;
     private boolean answered;
     private boolean deleted;
     private boolean draft;
@@ -138,7 +138,7 @@ public class JCRMessage extends Abstract
         this.mailboxUUID = mailboxUUID;
         this.uid = uid;
         this.internalDate = message.getInternalDate();
-        this.size = message.getSize();
+        this.size = message.getFullContentOctets();
         this.answered = message.isAnswered();
         this.deleted = message.isDeleted();
         this.draft = message.isDraft();
@@ -327,7 +327,7 @@ public class JCRMessage extends Abstract
         //
         // This also fix https://issues.apache.org/jira/browse/IMAP-159
         if (isPersistent() == false) {
-            node.setProperty(SIZE_PROPERTY, getSize());
+            node.setProperty(SIZE_PROPERTY, getFullContentOctets());
             node.setProperty(MAILBOX_UUID_PROPERTY, getMailboxId());
             node.setProperty(UID_PROPERTY, getUid());
             if (getInternalDate() == null) {
@@ -538,27 +538,6 @@ public class JCRMessage extends Abstract
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getSize()
-     */
-    public int getSize() {
-        if (isPersistent()) {
-            try {
-                return new Long(node.getProperty(SIZE_PROPERTY).getLong())
-                        .intValue();
-
-            } catch (RepositoryException e) {
-                logger
-                        .error("Unable to access property " + SIZE_PROPERTY,
-                                e);
-            }
-            return 0;
-        }
-        return size;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.james.imap.store.mail.model.MailboxMembership#getUid()
      */
     public long getUid() {
@@ -777,7 +756,7 @@ public class JCRMessage extends Abstract
             + "mailboxUUID = " + this.getMailboxId() + TOSTRING_SEPARATOR
             + "uuid = " + this.getId() + TOSTRING_SEPARATOR
             + "internalDate = " + this.getInternalDate() + TOSTRING_SEPARATOR
-            + "size = " + this.getSize() + TOSTRING_SEPARATOR
+            + "size = " + this.getFullContentOctets() + TOSTRING_SEPARATOR
             + "answered = " + this.isAnswered() + TOSTRING_SEPARATOR
             + "deleted = " + this.isDeleted() + TOSTRING_SEPARATOR
             + "draft = " + this.isDraft() + TOSTRING_SEPARATOR

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
 Mon Aug  2 12:09:56 2010
@@ -117,9 +117,6 @@ public abstract class AbstractJPAMailbox
     /** The value for the internalDate field */
     @Basic(optional=false) private Date internalDate;
 
-    /** The value for the size field */
-    @Basic(optional=false) private int size = 0;
-
     /** The value for the answered field */
     @Basic(optional=false) private boolean answered = false;
 
@@ -145,12 +142,11 @@ public abstract class AbstractJPAMailbox
     @Deprecated
     public AbstractJPAMailboxMembership() {}
 
-    public AbstractJPAMailboxMembership(long mailboxId, long uid, Date 
internalDate, int size, Flags flags, int bodyStartOctet, final List<JPAHeader> 
headers, final PropertyBuilder propertyBuilder) throws MailboxException {
+    public AbstractJPAMailboxMembership(long mailboxId, long uid, Date 
internalDate, Flags flags, int bodyStartOctet, final List<JPAHeader> headers, 
final PropertyBuilder propertyBuilder) throws MailboxException {
         super();
         this.mailboxId = mailboxId;
         this.uid = uid;
         this.internalDate = internalDate;
-        this.size = size;
        
         setFlags(flags);
     }
@@ -168,7 +164,6 @@ public abstract class AbstractJPAMailbox
         this.mailboxId = mailboxId;
         this.uid = uid;
         this.internalDate = original.getInternalDate();
-        this.size = original.getSize();
         this.answered = original.isAnswered();
         this.deleted = original.isDeleted();
         this.draft = original.isDraft();
@@ -192,13 +187,6 @@ public abstract class AbstractJPAMailbox
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getSize()
-     */
-    public int getSize() {
-        return size;
-    }
-
-    /**
      * @see org.apache.james.imap.store.mail.model.MailboxMembership#getUid()
      */
     public long getUid() {
@@ -301,7 +289,6 @@ public abstract class AbstractJPAMailbox
             + "mailboxId = " + this.mailboxId + TOSTRING_SEPARATOR
             + "uid = " + this.uid + TOSTRING_SEPARATOR
             + "internalDate = " + this.internalDate + TOSTRING_SEPARATOR
-            + "size = " + this.size + TOSTRING_SEPARATOR
             + "answered = " + this.answered + TOSTRING_SEPARATOR
             + "deleted = " + this.deleted + TOSTRING_SEPARATOR
             + "draft = " + this.draft + TOSTRING_SEPARATOR

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
 Mon Aug  2 12:09:56 2010
@@ -51,7 +51,7 @@ public class JPAMailboxMembership extend
 
     public JPAMailboxMembership(long mailboxId, long uid, Date internalDate, 
int size, Flags flags, 
             InputStream content, int bodyStartOctet, final List<JPAHeader> 
headers, final PropertyBuilder propertyBuilder) throws MailboxException {
-        super(mailboxId, uid, internalDate, size, flags, bodyStartOctet, 
headers, propertyBuilder);  
+        super(mailboxId, uid, internalDate, flags, bodyStartOctet, headers, 
propertyBuilder);  
         try {
             this.message = new JPAMessage(content, size, bodyStartOctet, 
headers, propertyBuilder);
         } catch (IOException e) {

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
 Mon Aug  2 12:09:56 2010
@@ -52,7 +52,7 @@ public class JPAStreamingMailboxMembersh
 
     public JPAStreamingMailboxMembership(long mailboxId, long uid, Date 
internalDate, int size, Flags flags, 
             InputStream content, int bodyStartOctet, final List<JPAHeader> 
headers, final PropertyBuilder propertyBuilder) throws MailboxException {
-        super(mailboxId, uid, internalDate, size, flags, bodyStartOctet, 
headers, propertyBuilder);  
+        super(mailboxId, uid, internalDate, flags, bodyStartOctet, headers, 
propertyBuilder);  
         this.message = new JPAStreamingMessage(content, size, bodyStartOctet, 
headers, propertyBuilder);
         
        

Modified: 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
 (original)
+++ 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
 Mon Aug  2 12:09:56 2010
@@ -166,7 +166,7 @@ public interface MessageResult extends C
      */
     Flags getFlags() throws MailboxException;
 
-    int getSize();
+    long getSize();
 
     /**
      * Gets headers for the message.

Modified: 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
 (original)
+++ 
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
 Mon Aug  2 12:09:56 2010
@@ -109,7 +109,7 @@ public class MessageResultImpl implement
      * (non-Javadoc)
      * @see org.apache.james.imap.mailbox.MessageResult#getSize()
      */
-    public int getSize() {
+    public long getSize() {
         return size;
     }
 

Modified: 
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
 (original)
+++ 
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
 Mon Aug  2 12:09:56 2010
@@ -277,7 +277,7 @@ public class FetchResponseEncoder extend
 
     private void encodeSize(ImapResponseComposer composer,
             final FetchResponse fetchResponse) throws IOException {
-        final Integer size = fetchResponse.getSize();
+        final Long size = fetchResponse.getSize();
         if (size != null) {
             // TODO: add method to composer
             composer.message("RFC822.SIZE");

Modified: 
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
 (original)
+++ 
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
 Mon Aug  2 12:09:56 2010
@@ -39,7 +39,7 @@ public final class FetchResponse impleme
 
     private final Date internalDate;
 
-    private final Integer size;
+    private final Long size;
 
     private final List<BodyElement> elements;
 
@@ -50,7 +50,7 @@ public final class FetchResponse impleme
     private final Structure bodystructure;
 
     public FetchResponse(final int messageNumber, final Flags flags,
-            final Long uid, final Date internalDate, final Integer size,
+            final Long uid, final Date internalDate, final Long size,
             final Envelope envelope, final Structure body,
             final Structure bodystructure, List<BodyElement> elements) {
         super();
@@ -130,7 +130,7 @@ public final class FetchResponse impleme
      * @return the size, or null if the <code>FETCH</code> did not include
      *         <code>SIZE</code>
      */
-    public final Integer getSize() {
+    public final Long getSize() {
         return size;
     }
 

Modified: 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
 (original)
+++ 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
 Mon Aug  2 12:09:56 2010
@@ -58,7 +58,7 @@ final class FetchResponseBuilder {
 
     private Date internalDate;
 
-    private Integer size;
+    private Long size;
 
     private List<FetchResponse.BodyElement> elements;
 
@@ -85,7 +85,7 @@ final class FetchResponseBuilder {
     }
 
     public void setUid(long uid) {
-        this.uid = new Long(uid);
+        this.uid = uid;
     }
 
     public void setFlags(Flags flags) {
@@ -184,8 +184,8 @@ final class FetchResponseBuilder {
         return envelopeBuilder.buildEnvelope(result);
     }
 
-    private void setSize(int size) {
-        this.size = new Integer(size);
+    private void setSize(long size) {
+        this.size = size;
     }
 
     public void setInternalDate(Date internalDate) {

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
 Mon Aug  2 12:09:56 2010
@@ -376,7 +376,7 @@ public class MessageSearches {
     private boolean matches(SearchQuery.SizeCriterion criterion, 
MailboxMembership<?> message)
             throws UnsupportedSearchException {
         final SearchQuery.NumericOperator operator = criterion.getOperator();
-        final int size = message.getSize();
+        final long size = message.getDocument().getFullContentOctets();
         final long value = operator.getValue();
         switch (operator.getType()) {
             case LESS_THAN:

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
 Mon Aug  2 12:09:56 2010
@@ -124,7 +124,7 @@ public class ResultIterator<Id> implemen
                 final MailboxException exception) {
             super();
             internalDate = message.getInternalDate();
-            size = message.getSize();
+            size = (int)message.getDocument().getFullContentOctets();
             uid = message.getUid();
             this.exception = exception;
         }
@@ -144,7 +144,7 @@ public class ResultIterator<Id> implemen
             throw exception;
         }
 
-        public int getSize() {
+        public long getSize() {
             return size;
         }
 

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
 Mon Aug  2 12:09:56 2010
@@ -121,7 +121,7 @@ public class ResultUtils {
         if (fetchGroup != null) {
             int content = fetchGroup.content();
             messageResult.setFlags(message.createFlags());
-            messageResult.setSize(message.getSize());
+            
messageResult.setSize((int)message.getDocument().getFullContentOctets());
             messageResult.setInternalDate(message.getInternalDate());
 
             try {

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
 Mon Aug  2 12:09:56 2010
@@ -37,13 +37,6 @@ public interface MailboxMembership<Id> {
     public abstract Id getMailboxId();
 
     /**
-     * Return the size
-     * 
-     * @return size
-     */
-    public abstract int getSize();
-
-    /**
      * Return the uid
      * 
      * @return uid

Modified: 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
 (original)
+++ 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
 Mon Aug  2 12:09:56 2010
@@ -50,7 +50,7 @@ public class SimpleMailboxMembership imp
         this.uid = uid;
         this.internalDate = internalDate;
         this.size = size;
-        this.message = new SimpleMessage(body, new 
ArrayList<SimpleHeader>(headers));
+        this.message = new SimpleMessage(body, size, new 
ArrayList<SimpleHeader>(headers));
         setFlags(flags);
     }
 
@@ -66,7 +66,6 @@ public class SimpleMailboxMembership imp
         this.mailboxId = mailboxId;
         this.uid = uid;
         this.internalDate = original.getInternalDate();
-        this.size = original.getSize();
         this.answered = original.isAnswered();
         this.deleted = original.isDeleted();
         this.draft = original.isDraft();
@@ -89,14 +88,7 @@ public class SimpleMailboxMembership imp
     public Long getMailboxId() {
         return mailboxId;
     }
-
-    /**
-     * @see org.apache.james.imap.jpa.mail.model.Document#getSize()
-     */
-    public int getSize() {
-        return size;
-    }
-
+    
     /**
      * @see org.apache.james.imap.jpa.mail.model.Document#getUid()
      */

Modified: 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
 (original)
+++ 
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
 Mon Aug  2 12:09:56 2010
@@ -43,7 +43,9 @@ public class SimpleMessage implements Do
     public String mediaType = null;
     public Long textualLineCount = null;
 
-    public SimpleMessage(byte[] body, final List<SimpleHeader> headers) throws 
Exception {
+       private int size;
+
+    public SimpleMessage(byte[] body, int size, final List<SimpleHeader> 
headers) throws Exception {
         super();
         this.body = body;
         this.headers = new ArrayList<SimpleHeader>(headers);
@@ -60,6 +62,7 @@ public class SimpleMessage implements Do
         baos.write(body);
         baos.flush();
         fullContent = baos.toByteArray();
+        this.size = size;
     }
     
     /**
@@ -129,7 +132,7 @@ public class SimpleMessage implements Do
     }
 
     public long getFullContentOctets() {
-        return fullContent.length;
+        return size;
     }
     
     private final class ByteArrayRewindableInputStream extends 
RewindableInputStream {

Modified: 
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=981472&r1=981471&r2=981472&view=diff
==============================================================================
--- 
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
 (original)
+++ 
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
 Mon Aug  2 12:09:56 2010
@@ -158,7 +158,7 @@ public class TorqueResultIterator implem
             return 0;
         }
 
-        public int getSize() {
+        public long getSize() {
             return size;
         }
 



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

Reply via email to