flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gyf...@apache.org
Subject flink git commit: [streaming] Proper exception propagation for udf exception + collector bugfix
Date Mon, 02 Mar 2015 19:37:19 GMT
Repository: flink
Updated Branches:
  refs/heads/master e038629ee -> 2a528712d


[streaming] Proper exception propagation for udf exception + collector bugfix


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

Branch: refs/heads/master
Commit: 2a528712ddf4739156775be1346b559e6cb97a2f
Parents: e038629
Author: Gyula Fora <gyfora@apache.org>
Authored: Mon Mar 2 16:28:19 2015 +0100
Committer: Gyula Fora <gyfora@apache.org>
Committed: Mon Mar 2 20:36:37 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/flink/streaming/api/StreamConfig.java | 2 +-
 .../org/apache/flink/streaming/api/invokable/StreamInvokable.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/2a528712/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamConfig.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamConfig.java
b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamConfig.java
index efc0b8b..e1362c4 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamConfig.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamConfig.java
@@ -187,7 +187,7 @@ public class StreamConfig implements Serializable {
 
 	public void setOutputSelectors(List<OutputSelector<?>> outputSelector) {
 		try {
-			if (outputSelector != null) {
+			if (outputSelector != null && !outputSelector.isEmpty()) {
 				setDirectedEmit(true);
 				config.setBytes(OUTPUT_SELECTOR,
 						SerializationUtils.serialize((Serializable) outputSelector));

http://git-wip-us.apache.org/repos/asf/flink/blob/2a528712/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
index 733edc7..db7b642 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
@@ -128,6 +128,7 @@ public abstract class StreamInvokable<IN, OUT> implements Serializable
{
 				LOG.error("Calling user function failed due to: {}",
 						StringUtils.stringifyException(e));
 			}
+			throw new RuntimeException(e);
 		}
 	}
 


Mime
View raw message