diff options
Diffstat (limited to 'messagebus')
| -rw-r--r-- | messagebus/pom.xml | 7 | ||||
| -rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/Message.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java | 2 | ||||
| -rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 9bd123ad6bd..4e9984e482c 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -50,6 +50,13 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>4</forkCount> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <compilerArgs> diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Message.java b/messagebus/src/main/java/com/yahoo/messagebus/Message.java index 6848ffc55d8..696211d7c45 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Message.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Message.java @@ -101,7 +101,7 @@ public abstract class Message extends Routable { } /** - * <p>Sets the numer of milliseconds that remain before this message times out. Please see comment on {@link + * <p>Sets the number of milliseconds that remain before this message times out. Please see comment on {@link * #isExpired()} for more information on how to determine whether or not a message has expired.</p> * * @param timeRemaining The number of milliseconds until expiration. diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java index db22363785d..e69c2e82c04 100755..100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java @@ -13,7 +13,7 @@ import com.yahoo.cloud.config.SlobroksConfig; public class RPCNetworkParams { private Identity identity = new Identity(""); - private String slobrokConfigId = "admin/slobrok.0"; + private String slobrokConfigId = "client"; private SlobroksConfig slobroksConfig = null; private int listenPort = 0; private int maxInputBufferSize = 256 * 1024; diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp index c90e48cb5e5..d440d3b012b 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp @@ -6,7 +6,7 @@ namespace mbus { RPCNetworkParams::RPCNetworkParams() - : RPCNetworkParams("admin/slobrok.0") + : RPCNetworkParams("client") { } RPCNetworkParams::RPCNetworkParams(config::ConfigUri configUri) : |