diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-14 15:19:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 15:19:34 +0200 |
commit | 5736566c2dc551b4f059011e99f68eea1fb1a32b (patch) | |
tree | 26c7bc7925edaf7e2df1c5aacdad8255e94b4075 /messagebus | |
parent | e3c6ab4ce1f42c348c04e1f35a4a1a2e647e3256 (diff) | |
parent | 28862ccc448cae25719452e7f29d16872498fbbb (diff) |
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…
Diffstat (limited to 'messagebus')
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 d7105a92f16..2a469d64857 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 26c103e7877..72cc6ef41fd 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 ea217af5b9a..f9797be9db0 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", |