Repository: hbase Updated Branches: refs/heads/0.98 7fe910778 -> 970adb357
HBASE-15152 Addendum fix hadoop-1.1 compat for 0.98 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/970adb35 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/970adb35 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/970adb35 Branch: refs/heads/0.98 Commit: 970adb357e0c2e977abd78956fe362aeefa57b46 Parents: 7fe9107 Author: zhangduo <zhang...@apache.org> Authored: Fri Feb 12 21:12:52 2016 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Fri Feb 12 21:12:52 2016 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/wal/TestWALReplay.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/970adb35/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java index f8d88b5..894cecd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.spy; import java.io.FilterInputStream; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Field; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; @@ -84,7 +85,6 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileTestUtil; import org.apache.hadoop.hbase.util.Pair; -import org.apache.hadoop.hdfs.DFSInputStream; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -960,8 +960,8 @@ public class TestWALReplay { FSDataInputStream stream = (FSDataInputStream) invocation.callRealMethod(); Field field = FilterInputStream.class.getDeclaredField("in"); field.setAccessible(true); - final DFSInputStream in = (DFSInputStream) field.get(stream); - DFSInputStream spyIn = spy(in); + final InputStream in = (InputStream) field.get(stream); + InputStream spyIn = spy(in); doAnswer(new Answer<Integer>() { private long pos;
