keep retry delay from packet

* keep retry delay if it's set to some specific (positive)
  value in the reply already.

1 files changed, 6 insertions, 2 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
index fdb4b8f6339..7f8121c2138 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
@@ -326,9 +326,13 @@ public class StoragePolicy extends ExternalSlobrokPolicy {
                 }
             }
             if (context.usedState != null && newState.getVersion() <= context.usedState.getVersion()) {
-                reply.setRetryDelay(-1);
+                if (reply.getRetryDelay() <= 0.0) {
+                    reply.setRetryDelay(-1);
+                }
             } else {
-                reply.setRetryDelay(0);
+                if (reply.getRetryDelay() <= 0.0) {
+                    reply.setRetryDelay(0);
+                }
             }
             if (context.calculatedDistributor == null) {
                 if (cachedClusterState == null) {