Refuse config only when there is a possibility of incompatible Java bundles

2 files changed, 6 insertions, 12 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
index be935043dc0..7de2de017ee 100644
--- a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
+++ b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java
@@ -70,6 +70,12 @@ public class PayloadChecksums {
 
     public boolean isEmpty() { return this.equals(empty()); }
 
+    public boolean matches(PayloadChecksums other) {
+        if (getForType(XXHASH64) != null) return getForType(XXHASH64).equals(other.getForType(XXHASH64));
+        if (getForType(MD5) != null) return getForType(MD5).equals(other.getForType(MD5));
+        return true;
+    }
+
     @Override
     public String toString() {
         return checksums.values().stream()
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
index 771068aa67a..c7326ea37f1 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
@@ -26,18 +26,6 @@ public interface ConfigResponse {
 
     void serialize(OutputStream os, CompressionType uncompressed) throws IOException;
 
-    default boolean hasEqualConfig(JRTServerConfigRequest request) {
-        PayloadChecksums payloadChecksums = getPayloadChecksums();
-        PayloadChecksum xxhash64 = payloadChecksums.getForType(PayloadChecksum.Type.XXHASH64);
-        PayloadChecksum md5 = payloadChecksums.getForType(PayloadChecksum.Type.MD5);
-        if (xxhash64 != null)
-            return xxhash64.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.XXHASH64));
-        if (md5 != null)
-            return md5.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.MD5));
-
-        return true;
-    }
-
     default boolean hasNewerGeneration(JRTServerConfigRequest request) {
         return (getGeneration() > request.getRequestGeneration());
     }