aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2021-11-30 10:58:29 +0100
committerJon Bratseth <bratseth@gmail.com>2021-11-30 10:58:29 +0100
commit4f0d66e0be38fa9e6e681fa47f6ce5320f950f67 (patch)
tree155e60bdbbf6d171a2890597fb54421619008339 /container-search
parent1c3caafc1d8b877dfc390e425bb25cc473f56fa3 (diff)
Cleanup: No functional changes
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/NullItem.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java6
2 files changed, 2 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
index 1c7716be295..49c7b4d8ff6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/NullItem.java
@@ -1,12 +1,10 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.prelude.query;
-
import java.nio.ByteBuffer;
-
/**
- * A place holder for null queries to make searchers easier to write.
+ * A placeholder for null queries to make searchers easier to write.
*
* @author Steinar Knutsen
*/
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 52a3672e7a2..739058ade71 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -476,7 +476,7 @@ public class SearchHandler extends LoggingRequestHandler {
+ Exceptions.toMessageString(e));
log.log(Level.FINE, error::getDetailedMessage);
return new Result(query, error);
- } catch (IllegalArgumentException e) {
+ } catch (Exception e) {
log(request, query, e);
return new Result(query, ErrorMessage.createUnspecifiedError("Failed: " +
Exceptions.toMessageString(e), e));
@@ -487,10 +487,6 @@ public class SearchHandler extends LoggingRequestHandler {
Exceptions.toMessageString(e), e);
log(request, query, e);
return new Result(query, error);
- } catch (Exception e) {
- log(request, query, e);
- return new Result(query, ErrorMessage.createUnspecifiedError("Failed: " +
- Exceptions.toMessageString(e), e));
}
}