diff options
| author | Harald Musum <musum@yahooinc.com> | 2021-09-08 09:25:48 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2021-09-08 09:25:48 +0200 |
| commit | 2e281a0e35a2a0bf96c34642fbe169d32fda19d6 (patch) | |
| tree | 333f1ce87e1956dfa845ecb4a112139282d22904 /configserver | |
| parent | b4e87c7a777d62026080fd0ee45e34c69c1ea71c (diff) | |
Remove def md5 from ConfigKey
Diffstat (limited to 'configserver')
2 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java index 0afb3049f6e..df1427bdf6d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.application; import com.yahoo.collections.Pair; @@ -102,7 +102,7 @@ public class Application implements ModelResult { long start = System.currentTimeMillis(); metricUpdater.incrementRequests(); ConfigKey<?> configKey = req.getConfigKey(); - String defMd5 = configKey.getMd5(); + String defMd5 = req.getRequestDefMd5(); if (defMd5 == null || defMd5.isEmpty()) { defMd5 = ConfigUtils.getDefMd5(req.getDefContent().asList()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java index 12debc347de..8d402f57103 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java @@ -264,7 +264,7 @@ public class MultiTenantRpcAuthorizerTest { Cursor request = data.setObject(); request.setString("defName", configKey.getName()); request.setString("defNamespace", configKey.getNamespace()); - request.setString("defMD5", configKey.getMd5()); + request.setString("defMD5", ""); request.setString("configId", configKey.getConfigId()); request.setString("clientHostname", hostname); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { |