diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-14 10:49:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 10:49:03 +0200 |
| commit | cb943c079ba1cd53f9e70e92e9c03343e85ec780 (patch) | |
| tree | 768db3cfdda94fd96b73783bde9495ca964032e3 /container-search/src | |
| parent | e2b7c6ed50d94e83e2fc00c8716fcc68ad2a9fbb (diff) | |
| parent | 4b60cf8292efa0b9dcb06217813835dc3c873698 (diff) | |
Merge pull request #7299 from vespa-engine/bratseth/prevent-xxe-in-xmlfeedreader
Prevent XXE
Diffstat (limited to 'container-search/src')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/result/HitGroup.java | 1 |
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 483f55f9c92..c008b133595 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; |