diff options
| author | Paul Rogers <progers@maprtech.com> | 2017-09-28 09:49:38 -0700 |
|---|---|---|
| committer | Paul Rogers <progers@maprtech.com> | 2017-10-11 13:14:56 -0700 |
| commit | 42f7af22fc5d713aac07e057fd374ccd674e40df (patch) | |
| tree | f3ca668122c6274f09078ec3b5066e9522f0cda5 /exec/java-exec/src/main/java/org/apache/drill/exec/work | |
| parent | fe84713169d410c40da80d6faf658ba2ac884ccc (diff) | |
DRILL-5830: Resolve regressions to MapR DB from DRILL-5546
- Back out HBase changes
- Code cleanup
- Test utilities
- Fix for DRILL-5829
closes #968
Diffstat (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/work')
| -rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DistributedQueryQueue.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DistributedQueryQueue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DistributedQueryQueue.java index f4c5536a4..73e8de67a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DistributedQueryQueue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DistributedQueryQueue.java @@ -183,6 +183,9 @@ public class DistributedQueryQueue implements QueryQueue { */ public boolean isSameAs(ConfigSet otherSet) { + if (otherSet == null) { + return false; + } return queueThreshold == otherSet.queueThreshold && queueTimeout == otherSet.queueTimeout && largeQueueSize == otherSet.largeQueueSize && |