Check timeZone() argument in AbstractSqlQueryRequest (#31822)

A value of `null` will throw an IAE.
elastic · Jul 6, 2018 · 03adbf2 · 03adbf2
1 parent 89cb087
commit 03adbf2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.../sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java b/.../sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java
@@ -112,7 +112,7 @@ public TimeZone timeZone() {
     }
 
     public AbstractSqlQueryRequest timeZone(TimeZone timeZone) {
-        if (query == null) {
+        if (timeZone == null) {
             throw new IllegalArgumentException("time zone may not be null.");
         }
         this.timeZone = timeZone;

diff --git a/...sql/sql-action/src/test/java/org/elasticsearch/xpack/sql/action/SqlQueryRequestTests.java b/...sql/sql-action/src/test/java/org/elasticsearch/xpack/sql/action/SqlQueryRequestTests.java
@@ -110,4 +110,10 @@ protected SqlQueryRequest mutateInstance(SqlQueryRequest instance) {
         mutator.accept(newRequest);
         return newRequest;
     }
+
+    public void testTimeZoneNullException() {
+        final SqlQueryRequest sqlQueryRequest = createTestInstance();
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> sqlQueryRequest.timeZone(null));
+        assertEquals("time zone may not be null.", e.getMessage());
+    }
 }