[accumulo] branch master updated: ACCUMULO-4778 Fix findbugs failure

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 05c165b  ACCUMULO-4778 Fix findbugs failure
05c165b is described below

commit 05c165b5f61427b22024f1c78a4295c06a93aad6
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Jan 31 12:09:23 2018 -0500

    ACCUMULO-4778 Fix findbugs failure
---
 .../org/apache/accumulo/core/client/mapred/AbstractInputFormat.java   | 4 ++--
 .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index b2f0ed7..28a3355 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -656,7 +656,7 @@ public abstract class AbstractInputFormat<K,V> implements 
InputFormat<K,V> {
       Table.ID tableId;
       // resolve table name to id once, and use id from this point forward
       if (DeprecationUtil.isMockInstance(instance)) {
-        tableId = null;
+        tableId = Table.ID.of("");
       } else {
         try {
           tableId = Tables.getTableId(instance, tableName);
@@ -705,7 +705,7 @@ public abstract class AbstractInputFormat<K,V> implements 
InputFormat<K,V> {
               getClientConfiguration(job));
           while (!tl.binRanges(context, ranges, binnedRanges).isEmpty()) {
             if (!DeprecationUtil.isMockInstance(instance)) {
-              String tableIdStr = tableId != null ? tableId.canonicalID() : 
null;
+              String tableIdStr = tableId.canonicalID();
               if (!Tables.exists(instance, tableId))
                 throw new TableDeletedException(tableIdStr);
               if (Tables.getTableState(instance, tableId) == 
TableState.OFFLINE)
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 72a9c92..fb36282 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -701,7 +701,7 @@ public abstract class AbstractInputFormat<K,V> extends 
InputFormat<K,V> {
       Table.ID tableId;
       // resolve table name to id once, and use id from this point forward
       if (DeprecationUtil.isMockInstance(instance)) {
-        tableId = null;
+        tableId = Table.ID.of("");
       } else {
         try {
           tableId = Tables.getTableId(instance, tableName);
@@ -751,7 +751,7 @@ public abstract class AbstractInputFormat<K,V> extends 
InputFormat<K,V> {
               getClientConfiguration(context));
           while (!tl.binRanges(clientContext, ranges, binnedRanges).isEmpty()) 
{
             if (!DeprecationUtil.isMockInstance(instance)) {
-              String tableIdStr = tableId != null ? tableId.canonicalID() : 
null;
+              String tableIdStr = tableId.canonicalID();
               if (!Tables.exists(instance, tableId))
                 throw new TableDeletedException(tableIdStr);
               if (Tables.getTableState(instance, tableId) == 
TableState.OFFLINE)

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.