diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
| commit | 1db80c6ab30aafd0e8c3cc09091f9949e9488145 (patch) | |
| tree | e4534ee6925175563beb5c294976f70755903d02 /messagebus | |
| parent | b1a1038d66df81646bed462295761d1aeed2c1e9 (diff) | |
| parent | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (diff) | |
Merge branch 'master' into hakonhall/define-enable-logserver-flag
Diffstat (limited to 'messagebus')
| -rw-r--r-- | messagebus/pom.xml | 4 | ||||
| -rwxr-xr-x | messagebus/src/main/java/com/yahoo/messagebus/Routable.java | 2 | ||||
| -rwxr-xr-x | messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/messagebus/pom.xml b/messagebus/pom.xml index e949088e737..358ce7cc63f 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -7,11 +7,11 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>messagebus</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> <dependency> diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Routable.java b/messagebus/src/main/java/com/yahoo/messagebus/Routable.java index e761a874ac1..792ec4d27cd 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/Routable.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Routable.java @@ -60,7 +60,7 @@ public abstract class Routable { /** * <p>This is a convenience method for calling {@link CallStack#pop(Routable)} on the {@link CallStack} of this - * Routable. It equals calling <tt>routable.getCallStack().pop(routable)</tt>.</p> + * Routable. It equals calling <code>routable.getCallStack().pop(routable)</code>.</p> * * @return The handler that was popped. * @see CallStack#pop(Routable) 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 3049639586d..d2d8031a689 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java @@ -258,7 +258,7 @@ public class RoutingNode implements ReplyHandler { } /** - * If a reply has been set containing an error, and {@link #shouldIgnoreResult()} returns <tt>true</tt>, this method + * If a reply has been set containing an error, and {@link #shouldIgnoreResult()} returns <code>true</code>, this method * replaces that reply with one that has no error. * * @return Whether or not the reply was replaced. |