reverted

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java

@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java

@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }
 

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java

@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java

@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }
 

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java

@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java

@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }