Selaa lähdekoodia

HADOOP-11101. How about inputstream close statement from catch block to finally block in FileContext#copy() ( Contributed by skrho )

(cherry picked from commit dff95f7af899a4f2add791afbd20c8a1e33c7a36)
Vinayakumar B 10 vuotta sitten
vanhempi
commit
1e097ba429

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -206,6 +206,9 @@ Release 2.6.0 - UNRELEASED
 
 
     HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw)
     HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw)
 
 
+    HADOOP-11101. How about inputstream close statement from catch block to
+    finally block in FileContext#copy() ( skrho via vinayakumarb )
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)

+ 1 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java

@@ -2035,10 +2035,9 @@ public final class FileContext {
                 EnumSet.of(CreateFlag.CREATE);
                 EnumSet.of(CreateFlag.CREATE);
           out = create(qDst, createFlag);
           out = create(qDst, createFlag);
           IOUtils.copyBytes(in, out, conf, true);
           IOUtils.copyBytes(in, out, conf, true);
-        } catch (IOException e) {
+        } finally {
           IOUtils.closeStream(out);
           IOUtils.closeStream(out);
           IOUtils.closeStream(in);
           IOUtils.closeStream(in);
-          throw e;
         }
         }
       }
       }
       if (deleteSource) {
       if (deleteSource) {