Index: src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java (revision 1381831) +++ src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java (revision ) @@ -288,8 +288,10 @@ } } } + if (builder.length() > CONF_VALUE_DELIM.length()) { - builder.delete(builder.length() - CONF_VALUE_DELIM.length(), builder.length()); - userConf.set(getAliasConfName(alias), builder.toString()); + builder.delete(builder.length() - CONF_VALUE_DELIM.length(), builder.length()); + userConf.set(getAliasConfName(alias), builder.toString()); + } } private static String getMergedConfValue(String originalValues, String newValues, String separator) { Index: src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java (revision 1381831) +++ src/java/org/apache/hadoop/mapred/HCatMapRedUtil.java (revision ) @@ -39,9 +39,9 @@ } public static org.apache.hadoop.mapred.JobContext createJobContext(org.apache.hadoop.mapreduce.JobContext context) { - return createJobContext(new JobConf(context.getConfiguration()), + return createJobContext((JobConf)context.getConfiguration(), - context.getJobID(), - Reporter.NULL); + context.getJobID(), + Reporter.NULL); } public static JobContext createJobContext(JobConf conf, org.apache.hadoop.mapreduce.JobID id, Progressable progressable) { Index: shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java (revision 1381831) +++ shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java (revision ) @@ -21,17 +21,16 @@ import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.mapreduce.OutputFormat; -import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskID; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.task.JobContextImpl; -import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; import org.apache.hadoop.util.Progressable; import org.apache.pig.ResourceSchema; @@ -52,7 +51,9 @@ @Override public org.apache.hadoop.mapreduce.TaskAttemptContext createTaskAttemptContext(Configuration conf, org.apache.hadoop.mapreduce.TaskAttemptID taskId) { - return new org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl(conf, taskId); + return new org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl( + conf instanceof JobConf? new JobConf(conf) : conf, + taskId); } @Override @@ -64,7 +65,8 @@ org.apache.hadoop.mapred.JobConf.class, org.apache.hadoop.mapred.TaskAttemptID.class, Reporter.class); construct.setAccessible(true); - newContext = (org.apache.hadoop.mapred.TaskAttemptContext)construct.newInstance(conf, taskId, (Reporter)progressable); + newContext = (org.apache.hadoop.mapred.TaskAttemptContext)construct.newInstance( + new JobConf(conf), taskId, (Reporter)progressable); } catch (Exception e) { throw new RuntimeException(e); } @@ -74,17 +76,15 @@ @Override public JobContext createJobContext(Configuration conf, JobID jobId) { - JobContext ctxt = new JobContextImpl(conf, jobId); - - return ctxt; + return new JobContextImpl(conf instanceof JobConf? new JobConf(conf) : conf, + jobId); } @Override public org.apache.hadoop.mapred.JobContext createJobContext(org.apache.hadoop.mapred.JobConf conf, org.apache.hadoop.mapreduce.JobID jobId, Progressable progressable) { - org.apache.hadoop.mapred.JobContext newContext = - new org.apache.hadoop.mapred.JobContextImpl(conf, jobId, (org.apache.hadoop.mapred.Reporter)progressable); - return newContext; + return new org.apache.hadoop.mapred.JobContextImpl( + new JobConf(conf), jobId, (org.apache.hadoop.mapred.Reporter)progressable); } @Override