You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/19 14:52:19 UTC
[3/4] flink git commit: [FLINK-7197] [gelly] Missing call to
GraphAlgorithmWrappingBase#canMergeConfigurationWith()
[FLINK-7197] [gelly] Missing call to GraphAlgorithmWrappingBase#canMergeConfigurationWith()
Fix for methods calling the incorrect super function.
This closes #4345.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ae826a6f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ae826a6f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ae826a6f
Branch: refs/heads/master
Commit: ae826a6f784277c85067a3855a023835a924f459
Parents: 2ee6ff5
Author: Greg Hogan <co...@greghogan.com>
Authored: Fri Jul 14 15:23:29 2017 -0400
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 19 11:37:58 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/graph/asm/translate/TranslateGraphIds.java | 4 +++-
.../apache/flink/graph/asm/translate/TranslateVertexValues.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ae826a6f/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateGraphIds.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateGraphIds.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateGraphIds.java
index 5568775..70df655 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateGraphIds.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateGraphIds.java
@@ -56,7 +56,9 @@ extends GraphAlgorithmWrappingGraph<OLD, VV, EV, NEW, VV, EV> {
@Override
protected boolean canMergeConfigurationWith(GraphAlgorithmWrappingBase other) {
- super.mergeConfiguration(other);
+ if (!super.canMergeConfigurationWith(other)) {
+ return false;
+ }
TranslateGraphIds rhs = (TranslateGraphIds) other;
http://git-wip-us.apache.org/repos/asf/flink/blob/ae826a6f/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateVertexValues.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateVertexValues.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateVertexValues.java
index c9c94d7..99ea701 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateVertexValues.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/asm/translate/TranslateVertexValues.java
@@ -54,7 +54,9 @@ extends GraphAlgorithmWrappingGraph<K, OLD, EV, K, NEW, EV> {
@Override
protected boolean canMergeConfigurationWith(GraphAlgorithmWrappingBase other) {
- super.mergeConfiguration(other);
+ if (!super.canMergeConfigurationWith(other)) {
+ return false;
+ }
TranslateVertexValues rhs = (TranslateVertexValues) other;