Avoid potential NullPtrException and add some more information in case something odd happens.

3 files changed, 10 insertions, 1 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java
index c6b26ffe3e2..e4efd951366 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java
@@ -34,6 +34,11 @@ public class RoutingContext {
         this.directive = directive;
     }
 
+    public String toString() {
+        return "node : " + node + ", directive: " + directive + ", errors: " + consumableErrors +
+                ", selectOnRetry: " + selectOnRetry + " context: " + context;
+    }
+
     /**
      * <p>Returns whether or not this hop has any configured recipients.</p>
      *
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java
index b69e24eb55c..1169973f118 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java
@@ -492,7 +492,7 @@ public class RoutingNode implements ReplyHandler {
         return false;
     }
 
-    private String exceptionMessageWithTrace(Exception e) {
+    private static String exceptionMessageWithTrace(Exception e) {
         StringWriter sw = new StringWriter();
         try (PrintWriter pw = new PrintWriter(sw)) {
             e.printStackTrace(pw);
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
index 4ca97dc80ec..0c738db4242 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
@@ -121,6 +121,10 @@ public class RoutingContextTestCase extends junit.framework.TestCase {
         }
     }
 
+    public void testToString() {
+        assertEquals("node : null, directive: 1, errors: [], selectOnRetry: true context: null", new RoutingContext(null, 1).toString());
+    }
+
     public void testConstRoute() {
         SimpleProtocol protocol = new SimpleProtocol();
         protocol.addPolicyFactory("DocumentRouteSelector",