Merge pull request #204 from tsdeng/fix_kryo_set_conf

fix setConf

Author: ianoc

chill-avro/src/main/scala/com/twitter/chill/avro/AvroSerializer.scala

@@ -15,8 +15,8 @@ limitations under the License.
 package com.twitter.chill.avro
 
 import com.twitter.bijection.Injection
-import com.twitter.bijection.avro.{GenericAvroCodecs, SpecificAvroCodecs}
-import com.twitter.chill.{InjectiveSerializer, KSerializer}
+import com.twitter.bijection.avro.{ GenericAvroCodecs, SpecificAvroCodecs }
+import com.twitter.chill.{ InjectiveSerializer, KSerializer }
 import org.apache.avro.Schema
 import org.apache.avro.generic.GenericRecord
 import org.apache.avro.specific.SpecificRecordBase

chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java

@@ -65,15 +65,18 @@ public KryoSerialization( Configuration conf ) {
 
     @Override
     public void setConf(Configuration conf) {
-      try {
-        KryoInstantiator kryoInst = new ConfiguredInstantiator(new HadoopConfig(conf));
-        testKryo = kryoInst.newKryo();
-        kryoPool = KryoPool.withByteArrayOutputStream(MAX_CACHED_KRYO, kryoInst);
-      }
-      catch(ConfigurationException cx) {
-        // This interface can't throw
-        throw new RuntimeException(cx);
-      }
+	// null check is to handle when calling the defaul constructor, in Configured, it calls super which calls setConf with a null Configuration
+	if (conf != null) {
+	    try {
+		KryoInstantiator kryoInst = new ConfiguredInstantiator(new HadoopConfig(conf));
+		testKryo = kryoInst.newKryo();
+		kryoPool = KryoPool.withByteArrayOutputStream(MAX_CACHED_KRYO, kryoInst);
+	    }
+	    catch(ConfigurationException cx) {
+		// This interface can't throw
+		throw new RuntimeException(cx);
+	    }
+	}
     }
 
     /**