Yingyi Bu has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1889

Change subject: [ASTERIXDB-1982][FAIL] setException(..) in removeWaiter(..).
......................................................................

[ASTERIXDB-1982][FAIL] setException(..) in removeWaiter(..).

Change-Id: I5a1817c1c793e1118308e3824ec08f6d20b0eadd
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/89/1889/1

diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
index 8401fcf..4182a4d 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
@@ -284,7 +284,11 @@
     }
 
     Waiter removeWaiter(ResultSetId rsId) {
-        return waiters.remove(rsId);
+        Waiter waiter = waiters.remove(rsId);
+        if (exception != null) {
+            waiter.callback.setException(exception);
+        }
+        return waiter;
     }
 
     Waiter getWaiter(ResultSetId rsId) {
@@ -298,7 +302,9 @@
             }
         }
         // Caches the exception anyway for future added waiters.
-        this.exception = exception;
+        if (this.exception == null) {
+            this.exception = exception;
+        }
     }
 
     @Override

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1889
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a1817c1c793e1118308e3824ec08f6d20b0eadd
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <[email protected]>

Reply via email to