fix

apache · Mar 6, 2017 · f0b89fd · f0b89fd
1 parent 2c8a228
commit f0b89fd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../main/java/org/apache/spark/sql/execution/datasources/parquet/VectorizedColumnReader.java b/.../main/java/org/apache/spark/sql/execution/datasources/parquet/VectorizedColumnReader.java
@@ -101,7 +101,9 @@ public VectorizedColumnReader(ColumnDescriptor descriptor, PageReader pageReader
     this.descriptor = descriptor;
     this.pageReader = pageReader;
     // If the table has a timezone property, apply the correct conversions.  See SPARK-12297.
-    String tzString = conf.get(ParquetFileFormat.PARQUET_TIMEZONE_TABLE_PROPERTY());
+    // The conf is sometimes null in tests.
+    String tzString =
+        conf == null ? null : conf.get(ParquetFileFormat.PARQUET_TIMEZONE_TABLE_PROPERTY());
     if (tzString == null || tzString == "") {
       storageTz = localTz;
     } else {