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 no...@apache.org on 2011/08/24 20:05:39 UTC

svn commit: r1161214 - /james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java

Author: norman
Date: Wed Aug 24 18:05:39 2011
New Revision: 1161214

URL: http://svn.apache.org/viewvc?rev=1161214&view=rev
Log:
Don't wrap Content InputStream so we can later use zero-copy file transfer when a FileInputStream is used. See IMAP-337

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

Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java?rev=1161214&r1=1161213&r2=1161214&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java Wed Aug 24 18:05:39 2011
@@ -19,10 +19,7 @@
 
 package org.apache.james.imap.processor.fetch;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
 
 import org.apache.james.mailbox.Content;
 
@@ -51,18 +48,9 @@ public class HeadersBodyElement extends 
         if (noBody) {
             return 0;
         } else {
-            return super.size() + 2;
+            return super.size();
 
         }
     }
 
-    @Override
-    public InputStream getInputStream() throws IOException {
-        if (!noBody &&size() > 0) {
-            return new SequenceInputStream(super.getInputStream(),  new ByteArrayInputStream("\r\n".getBytes("US-ASCII")));
-        } else {
-            return super.getInputStream();
-        }
-    }
-
 }



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