big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-7437. IOUtils.copybytes will suppress the stream closure exceptions. Contributed by Uma Maheswara Rao G

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1142535 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-07-04 02:39:14 +00:00
parent 09c8adfb18
commit 6d9820ab3d
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/CHANGES.txt
View File

@ -340,6 +340,9 @@ Trunk (unreleased changes)
HADOOP-7428. IPC connection is orphaned with null 'out' member. HADOOP-7428. IPC connection is orphaned with null 'out' member.
(todd via eli) (todd via eli)
HADOOP-7437. IOUtils.copybytes will suppress the stream closure exceptions.
(Uma Maheswara Rao G via szetszwo)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
common/src/java/org/apache/hadoop/io/IOUtils.java
View File

@ -136,6 +136,12 @@ public static void copyBytes(InputStream in, OutputStream out, long count,
out.write(buf, 0, bytesRead); out.write(buf, 0, bytesRead);
bytesRemaining -= bytesRead; bytesRemaining -= bytesRead;
} }
if (close) {
out.close();
out = null;
in.close();
in = null;
}
} finally { } finally {
if (close) { if (close) {
closeStream(out); closeStream(out);

45
common/src/test/core/org/apache/hadoop/io/TestIOUtils.java
View File

@ -18,6 +18,9 @@
package org.apache.hadoop.io; package org.apache.hadoop.io;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
@ -65,4 +68,46 @@ public void testCopyBytesShouldNotCloseStreamsWhenCloseIsFalse()
Mockito.verify(inputStream, Mockito.atMost(0)).close(); Mockito.verify(inputStream, Mockito.atMost(0)).close();
Mockito.verify(outputStream, Mockito.atMost(0)).close(); Mockito.verify(outputStream, Mockito.atMost(0)).close();
} }
@Test
public void testCopyBytesWithCountShouldCloseStreamsWhenCloseIsTrue()
throws Exception {
InputStream inputStream = Mockito.mock(InputStream.class);
OutputStream outputStream = Mockito.mock(OutputStream.class);
Mockito.doReturn(-1).when(inputStream).read(new byte[4096], 0, 1);
IOUtils.copyBytes(inputStream, outputStream, (long) 1, true);
Mockito.verify(inputStream, Mockito.atLeastOnce()).close();
Mockito.verify(outputStream, Mockito.atLeastOnce()).close();
}
@Test
public void testCopyBytesWithCountShouldNotCloseStreamsWhenCloseIsFalse()
throws Exception {
InputStream inputStream = Mockito.mock(InputStream.class);
OutputStream outputStream = Mockito.mock(OutputStream.class);
Mockito.doReturn(-1).when(inputStream).read(new byte[4096], 0, 1);
IOUtils.copyBytes(inputStream, outputStream, (long) 1, false);
Mockito.verify(inputStream, Mockito.atMost(0)).close();
Mockito.verify(outputStream, Mockito.atMost(0)).close();
}
@Test
public void testCopyBytesWithCountShouldThrowOutTheStreamClosureExceptions()
throws Exception {
InputStream inputStream = Mockito.mock(InputStream.class);
OutputStream outputStream = Mockito.mock(OutputStream.class);
Mockito.doReturn(-1).when(inputStream).read(new byte[4096], 0, 1);
Mockito.doThrow(new IOException("Exception in closing the stream")).when(
outputStream).close();
try {
IOUtils.copyBytes(inputStream, outputStream, (long) 1, true);
fail("Should throw out the exception");
} catch (IOException e) {
assertEquals("Not throwing the expected exception.",
"Exception in closing the stream", e.getMessage());
}
Mockito.verify(inputStream, Mockito.atLeastOnce()).close();
Mockito.verify(outputStream, Mockito.atLeastOnce()).close();
}
} }