You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2015/05/26 11:25:08 UTC

flink git commit: [FLINK-1957] Fix NPE during cancelling of partition request

Repository: flink
Updated Branches:
  refs/heads/master 48e2cb5e8 -> a1d2df614


[FLINK-1957] Fix NPE during cancelling of partition request


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

Branch: refs/heads/master
Commit: a1d2df6149491fe9a087882f88c87e09476bb429
Parents: 48e2cb5
Author: Ufuk Celebi <uc...@apache.org>
Authored: Tue May 26 11:24:58 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Tue May 26 11:24:58 2015 +0200

----------------------------------------------------------------------
 .../runtime/io/network/netty/PartitionRequestClientHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a1d2df61/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java
index f0c08c8..f1dba42 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java
@@ -429,7 +429,7 @@ class PartitionRequestClientHandler extends ChannelInboundHandlerAdapter {
 					success = true;
 				}
 				else {
-					cancelRequestFor(inputChannel.getInputChannelId());
+					cancelRequestFor(stagedBufferResponse.receiverId);
 				}
 
 				stagedBufferResponse = null;