svn commit: r1586806 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java

[tedyu]

Author: tedyu
Date: Sat Apr 12 01:54:47 2014
New Revision: 1586806

URL: http://svn.apache.org/r1586806
Log:
HBASE-10968 Null check in 
TableSnapshotInputFormat#TableSnapshotRegionRecordReader#initialize() is 
redundant


Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java?rev=1586806&r1=1586805&r2=1586806&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
 Sat Apr 12 01:54:47 2014
@@ -235,10 +235,8 @@ public class TableSnapshotInputFormat ex
       scan.setCacheBlocks(false);
 
       scanner = new ClientSideRegionScanner(conf, fs, tmpRootDir, htd, hri, 
scan, null);
-      if (context != null) {
-        this.context = context;
-        getCounter = 
TableRecordReaderImpl.retrieveGetCounterWithStringsParams(context);
-      }
+      this.context = context;
+      getCounter = 
TableRecordReaderImpl.retrieveGetCounterWithStringsParams(context);
     }
 
     @Override
@@ -300,7 +298,6 @@ public class TableSnapshotInputFormat ex
     FileSystem fs = rootDir.getFileSystem(conf);
 
     Path snapshotDir = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);
-    SnapshotDescription snapshotDesc = 
SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDir);
 
     Set<String> snapshotRegionNames
       = SnapshotReferenceUtil.getSnapshotRegionNames(fs, snapshotDir);