From fee22fc0b240a9f3fd4d69c2cf495757af3a764b Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 22 Jul 2014 00:43:01 +0300 Subject: [PATCH] [Discovery] fix MembershipAction.sendJoinRequestBlocking should now expect an empty response The change introduced in #6949 (do not serialize the cluster state) also means master now responds with an empty response rather then a JoinResponse. However, sendJoinRequestBlocking still expected a JoinRequest. --- .../discovery/zen/membership/MembershipAction.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java index caffd2b618d..164db1809fd 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java +++ b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java @@ -92,12 +92,8 @@ public class MembershipAction extends AbstractComponent { } public void sendJoinRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node, TimeValue timeout) throws ElasticsearchException { - transportService.submitRequest(masterNode, JoinRequestRequestHandler.ACTION, new JoinRequest(node), new FutureTransportResponseHandler() { - @Override - public JoinResponse newInstance() { - return new JoinResponse(); - } - }).txGet(timeout.millis(), TimeUnit.MILLISECONDS); + transportService.submitRequest(masterNode, JoinRequestRequestHandler.ACTION, new JoinRequest(node), EmptyTransportResponseHandler.INSTANCE_SAME) + .txGet(timeout.millis(), TimeUnit.MILLISECONDS); } /**