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 jz...@apache.org on 2017/09/14 18:26:54 UTC
hadoop git commit: HADOOP-14864. FSDataInputStream#unbuffer UOE
should include stream class name. Contributed by Bharat Viswanadham.
Repository: hadoop
Updated Branches:
refs/heads/trunk 09b476e6d -> 7ee02d106
HADOOP-14864. FSDataInputStream#unbuffer UOE should include stream class name. Contributed by Bharat Viswanadham.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ee02d10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ee02d10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ee02d10
Branch: refs/heads/trunk
Commit: 7ee02d1065268511ec10a8b8852d0d6327419b9c
Parents: 09b476e
Author: John Zhuge <jz...@cloudera.com>
Authored: Wed Sep 13 20:55:06 2017 -0700
Committer: John Zhuge <jz...@apache.org>
Committed: Thu Sep 14 11:26:49 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/fs/FSDataInputStream.java | 4 ++--
.../java/org/apache/hadoop/fs/TestUnbuffer.java | 21 ++++++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ee02d10/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
index 640db59..a80279d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
@@ -230,8 +230,8 @@ public class FSDataInputStream extends DataInputStream
try {
((CanUnbuffer)in).unbuffer();
} catch (ClassCastException e) {
- throw new UnsupportedOperationException("this stream does not " +
- "support unbuffering.");
+ throw new UnsupportedOperationException("this stream " +
+ in.getClass().getName() + " does not " + "support unbuffering.");
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ee02d10/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUnbuffer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUnbuffer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUnbuffer.java
index e25a754..b112e30 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUnbuffer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUnbuffer.java
@@ -27,12 +27,18 @@ import org.apache.hadoop.hdfs.PeerCache;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.io.IOUtils;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
public class TestUnbuffer {
private static final Log LOG =
LogFactory.getLog(TestUnbuffer.class.getName());
+ @Rule
+ public ExpectedException exception = ExpectedException.none();
+
/**
* Test that calling Unbuffer closes sockets.
*/
@@ -123,4 +129,19 @@ public class TestUnbuffer {
}
}
}
+
+ /**
+ * Test unbuffer method which throws an Exception with class name included.
+ */
+ @Test
+ public void testUnbufferException() {
+ FSInputStream in = Mockito.mock(FSInputStream.class);
+ FSDataInputStream fs = new FSDataInputStream(in);
+
+ exception.expect(UnsupportedOperationException.class);
+ exception.expectMessage("this stream " + in.getClass().getName()
+ + " does not support unbuffering");
+
+ fs.unbuffer();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org