flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject flink git commit: [FLINK-1574] Fix null RuntimeContext when opening combiner UDF in CombiningUnilateralSortMerger. Move RuntimeContext initialization to begin of RegularPactTask.invoke().
Date Tue, 17 Feb 2015 22:25:34 GMT
Repository: flink
Updated Branches:
  refs/heads/master a1c9244b0 -> 30e3893bd


[FLINK-1574] Fix null RuntimeContext when opening combiner UDF in CombiningUnilateralSortMerger.
Move RuntimeContext initialization to begin of RegularPactTask.invoke().


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/30e3893b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/30e3893b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/30e3893b

Branch: refs/heads/master
Commit: 30e3893bdb80ba148abdcb981fc92d176d05e15a
Parents: a1c9244
Author: Fabian Hueske <fhueske@apache.org>
Authored: Tue Feb 17 18:58:15 2015 +0100
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Tue Feb 17 21:06:24 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/runtime/operators/RegularPactTask.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/30e3893b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
index 9118400..2f2331f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
@@ -273,6 +273,8 @@ public class RegularPactTask<S extends Function, OT> extends AbstractInvokable
i
 			LOG.debug(formatLogString("Start task code."));
 		}
 
+		this.runtimeUdfContext = createRuntimeContext(getEnvironment().getTaskName());
+
 		// whatever happens in this scope, make sure that the local strategies are cleaned up!
 		// note that the initialization of the local strategies is in the try-finally block as
well,
 		// so that the thread that creates them catches its own errors that may happen in that
process.
@@ -409,8 +411,6 @@ public class RegularPactTask<S extends Function, OT> extends AbstractInvokable
i
 				"' , caused an error: " + t.getMessage(), t);
 		}
 		
-		this.runtimeUdfContext = createRuntimeContext(getEnvironment().getTaskName());
-		
 		// instantiate the UDF
 		try {
 			final Class<? super S> userCodeFunctionType = this.driver.getStubType();


Mime
View raw message