diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-14 19:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 19:20:56 +0200 |
| commit | 7518ce3820175680c68b4d574a1520028d663092 (patch) | |
| tree | e5ff47b26436a22ab02a548f79ff29b0d02c800f /vespaclient-container-plugin | |
| parent | 46e014afbe93b74b977ea1c0055df3ae063cadb3 (diff) | |
Revert "Simplify and correct isFilled"
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 3 insertions, 2 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 52d999f1a52..61ff84cfdaa 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,6 +43,7 @@ import java.util.zip.GZIPInputStream; * Accept feeds from outside of the Vespa cluster. * * @author Steinar Knutsen + * @since 5.1 */ public class FeedHandler extends LoggingRequestHandler { @@ -130,7 +131,7 @@ public class FeedHandler extends LoggingRequestHandler { int version; if (washedClientVersions.contains("3")) { version = 3; - } else if (washedClientVersions.contains("2")) { // TODO: Vespa 7: Remove support for Version 2 + } else if (washedClientVersions.contains("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 874509dd2f8..060cd6ca0a6 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 Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class FeederSettings { |