diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-14 22:21:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 22:21:27 +0200 |
| commit | 777a6a5fca253a104c97f47ccdad1f231f1e951b (patch) | |
| tree | 2ddf8ceb4b46c15683ad5eedb3c78d35dfac188a /vespaclient-container-plugin | |
| parent | 570222ec5aa05a3c56d8876cf910e9aa7da42acf (diff) | |
Revert "Revert "Simplify and correct isFilled""
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 2 insertions, 3 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java index 61ff84cfdaa..52d999f1a52 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java @@ -43,7 +43,6 @@ import java.util.zip.GZIPInputStream; * Accept feeds from outside of the Vespa cluster. * * @author Steinar Knutsen - * @since 5.1 */ public class FeedHandler extends LoggingRequestHandler { @@ -131,7 +130,7 @@ public class FeedHandler extends LoggingRequestHandler { int version; if (washedClientVersions.contains("3")) { version = 3; - } else if (washedClientVersions.contains("2")) { + } else if (washedClientVersions.contains("2")) { // TODO: Vespa 7: Remove support for Version 2 version = 2; } else { return new Tuple2<>(new ErrorHttpResponse( diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java index 060cd6ca0a6..874509dd2f8 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java @@ -9,7 +9,7 @@ import com.yahoo.vespa.http.client.core.Headers; /** * Wrapper for the feed feederSettings read from HTTP request. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class FeederSettings { |