Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 5aa19cb68 -> 69bf1c6e4 refs/heads/cassandra-3.1 be99f44ef -> eb0f56dd2 refs/heads/trunk 084590c41 -> 34be4d61c
Fix mixed-node versions during AbstractReadExecutor.makeRequests after upgrade Patch by slebresne; reviewed by jmckenzie for CASSANDRA-10122 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69bf1c6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69bf1c6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69bf1c6e Branch: refs/heads/cassandra-3.0 Commit: 69bf1c6e4ed89e34fec53fab600b42e1ede0c018 Parents: 5aa19cb Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:30:45 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:30:45 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bf1c6e/src/java/org/apache/cassandra/service/AbstractReadExecutor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java index 41d7bc6..05fa437 100644 --- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java +++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java @@ -93,7 +93,6 @@ public abstract class AbstractReadExecutor private void makeRequests(ReadCommand readCommand, Iterable<InetAddress> endpoints) { - MessageOut<ReadCommand> message = null; boolean hasLocalEndpoint = false; for (InetAddress endpoint : endpoints) @@ -107,8 +106,7 @@ public abstract class AbstractReadExecutor if (traceState != null) traceState.trace("reading {} from {}", readCommand.isDigestQuery() ? "digest" : "data", endpoint); logger.trace("reading {} from {}", readCommand.isDigestQuery() ? "digest" : "data", endpoint); - if (message == null) - message = readCommand.createMessage(MessagingService.instance().getVersion(endpoint)); + MessageOut<ReadCommand> message = readCommand.createMessage(MessagingService.instance().getVersion(endpoint)); MessagingService.instance().sendRRWithFailure(message, endpoint, handler); }
