Merge branch '1.7' into 1.8

apache · Aug 2, 2017 · 591ba9f · 591ba9f
2 parents 0ee13f2 + bf7bbb5
commit 591ba9f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -1045,8 +1045,8 @@ public static SortedMap<Text,SortedMap<ColumnFQ,Value>> getTabletEntries(SortedM
     }
 
     for (Entry<Key,Value> entry : tabletKeyValues.entrySet()) {
-
-      if (columns != null && !colSet.contains(new ColumnFQ(entry.getKey()))) {
+      ColumnFQ currentKey = new ColumnFQ(entry.getKey());
+      if (columns != null && !colSet.contains(currentKey)) {
         continue;
       }
 
@@ -1058,7 +1058,7 @@ public static SortedMap<Text,SortedMap<ColumnFQ,Value>> getTabletEntries(SortedM
         tabletEntries.put(row, colVals);
       }
 
-      colVals.put(new ColumnFQ(entry.getKey()), entry.getValue());
+      colVals.put(currentKey, entry.getValue());
     }
 
     return tabletEntries;