Remove overridden timeout

* We only need higher timeout when preparing deployments, where
  timeout is overridden in SessionPrepareHandler

1 files changed, 0 insertions, 8 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
index a1fd3ffd729..cc78c2715e2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
@@ -13,7 +13,6 @@ import com.yahoo.yolean.Exceptions;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.time.Duration;
 import java.util.concurrent.Executor;
 
 /**
@@ -70,13 +69,6 @@ public class HttpHandler extends LoggingRequestHandler {
         }
     }
 
-    // Override default, since we need a higher timeout for some calls
-    // TODO: Review and see if overriding only in SessionPrepareHandler is enough
-    @Override
-    public Duration getTimeout() {
-        return Duration.ofSeconds(910);
-    }
-
     private String getMessage(Exception e, HttpRequest request) {
         if (request.getBooleanProperty("debug")) {
             StringWriter sw = new StringWriter();