Author: ggregory
Date: Fri Feb 17 23:04:03 2012
New Revision: 1245797
URL: http://svn.apache.org/viewvc?rev=1245797&view=rev
Log:
[IO-303] TeeOutputStream fails executing branch.close() when main.close()
raised an exception. Use a different impl with < LOCs.
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/TeeOutputStream.java?rev=1245797&r1=1245796&r2=1245797&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
Fri Feb 17 23:04:03 2012
@@ -98,14 +98,12 @@ public class TeeOutputStream extends Pro
* if an I/O error occurs
*/
@Override
- public void close() throws IOException {
+ public void close() throws IOException {
try {
super.close();
- } catch (IOException e) {
+ } finally {
this.branch.close();
- throw e;
}
- this.branch.close();
}
}