Merge pull request #185 from yahoo/musum/throw-when-asked-for-config-that-does-not-exist

Throw instead of returning null when asked for unknown config

3 files changed, 1 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
index 95a84629881..1861965947c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigProcessor.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.config.UnknownConfigIdException;
 import com.yahoo.vespa.config.protocol.*;
 import com.yahoo.vespa.config.util.ConfigUtils;
 
-import java.net.UnknownHostException;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
index 53c54045bf6..a1c17a93022 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/RpcServer.java
@@ -20,7 +20,6 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.config.ErrorCode;
 import com.yahoo.vespa.config.JRTMethods;
 import com.yahoo.vespa.config.protocol.ConfigResponse;
-import com.yahoo.vespa.config.protocol.JRTConfigRequest;
 import com.yahoo.vespa.config.protocol.JRTServerConfigRequest;
 import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3;
 import com.yahoo.vespa.config.protocol.Trace;
@@ -289,7 +288,6 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         }
         RequestHandler handler = context.requestHandler();
         return handler.resolveConfig(context.applicationId(), request, vespaVersion);
-
     }
 
     protected Supervisor getSupervisor() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
index 1d34d4a0c00..c6aa5ed7f8e 100755
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
@@ -45,7 +45,7 @@ public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Prod
             getConfig(builder);
             return ConfigPayload.fromInstance(new RoutingConfig(builder));
         } else {
-            return null;
+            throw new RuntimeException(configKey + " is not valid when asking for config from SuperModel");
         }
     }