Updated Branches: refs/heads/master 2550809ec -> e03103759
CRUNCH-214: Fix compilation error on jdk6 Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/e0310375 Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/e0310375 Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/e0310375 Branch: refs/heads/master Commit: e03103759a17903015eb4f61c9e56b608191c2c6 Parents: 2550809 Author: Chao Shi <[email protected]> Authored: Thu Jun 13 11:07:17 2013 +0800 Committer: Chao Shi <[email protected]> Committed: Thu Jun 13 11:07:17 2013 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/e0310375/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java ---------------------------------------------------------------------- diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java b/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java index 3e1de38..5f5edb4 100644 --- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java +++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/MSCRPlanner.java @@ -73,7 +73,8 @@ public class MSCRPlanner { }; public MRExecutor plan(Class<?> jarClass, Configuration conf) throws IOException { - Map<PCollectionImpl<?>, Set<SourceTarget<?>>> targetDeps = Maps.newTreeMap(DEPTH_COMPARATOR); + Map<PCollectionImpl<?>, Set<SourceTarget<?>>> targetDeps = + Maps.<PCollectionImpl<?>, PCollectionImpl<?>, Set<SourceTarget<?>>>newTreeMap(DEPTH_COMPARATOR); for (PCollectionImpl<?> pcollect : outputs.keySet()) { targetDeps.put(pcollect, pcollect.getTargetDependencies()); }
