diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-05-08 10:17:46 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-08 10:17:46 +0200 |
| commit | 5be64db3f9532c7523df58fb20d8ba3c00cc169e (patch) | |
| tree | 1eaf8a086f6715a504b9b0e2b39c403f63aedd3d /container-search | |
| parent | eb91429319fa52c6c70cfd4c1d133e10b78fb11c (diff) | |
Nonfunctional changes
Diffstat (limited to 'container-search')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/Presentation.java | 4 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java index 13196488e98..e147b14071a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java +++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java @@ -134,9 +134,9 @@ public class Presentation implements Cloneable { @Override public boolean equals(Object o) { - if (o == null || !(o instanceof Presentation)) return false; + if ( ! (o instanceof Presentation)) return false; Presentation p = (Presentation) o; - return QueryHelper.equals(bolding,p.bolding) && QueryHelper.equals(summary,p.summary); + return QueryHelper.equals(bolding, p.bolding) && QueryHelper.equals(summary, p.summary); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java index df9f2af0cce..b2791875d27 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java +++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java @@ -128,8 +128,7 @@ public class FieldFiller extends Searcher { Set<String> summaryFields = result.getQuery().getPresentation().getSummaryFields(); - if (summaryFields.isEmpty() || - summaryClass == null || + if (summaryFields.isEmpty() || summaryClass == null || result.getQuery().properties().getBoolean(FIELD_FILLER_DISABLE)) { return; } |