From a06aa2a2963df9469f966ca3582106ae857db344 Mon Sep 17 00:00:00 2001
From: Julien Viet <julien@julienviet.com>
Date: Fri, 18 Oct 2019 13:16:20 +0200
Subject: [PATCH] Reply address is never set in MessageImpl constructor

---
 src/main/java/io/vertx/core/eventbus/impl/EventBusImpl.java  | 2 +-
 src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java   | 3 +--
 .../core/eventbus/impl/clustered/ClusteredEventBus.java      | 2 +-
 .../vertx/core/eventbus/impl/clustered/ClusteredMessage.java | 4 ++--
 .../vertx/core/eventbus/impl/clustered/ConnectionHolder.java | 5 +----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/vertx/core/eventbus/impl/EventBusImpl.java b/src/main/java/io/vertx/core/eventbus/impl/EventBusImpl.java
index 3b1304309..90001bd64 100644
--- a/src/main/java/io/vertx/core/eventbus/impl/EventBusImpl.java
+++ b/src/main/java/io/vertx/core/eventbus/impl/EventBusImpl.java
@@ -235,7 +235,7 @@ public class EventBusImpl implements EventBus, MetricsProvider {
     Objects.requireNonNull(address, "no null address accepted");
     MessageCodec codec = codecManager.lookupCodec(body, codecName);
     @SuppressWarnings("unchecked")
-    MessageImpl msg = new MessageImpl(address, null, headers, body, codec, send, src, this);
+    MessageImpl msg = new MessageImpl(address, headers, body, codec, send, src, this);
     return msg;
   }
 
diff --git a/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java b/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java
index 8c85e5c36..cc3bc9766 100644
--- a/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java
+++ b/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java
@@ -43,12 +43,11 @@ public class MessageImpl<U, V> implements Message<V> {
     this.src = src;
   }
 
-  public MessageImpl(String address, String replyAddress, MultiMap headers, U sentBody,
+  public MessageImpl(String address, MultiMap headers, U sentBody,
                      MessageCodec<U, V> messageCodec,
                      boolean send, boolean src, EventBusImpl bus) {
     this.messageCodec = messageCodec;
     this.address = address;
-    this.replyAddress = replyAddress;
     this.headers = headers;
     this.sentBody = sentBody;
     this.send = send;
diff --git a/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredEventBus.java b/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredEventBus.java
index 402c85442..ef7991d7e 100644
--- a/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredEventBus.java
+++ b/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredEventBus.java
@@ -178,7 +178,7 @@ public class ClusteredEventBus extends EventBusImpl {
     Objects.requireNonNull(address, "no null address accepted");
     MessageCodec codec = codecManager.lookupCodec(body, codecName);
     @SuppressWarnings("unchecked")
-    ClusteredMessage msg = new ClusteredMessage(serverID, address, null, headers, body, codec, send, src, this);
+    ClusteredMessage msg = new ClusteredMessage(serverID, address, headers, body, codec, send, src, this);
     return msg;
   }
 
diff --git a/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java b/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java
index 67fb94ce8..6dd26d4df 100644
--- a/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java
+++ b/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java
@@ -46,9 +46,9 @@ public class ClusteredMessage<U, V> extends MessageImpl<U, V> {
     super(src, bus);
   }
 
-  public ClusteredMessage(ServerID sender, String address, String replyAddress, MultiMap headers, U sentBody,
+  public ClusteredMessage(ServerID sender, String address, MultiMap headers, U sentBody,
                           MessageCodec<U, V> messageCodec, boolean send, boolean src, EventBusImpl bus) {
-    super(address, replyAddress, headers, sentBody, messageCodec, send, src, bus);
+    super(address, headers, sentBody, messageCodec, send, src, bus);
     this.sender = sender;
   }
 
diff --git a/src/main/java/io/vertx/core/eventbus/impl/clustered/ConnectionHolder.java b/src/main/java/io/vertx/core/eventbus/impl/clustered/ConnectionHolder.java
index 83a74818a..5584cf914 100644
--- a/src/main/java/io/vertx/core/eventbus/impl/clustered/ConnectionHolder.java
+++ b/src/main/java/io/vertx/core/eventbus/impl/clustered/ConnectionHolder.java
@@ -11,9 +11,6 @@
 
 package io.vertx.core.eventbus.impl.clustered;
 
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.eventbus.EventBusOptions;
@@ -139,7 +136,7 @@ class ConnectionHolder {
         close();
       });
       ClusteredMessage pingMessage =
-        new ClusteredMessage<>(serverID, PING_ADDRESS, null, null, null, new PingMessageCodec(), true, true, eventBus);
+        new ClusteredMessage<>(serverID, PING_ADDRESS, null, null, new PingMessageCodec(), true, true, eventBus);
       Buffer data = pingMessage.encodeToWire();
       socket.write(data);
     });