Skip to content

Commit 03adbf2

Browse files
hanbjChristoph Büscher
authored andcommitted
Check timeZone() argument in AbstractSqlQueryRequest (#31822)
A value of `null` will throw an IAE.
1 parent 89cb087 commit 03adbf2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public TimeZone timeZone() {
112112
}
113113

114114
public AbstractSqlQueryRequest timeZone(TimeZone timeZone) {
115-
if (query == null) {
115+
if (timeZone == null) {
116116
throw new IllegalArgumentException("time zone may not be null.");
117117
}
118118
this.timeZone = timeZone;

x-pack/plugin/sql/sql-action/src/test/java/org/elasticsearch/xpack/sql/action/SqlQueryRequestTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,10 @@ protected SqlQueryRequest mutateInstance(SqlQueryRequest instance) {
110110
mutator.accept(newRequest);
111111
return newRequest;
112112
}
113+
114+
public void testTimeZoneNullException() {
115+
final SqlQueryRequest sqlQueryRequest = createTestInstance();
116+
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> sqlQueryRequest.timeZone(null));
117+
assertEquals("time zone may not be null.", e.getMessage());
118+
}
113119
}

0 commit comments

Comments
 (0)