From c1acd180171657679c1a333cd0730aba3f642747 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Wed, 25 Nov 2015 22:46:51 +0900
Subject: [PATCH] reverted
---
.../fess/es/config/allcommon/EsAbstractConditionBean.java | 2 +-
.../fess/es/config/allcommon/EsAbstractConditionQuery.java | 1 +
.../codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java | 2 +-
.../fess/es/log/allcommon/EsAbstractConditionQuery.java | 1 +
.../fess/es/user/allcommon/EsAbstractConditionBean.java | 2 +-
.../fess/es/user/allcommon/EsAbstractConditionQuery.java | 1 +
6 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
index c68d5441b..04adeb26c 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/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) {
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index 0b40e9ef0..ac237d822 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/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;
}
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
index 8408c3244..29f0c17be 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/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) {
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index f43ba1b97..5e7cb3a84 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/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;
}
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
index 8a23f9df1..4e25d5bed 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/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) {
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index 4bc28c238..91e6c312e 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/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;
}
--
GitLab