diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-09-01 15:56:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 15:56:28 +0200 |
| commit | 96d24924eed043c9d8df7694375828745889faa2 (patch) | |
| tree | 5810bbe78d7beccdbe5751df1c88d6b8680d093e /configserver | |
| parent | a5a7789218d9fb5a569eb8f3feec6747f9ec2ca3 (diff) | |
| parent | 38bfeeadafabeeef540157e440224b03ba80ed4d (diff) | |
Merge pull request #23878 from vespa-engine/bratseth/moodel-config
Bratseth/model config
Diffstat (limited to 'configserver')
3 files changed, 2 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java index b8d998a5b3d..0a9d6e36767 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java @@ -11,7 +11,6 @@ import java.util.List; * Represents a request for listing files within an application package. * * @author Ulf Lilleengen - * @since 5.1 */ class SessionContentListResponse extends SlimeJsonResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java index d0c4f43359a..d63dc714b9d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java @@ -29,7 +29,7 @@ public class SessionHandler extends HttpHandler { * Set to make sure that timeout for the handler is higher than any timeouts used inside the handler (e.g. zookeeper barrier timeout) * Setting this too low will lead to a response with status code 504 and empty response body. */ - @Override + @Override public Duration getTimeout() { return Duration.ofSeconds(applicationRepository.configserverConfig().zookeeper().barrierTimeout()).plus(Duration.ofSeconds(30)); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java index 95196abf16d..4656834d033 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java @@ -25,8 +25,7 @@ public class SessionContentHandler extends SessionHandler { private final ContentHandler contentHandler = new ContentHandler(); @Inject - public SessionContentHandler(Context ctx, - ApplicationRepository applicationRepository) { + public SessionContentHandler(Context ctx, ApplicationRepository applicationRepository) { super(ctx, applicationRepository); } |