Merge pull request #2747 from yahoo/balder/add-some-more-debug-information-in-case-of-error-and-avoid-potential-nullptr-exception

Avoid potential NullPtrException and add some more information in cas…

1 files changed, 6 insertions, 1 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 de0ce196678..054c889dbfd 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
@@ -477,7 +477,12 @@ public class StoragePolicy extends ExternalSlobrokPolicy {
     @Override
     public void merge(RoutingContext context) {
         RoutingNodeIterator it = context.getChildIterator();
-        Reply reply = it.removeReply();
+        Reply reply = (it.hasReply()) ? it.removeReply() : context.getReply();
+        if (reply == null) {
+            reply = new EmptyReply();
+            reply.addError(new Error(ErrorCode.NO_ADDRESS_FOR_SERVICE,
+                    "No reply in any children, nor in the routing context: " + context));
+        }
 
         if (reply instanceof WrongDistributionReply) {
             distributorSelectionLogic.handleWrongDistribution((WrongDistributionReply) reply, context);