Merge pull request #208 from twitter/backportFixes

Backport fixes

Author: ianoc

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

@@ -50,7 +50,7 @@ public class KryoSerialization extends Configured implements Serialization<Objec
      * It will first call this, then setConf.
      */
     public KryoSerialization() {
-        this(new Configuration());
+	super();
     }
 
     /**
@@ -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);
+	    }
+	}
     }
 
     /**

chill-java/src/main/java/com/twitter/chill/config/Config.java

@@ -31,7 +31,7 @@ public String getOrElse(String key, String def) {
   }
 
   public boolean contains(String key) {
-    return get(key) == null;
+    return get(key) != null;
   }
   public Boolean getBoolean(String key) {
     String bval = get(key);