Updated to ElasticGeo 2.16.1 which resolves an issue with threads not…

… being released introduced with #259. Added datastore disposal around the keyword query.
InCadence · Jul 24, 2020 · 7c2be55 · 7c2be55
1 parent ef13703
commit 7c2be55
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/Coalesce.Framework.Persistance/elasticsearch/pom.xml b/src/Coalesce.Framework.Persistance/elasticsearch/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <ironhide.version>2.0.4</ironhide.version>
         <elasticsearch.version>7.4.2</elasticsearch.version>
-        <elasticgeo.version>2.16.0-INC</elasticgeo.version>
+        <elasticgeo.version>2.16.1-INC</elasticgeo.version>
     </properties>
 
     <modules>

diff --git a/...adencecorp/coalesce/framework/persistance/elasticsearch/ElasticSearchPersistorSearch.java b/...adencecorp/coalesce/framework/persistance/elasticsearch/ElasticSearchPersistorSearch.java
@@ -105,20 +105,30 @@ private Set<String> getKeywords(String index, String type) throws CoalescePersis
         try
         {
             DataStore datastore = getDataStore(index);
-            SimpleFeatureType feature = datastore.getSchema(index);
-
-            for (AttributeDescriptor attr : feature.getAttributeDescriptors())
+            try
             {
-                if (!attr.getLocalName().startsWith("_"))
-                {
-                    Object value = attr.getUserData().getOrDefault("analyzed", Boolean.FALSE);
+                SimpleFeatureType feature = datastore.getSchema(index);
 
-                    if (value instanceof Boolean && !((Boolean) value))
+                for (AttributeDescriptor attr : feature.getAttributeDescriptors())
+                {
+                    if (!attr.getLocalName().startsWith("_"))
                     {
-                        keywords.add(attr.getLocalName());
+                        Object value = attr.getUserData().getOrDefault("analyzed", Boolean.FALSE);
+
+                        if (value instanceof Boolean && !((Boolean) value))
+                        {
+                            keywords.add(attr.getLocalName());
+                        }
                     }
                 }
             }
+            finally
+            {
+                if (!isDataStoreCacheEnabled())
+                {
+                    datastore.dispose();
+                }
+            }
         }
         catch (IOException | RuntimeException e)
         {