Author: felixk
Date: Tue Mar 22 06:32:32 2011
New Revision: 1084078
URL: http://svn.apache.org/viewvc?rev=1084078&view=rev
Log:
Make sure, the stream gets closed (see JAMES-1207)
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=1084078&r1=1084077&r2=1084078&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
Tue Mar 22 06:32:32 2011
@@ -377,12 +377,15 @@ public class MimeMessageWrapper
}
//Wrap input stream in LineNumberReader
//Not sure what encoding to use really...
+ InputStreamReader isr = null;
try {
LineNumberReader counter;
if (getEncoding() != null) {
- counter = new LineNumberReader(new InputStreamReader(in,
getEncoding()));
+ isr = new InputStreamReader(in, getEncoding());
+ counter = new LineNumberReader(isr);
} else {
- counter = new LineNumberReader(new InputStreamReader(in));
+ isr = new InputStreamReader(in);
+ counter = new LineNumberReader(isr);
}
//Read through all the data
char[] block = new char[4096];
@@ -393,6 +396,7 @@ public class MimeMessageWrapper
} catch (IOException ioe) {
return -1;
} finally {
+ IOUtils.closeQuietly(isr);
IOUtils.closeQuietly(in);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
