Explorar el Código

fix #1507 skit flush when using cluster runner

Shinsuke Sugaya hace 7 años
padre
commit
ce4ddda567
Se han modificado 1 ficheros con 7 adiciones y 5 borrados
  1. 7 5
      src/main/java/org/codelibs/fess/es/client/FessEsClient.java

+ 7 - 5
src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -629,11 +629,13 @@ public class FessEsClient implements Client {
     @Override
     @PreDestroy
     public void close() {
-        try {
-            client.admin().indices().prepareFlush().setForce(true).execute()
-                    .actionGet(ComponentUtil.getFessConfig().getIndexIndicesTimeout());
-        } catch (final Exception e) {
-            logger.warn("Failed to flush indices.", e);
+        if (runner != null) {
+            try {
+                client.admin().indices().prepareFlush().setForce(true).execute()
+                        .actionGet(ComponentUtil.getFessConfig().getIndexIndicesTimeout());
+            } catch (final Exception e) {
+                logger.warn("Failed to flush indices.", e);
+            }
         }
         try {
             client.close();