commit 2f5b33ead752deb4796989f56f9aebf6e3330286
author Josh Wills <jwills@apache.org> Mon Jul 27 16:00:49 2015 -0700
committer Josh Wills <jwills@apache.org> Mon Jul 27 19:21:45 2015 -0700
tree cf410645b8e0618eb5fff719569dd860feeb628a
parent 29d1ce4cddcddc86cda36bd464c26df4bdff3ae4

CRUNCH-551: Make the use of Configuration objects consistent in CrunchInputSplit and CrunchRecordReader

crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java

diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java
index ee54483..5ec5015 100644
--- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java
+++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java
@@ -66,8 +66,8 @@
   @Override
   public void setConf(Configuration conf) {
     this.conf = new Configuration(conf);
-    if (bundle != null && conf != null) {
-      this.bundle.configure(conf);
+    if (bundle != null) {
+      this.bundle.configure(this.conf);
     }
   }
 

crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchRecordReader.java

diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchRecordReader.java b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchRecordReader.java
index 2842658..d4175a6 100644
--- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchRecordReader.java
+++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchRecordReader.java
@@ -44,12 +44,8 @@
     if (crunchSplit.get() instanceof CombineFileSplit) {
       combineFileSplit = (CombineFileSplit) crunchSplit.get();
     }
-    Configuration conf = crunchSplit.getConf();
-    if (conf == null) {
-      conf = context.getConfiguration();
-      crunchSplit.setConf(conf);
-    }
-    this.context = new TaskAttemptContextImpl(conf, context.getTaskAttemptID());
+    crunchSplit.setConf(context.getConfiguration());
+    this.context = new TaskAttemptContextImpl(crunchSplit.getConf(), context.getTaskAttemptID());
     initNextRecordReader();
   }
 
@@ -71,10 +67,9 @@
     }
 
     idx++;
-    Configuration conf = crunchSplit.getConf();
     InputFormat<K, V> inputFormat = (InputFormat<K, V>) ReflectionUtils.newInstance(
         crunchSplit.getInputFormatClass(),
-        conf);
+        crunchSplit.getConf());
     this.curReader = inputFormat.createRecordReader(getDelegateSplit(), context);
     return true;
   }
@@ -136,12 +131,8 @@
   @Override
   public void initialize(InputSplit inputSplit, TaskAttemptContext context) throws IOException, InterruptedException {
     this.crunchSplit = (CrunchInputSplit) inputSplit;
-    Configuration conf = crunchSplit.getConf();
-    if (conf == null) {
-      conf = context.getConfiguration();
-      crunchSplit.setConf(conf);
-    }
-    this.context = new TaskAttemptContextImpl(conf, context.getTaskAttemptID());
+    crunchSplit.setConf(context.getConfiguration());
+    this.context = new TaskAttemptContextImpl(crunchSplit.getConf(), context.getTaskAttemptID());
     if (crunchSplit.get() instanceof CombineFileSplit) {
       combineFileSplit = (CombineFileSplit) crunchSplit.get();
     }