From f2d6360d4d6148b40bef6011c88b9f814310c844 Mon Sep 17 00:00:00 2001
From: fjy <fangjinyang@gmail.com>
Date: Mon, 15 Sep 2014 17:08:45 -0700
Subject: [PATCH] cleanup

---
 .../src/main/java/io/druid/segment/indexing/DataSchema.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/io/druid/segment/indexing/DataSchema.java b/server/src/main/java/io/druid/segment/indexing/DataSchema.java
index 726112de62f..fb5a60af1e1 100644
--- a/server/src/main/java/io/druid/segment/indexing/DataSchema.java
+++ b/server/src/main/java/io/druid/segment/indexing/DataSchema.java
@@ -52,8 +52,10 @@ public class DataSchema
     for (AggregatorFactory aggregator : aggregators) {
       dimensionExclusions.add(aggregator.getName());
     }
-    if (parser != null && parser.getParseSpec() != null && parser.getParseSpec().getTimestampSpec() != null) {
-      dimensionExclusions.add(parser.getParseSpec().getTimestampSpec().getTimestampColumn());
+    if (parser != null && parser.getParseSpec() != null) {
+      if (parser.getParseSpec().getTimestampSpec() != null) {
+        dimensionExclusions.add(parser.getParseSpec().getTimestampSpec().getTimestampColumn());
+      }
       if (parser.getParseSpec().getDimensionsSpec() != null) {
         this.parser = parser.withParseSpec(
             parser.getParseSpec()