Fixed a couple of bugs in the RocksDBClient close method

blastarr · blastarr · commit a727b4d8973d · 2019-08-13T14:13:37.000-07:00
diff --git a/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBClient.java b/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBClient.java
@@ -295,17 +295,15 @@ public void close(final String indexName, final String typeName) {
     final String prefix = RocksDBUtils.getTablePrefix(typeName, indexName);
     for (final Entry<String, CacheKey> e : keyCache.asMap().entrySet()) {
       final String key = e.getKey();
-      // BUGFIX: This string compare was failing due to a separator in the file path
-      // It seems like 'contains' is a better choice, but alternately could fix like this:
-      // if (key.substring(subDirectory.length()+1).startsWith(prefix)) {
-      if (key.contains(prefix)) {
+      if (key.substring(subDirectory.length() + 1).startsWith(prefix)) {
         keyCache.invalidate(key);
         AbstractRocksDBTable indexTable = indexTableCache.getIfPresent(e.getValue());
         if (indexTable == null) {
           indexTable = dataIndexTableCache.getIfPresent(e.getValue());
         }
         if (indexTable != null) {
           indexTableCache.invalidate(e.getValue());
+          dataIndexTableCache.invalidate(e.getValue());
           indexTable.close();
         }
       }
