summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-13 10:17:45 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-13 10:17:45 +0200
commit4b60cf8292efa0b9dcb06217813835dc3c873698 (patch)
treee3c09e0508b86ef010c778f4cbdc7c17fa566c5a /container-search
parent5066a1a539011d38f932f3e2d98a94645ed6b9a7 (diff)
Prevent XXE
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/HitGroup.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
index cb7f5215c7c..3896e817429 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
@@ -38,7 +38,7 @@ public class ClusterMonitor<T> {
private final Map<T, BaseNodeMonitor<T>> nodeMonitors = Collections.synchronizedMap(new java.util.LinkedHashMap<>());
/** @deprecated use the constructor with just the first argument instead */
- @Deprecated
+ @Deprecated // TODO: Remove on Vespa 7
public ClusterMonitor(NodeManager<T> manager, String ignored) {
this(manager);
}
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 022ef9950b3..cc0aea74d70 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -16,7 +16,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Set;
import java.util.stream.Collectors;