You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2011/03/28 19:38:57 UTC
svn commit: r1086311 - in /hadoop/common/branches/branch-0.21: CHANGES.txt
src/java/org/apache/hadoop/io/IOUtils.java
src/test/core/org/apache/hadoop/io/TestIOUtils.java
Author: szetszwo
Date: Mon Mar 28 17:38:56 2011
New Revision: 1086311
URL: http://svn.apache.org/viewvc?rev=1086311&view=rev
Log:
HADOOP-7194. Fix resource leak in IOUtils.copyBytes(..). Contributed by Devaraj K
Added:
hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/io/TestIOUtils.java
Modified:
hadoop/common/branches/branch-0.21/CHANGES.txt
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/IOUtils.java
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=1086311&r1=1086310&r2=1086311&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Mon Mar 28 17:38:56 2011
@@ -51,6 +51,9 @@ Release 0.21.1 - Unreleased
HADOOP-7174. Null is displayed in the "fs -copyToLocal" command.
(Uma Maheswara Rao G via szetszwo)
+ HADOOP-7194. Fix resource leak in IOUtils.copyBytes(..).
+ (Devaraj K via szetszwo)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/IOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/IOUtils.java?rev=1086311&r1=1086310&r2=1086311&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/IOUtils.java (original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/IOUtils.java Mon Mar 28 17:38:56 2011
@@ -47,10 +47,16 @@ public class IOUtils {
try {
copyBytes(in, out, buffSize);
- } finally {
if(close) {
out.close();
+ out = null;
in.close();
+ in = null;
+ }
+ } finally {
+ if(close) {
+ closeStream(out);
+ closeStream(in);
}
}
}
Added: hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/io/TestIOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/io/TestIOUtils.java?rev=1086311&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/io/TestIOUtils.java (added)
+++ hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/io/TestIOUtils.java Mon Mar 28 17:38:56 2011
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ * Test cases for IOUtils.java
+ */
+public class TestIOUtils {
+
+ @Test
+ public void testCopyBytesShouldCloseStreamsWhenCloseIsTrue() throws Exception {
+ InputStream inputStream = Mockito.mock(InputStream.class);
+ OutputStream outputStream = Mockito.mock(OutputStream.class);
+ Mockito.doReturn(-1).when(inputStream).read(new byte[1]);
+ IOUtils.copyBytes(inputStream, outputStream, 1, true);
+ Mockito.verify(inputStream, Mockito.atLeastOnce()).close();
+ Mockito.verify(outputStream, Mockito.atLeastOnce()).close();
+ }
+
+ @Test
+ public void testCopyBytesShouldCloseInputSteamWhenOutputStreamCloseThrowsException()
+ throws Exception {
+ InputStream inputStream = Mockito.mock(InputStream.class);
+ OutputStream outputStream = Mockito.mock(OutputStream.class);
+ Mockito.doReturn(-1).when(inputStream).read(new byte[1]);
+ Mockito.doThrow(new IOException()).when(outputStream).close();
+ try{
+ IOUtils.copyBytes(inputStream, outputStream, 1, true);
+ } catch (IOException e) {
+ }
+ Mockito.verify(inputStream, Mockito.atLeastOnce()).close();
+ Mockito.verify(outputStream, Mockito.atLeastOnce()).close();
+ }
+
+ @Test
+ public void testCopyBytesShouldNotCloseStreamsWhenCloseIsFalse()
+ throws Exception {
+ InputStream inputStream = Mockito.mock(InputStream.class);
+ OutputStream outputStream = Mockito.mock(OutputStream.class);
+ Mockito.doReturn(-1).when(inputStream).read(new byte[1]);
+ IOUtils.copyBytes(inputStream, outputStream, 1, false);
+ Mockito.verify(inputStream, Mockito.atMost(0)).close();
+ Mockito.verify(outputStream, Mockito.atMost(0)).close();
+ }
+}