From d4929f448f95815af99100780a08b172e0262c17 Mon Sep 17 00:00:00 2001 From: Tsz-Wo Nicholas Sze Date: Tue, 16 Jun 2015 18:08:29 -0700 Subject: [PATCH] HDFS-8606. Cleanup DFSOutputStream by removing unwanted changes from HDFS-8386. Contributed by Rakesh R --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/DFSOutputStream.java | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2d4c062bc39..a36e0477fbc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -635,6 +635,9 @@ Release 2.8.0 - UNRELEASED HDFS-8540. Mover should exit with NO_MOVE_BLOCK if no block can be moved. (surendra singh lilhore via szetszwo) + HDFS-8606. Cleanup DFSOutputStream by removing unwanted changes + from HDFS-8386. (Rakesh R via szetszwo) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java index 695e6daaad4..4622be632b7 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java @@ -898,17 +898,10 @@ public class DFSOutputStream extends FSOutputSummer return fileId; } - /** - * Set the data streamer object. - */ - protected synchronized void setStreamer(DataStreamer streamer) { - this.streamer = streamer; - } - /** * Returns the data streamer object. */ - protected synchronized DataStreamer getStreamer() { + protected DataStreamer getStreamer() { return streamer; } }