Skip to content

Commit 09482e5

Browse files
nikagradkropachev
andauthored
Update driver-core/src/main/java/com/datastax/driver/core/policies/TokenAwarePolicy.java
Co-authored-by: Dmitry Kropachev <dmitry.kropachev@gmail.com>
1 parent 1a3a14f commit 09482e5

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

driver-core/src/main/java/com/datastax/driver/core/policies/TokenAwarePolicy.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,11 @@ public Iterator<Host> newQueryPlan(final String loggedKeyspace, final Statement
441441
}
442442

443443
private QueryOptions.RequestRoutingMethod getRequestRouting(Statement statement) {
444-
return (statement.isLWT()
445-
&& defaultLwtRequestRoutingMethod == QueryOptions.RequestRoutingMethod.REGULAR)
446-
|| !statement.isLWT()
447-
? QueryOptions.RequestRoutingMethod.REGULAR
448-
: QueryOptions.RequestRoutingMethod.PRESERVE_REPLICA_ORDER;
449-
}
444+
if (!statement.isLWT() || defaultLwtRequestRoutingMethod == null) {
445+
return QueryOptions.RequestRoutingMethod.REGULAR;
446+
}
447+
return defaultLwtRequestRoutingMethod;
448+
}
450449

451450
private Iterator<Host> newQueryPlanRegular(
452451
String keyspace, Statement statement, List<Host> replicas) {

0 commit comments

Comments
 (0)