summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java2
-rw-r--r--jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java18
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/Message.java4
3 files changed, 12 insertions, 12 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
index 80f1f003412..0f3f3938701 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
/**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
*/
public class MbusRequestContext implements RequestContext, ResponseHandler {
diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
index d0f5de54b4f..bc3d1edda7c 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
@@ -32,7 +32,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider
private final ResourceReference sessionReference;
@Inject
- public MbusServer(final CurrentContainer container, final ServerSession session) {
+ public MbusServer(CurrentContainer container, ServerSession session) {
this.container = container;
this.session = session;
uri = URI.create("mbus://localhost/" + session.name());
@@ -60,7 +60,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider
}
@Override
- public void handleMessage(final Message msg) {
+ public void handleMessage(Message msg) {
if (!running.get()) {
dispatchErrorReply(msg, ErrorCode.SESSION_BUSY, "Session temporarily closed.");
return;
@@ -73,7 +73,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider
try {
request = new MbusRequest(container, uri, msg);
content = request.connect(new ServerResponseHandler(msg));
- } catch (final RuntimeException e) {
+ } catch (RuntimeException e) {
dispatchErrorReply(msg, ErrorCode.APP_FATAL_ERROR, e.toString());
} finally {
if (request != null) {
@@ -89,8 +89,8 @@ public final class MbusServer extends AbstractResource implements ServerProvider
return session.connectionSpec();
}
- private void dispatchErrorReply(final Message msg, final int errCode, final String errMsg) {
- final Reply reply = new EmptyReply();
+ private void dispatchErrorReply(Message msg, int errCode, String errMsg) {
+ Reply reply = new EmptyReply();
reply.swapState(msg);
reply.addError(new Error(errCode, errMsg));
session.sendReply(reply);
@@ -100,20 +100,20 @@ public final class MbusServer extends AbstractResource implements ServerProvider
final Message msg;
- ServerResponseHandler(final Message msg) {
+ ServerResponseHandler(Message msg) {
this.msg = msg;
}
@Override
- public ContentChannel handleResponse(final Response response) {
- final Reply reply;
+ public ContentChannel handleResponse(Response response) {
+ Reply reply;
if (response instanceof MbusResponse) {
reply = ((MbusResponse)response).getReply();
} else {
reply = new EmptyReply();
reply.swapState(msg);
}
- final Error err = StatusCodes.toMbusError(response.getStatus());
+ Error err = StatusCodes.toMbusError(response.getStatus());
if (err != null) {
if (err.isFatal()) {
if (!reply.hasFatalErrors()) {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Message.java b/messagebus/src/main/java/com/yahoo/messagebus/Message.java
index 22496487f61..43f5c8d2dfd 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/Message.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Message.java
@@ -5,9 +5,9 @@ import com.yahoo.concurrent.SystemTimer;
import com.yahoo.messagebus.routing.Route;
/**
- * <p>A message is a child of Routable, it is not a reply, and it has a sequencing identifier. Furthermore, a message
+ * A message is a child of Routable, it is not a reply, and it has a sequencing identifier. Furthermore, a message
* contains a retry counter that holds what retry the message is currently on. See the method comment {@link #getRetry}
- * for more information.</p>
+ * for more information.
*
* @author Simon Thoresen Hult
*/