Author: norman
Date: Thu Aug  5 10:25:27 2010
New Revision: 982535

URL: http://svn.apache.org/viewvc?rev=982535&view=rev
Log:
There should only be one outputstream

Modified:
    
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java

Modified: 
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=982535&r1=982534&r2=982535&view=diff
==============================================================================
--- 
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
 (original)
+++ 
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
 Thu Aug  5 10:25:27 2010
@@ -51,18 +51,19 @@ public class MimeMessageInputStreamSourc
     implements Disposable {
 
     private final List<InputStream> streams = new ArrayList<InputStream>();
-    private final List<OutputStream> streamsOut = new 
ArrayList<OutputStream>();
 
+    private OutputStream out;
+    
     
     /**
      * A temporary file used to hold the message stream
      */
-    File file;
+    private File file;
 
     /**
      * The full path of the temporary file
      */
-    String sourceId;
+    private String sourceId;
 
     /**
      * Construct a new MimeMessageInputStreamSource from an
@@ -168,13 +169,15 @@ public class MimeMessageInputStreamSourc
      * @throws FileNotFoundException
      */
     public synchronized OutputStream getWritableOutputStream() throws 
FileNotFoundException {
-        FileOutputStream out = new FileOutputStream(file);
-        streamsOut.add(out);
+        if (out == null) {
+            out = new FileOutputStream(file);
+        }
         return out;
     }
-    
-    /**
-     * @see org.apache.avalon.framework.activity.Disposable#dispose()
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.lifecycle.Disposable#dispose()
      */
     public void dispose() {
         // explicit close all streams
@@ -185,11 +188,12 @@ public class MimeMessageInputStreamSourc
                 // ignore on dispose
             }
         }
-        for (int i = 0; i < streamsOut.size(); i++) {
+        if (out != null) {
             try {
-                streamsOut.get(i).close();
+                out.close();
             } catch (IOException e) {
-                // ignore on dispose
+                // TODO Auto-generated catch block
+                e.printStackTrace();
             }
         }
         try {



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

Reply via email to