[accumulo] branch master updated: Removed a duplicate 'if' conditionin TabletLocatorImpl. (#1603)

[jm...@apache.org]

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

jmark99 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 8d00e2d  Removed a duplicate 'if' conditionin TabletLocatorImpl. (#1603)
8d00e2d is described below

commit 8d00e2d199b71d270c3ed0115ef009bd9aeaee61
Author: Mark Owens <jm...@apache.org>
AuthorDate: Tue May 5 09:05:48 2020 -0400

    Removed a duplicate 'if' conditionin TabletLocatorImpl. (#1603)
    
    The 'updateCache' method within TabletLocatorImpl.java contains two
    identical 'if' conditions, both of which throw 'IllegalStateExceptions'.
    I removed the second, given that it would never be reached if the
    condition is true. Even though the conditional checks are identical, the
    message provided to the exceptions differ. I kept the first since that
    would be the one presented to the user if this condition was satisfied.
---
 .../java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
index 1fe7ded..6869d6a 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletLocatorImpl.java
@@ -548,12 +548,6 @@ public class TabletLocatorImpl extends TabletLocator {
           "Cannot add null locations to cache " + tableId + "  " + tabletLocation.tablet_extent);
     }
 
-    if (!tabletLocation.tablet_extent.getTableId().equals(tableId)) {
-      // sanity check
-      throw new IllegalStateException("Cannot add other table ids to locations cache " + tableId
-          + "  " + tabletLocation.tablet_extent);
-    }
-
     // clear out any overlapping extents in cache
     removeOverlapping(metaCache, tabletLocation.tablet_extent);