Author: norman
Date: Thu Jan 20 06:37:44 2011
New Revision: 1061131
URL: http://svn.apache.org/viewvc?rev=1061131&view=rev
Log:
Remove CombinedInputStream and use java.io.SequenceInputStream
Removed:
james/server/trunk/util/src/main/java/org/apache/james/util/stream/CombinedInputStream.java
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=1061131&r1=1061130&r2=1061131&view=diff
==============================================================================
---
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
(original)
+++
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Thu Jan 20 06:37:44 2011
@@ -28,6 +28,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStream;
+import java.io.SequenceInputStream;
import java.util.Enumeration;
import java.util.UUID;
@@ -41,7 +42,6 @@ import javax.mail.util.SharedByteArrayIn
import org.apache.commons.io.IOUtils;
import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.util.stream.CombinedInputStream;
/**
* This object wraps a MimeMessage, only loading the underlying MimeMessage
@@ -645,7 +645,7 @@ public class MimeMessageWrapper
new MailHeaders(in);
// now construct the new stream using the in memory
headers and the body from the original source
- return new CombinedInputStream(new InputStream[]{new
InternetHeadersInputStream(getAllHeaderLines()), in});
+ return new SequenceInputStream(new
InternetHeadersInputStream(getAllHeaderLines()), in);
} else {
// the body was changed so we have no other solution to
copy it into memory first :(
ByteArrayOutputStream out = new ByteArrayOutputStream();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
