Fix DC local tests in LBP

Sylvain Lebresne · Sylvain Lebresne · commit 99b28742dfce · 2014-03-18T17:44:14.000+01:00
Conflicts:

	driver-core/src/main/java/com/datastax/driver/core/policies/DCAwareRoundRobinPolicy.java
	driver-core/src/main/java/com/datastax/driver/core/policies/RoundRobinPolicy.java
diff --git a/driver-core/src/main/java/com/datastax/driver/core/policies/DCAwareRoundRobinPolicy.java b/driver-core/src/main/java/com/datastax/driver/core/policies/DCAwareRoundRobinPolicy.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.AbstractIterator;
 
 import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.Host;
 import com.datastax.driver.core.HostDistance;
 import com.datastax.driver.core.Query;
@@ -235,7 +236,7 @@ protected Host computeNext() {
                     return currentDcHosts.get(c);
                 }
 
-                if (dontHopForLocalCL && query.getConsistencyLevel().isDCLocal())
+                if (dontHopForLocalCL && query.getConsistencyLevel() != null && query.getConsistencyLevel().isDCLocal())
                     return endOfData();
 
                 if (remoteDcs == null) {
diff --git a/driver-core/src/main/java/com/datastax/driver/core/policies/RoundRobinPolicy.java b/driver-core/src/main/java/com/datastax/driver/core/policies/RoundRobinPolicy.java
@@ -27,6 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.Host;
 import com.datastax.driver.core.HostDistance;
 import com.datastax.driver.core.Query;
@@ -93,7 +94,7 @@ public HostDistance distance(Host host) {
     @Override
     public Iterator<Host> newQueryPlan(Query query) {
 
-        if (!hasLoggedLocalCLUse && query.getConsistencyLevel().isDCLocal()) {
+        if (!hasLoggedLocalCLUse && query.getConsistencyLevel() != null && query.getConsistencyLevel().isDCLocal()) {
             hasLoggedLocalCLUse = true;
             logger.warn("Detected request at Consistency Level {} but the non-DC aware RoundRobinPolicy is in use. "
                       + "It is strongly advised to use DCAwareRoundRobinPolicy if you have multiple DCs/use DC-aware consistency levels "
