[flink] branch release-1.6 updated: [FLINK-10364][tests] Fix instability in NonHAQueryableStateFsBackendITCase#testMapState

[srichter]

This is an automated email from the ASF dual-hosted git repository.

srichter pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.6 by this push:
     new 4f3e125  [FLINK-10364][tests] Fix instability in 
NonHAQueryableStateFsBackendITCase#testMapState
4f3e125 is described below

commit 4f3e125aa00d731129de4049bee14907a7dfa277
Author: Stefan Richter <s.rich...@data-artisans.com>
AuthorDate: Wed Oct 31 11:57:56 2018 +0100

    [FLINK-10364][tests] Fix instability in 
NonHAQueryableStateFsBackendITCase#testMapState
    
    This closes #6975.
---
 .../queryablestate/itcases/AbstractQueryableStateTestBase.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java
 
b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java
index e99a28b..83976f1 100644
--- 
a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java
+++ 
b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/AbstractQueryableStateTestBase.java
@@ -836,9 +836,11 @@ public abstract class AbstractQueryableStateTestBase 
extends TestLogger {
                                                        false,
                                                        executor);
 
-                                       Tuple2<Integer, Long> value = 
future.get(deadline.timeLeft().toMillis(), TimeUnit.MILLISECONDS).get(key);
-                                       assertEquals("Key mismatch", key, 
value.f0.intValue());
-                                       if (expected == value.f1) {
+                                       Tuple2<Integer, Long> value =
+                                               
future.get(deadline.timeLeft().toMillis(), TimeUnit.MILLISECONDS).get(key);
+
+                                       if (value != null && value.f0 != null 
&& expected == value.f1) {
+                                               assertEquals("Key mismatch", 
key, value.f0.intValue());
                                                success = true;
                                        } else {
                                                // Retry