Merge pull request #445 from yahoo/hmusum/remove-check-for-outdated-config

Remove check for changed payload without changed generation

1 files changed, 0 insertions, 7 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
index 2cb61cac427..9d42b6b077c 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
@@ -5,7 +5,6 @@ import com.yahoo.jrt.*;
 import com.yahoo.slime.*;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.ConfigKey;
-import com.yahoo.vespa.config.ErrorCode;
 import com.yahoo.vespa.config.util.ConfigUtils;
 
 import java.io.ByteArrayOutputStream;
@@ -187,12 +186,6 @@ public abstract class SlimeClientConfigRequest implements JRTClientConfigRequest
             log.warning("Invalid return types for config response: " + errorMessage());
             return false;
         }
-        if (hasUpdatedConfig() && ! hasUpdatedGeneration()) {
-            request.setError(ErrorCode.OUTDATED_CONFIG, "Config payload has changed (old config md5:" +
-                    getRequestConfigMd5() + ", new config md5: " + getNewConfigMd5() +"), but new generation " +
-                    getNewGeneration() + " is not newer than current generation " + getRequestGeneration()  + ".");
-            return false;
-        }
         return true;
     }