asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: Fix NPE in DatasetDirectoryService.reportJobFailure
Date Wed, 15 Mar 2017 13:30:48 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 2e03fd673 -> 050f509e0


Fix NPE in DatasetDirectoryService.reportJobFailure

Change-Id: I4c27d2133d199bbb6984f8da14e37b2e511528ac
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1582
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>


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

Branch: refs/heads/master
Commit: 050f509e0643b2a2d41af1695867d618a0519e4b
Parents: 2e03fd6
Author: Till Westmann <tillw@apache.org>
Authored: Tue Mar 14 14:17:21 2017 -0700
Committer: Michael Blow <mblow@apache.org>
Committed: Wed Mar 15 06:30:26 2017 -0700

----------------------------------------------------------------------
 .../hyracks/control/cc/dataset/DatasetDirectoryService.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/050f509e/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
----------------------------------------------------------------------
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 927d499..8fd15f9 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
@@ -159,9 +159,10 @@ public class DatasetDirectoryService implements IDatasetDirectoryService
{
         if (djr != null) {
             djr.fail(exceptions);
         }
-        // TODO(tillw) throwing an NPE here hangs the system, why?
-        // TODO(tillw) still run into NPE here ..
-        jobResultLocations.get(jobId).setException(exceptions.isEmpty() ? null : exceptions.get(0));
+        final JobResultInfo jobResultInfo = jobResultLocations.get(jobId);
+        if (jobResultInfo != null) {
+            jobResultInfo.setException(exceptions.isEmpty() ? null : exceptions.get(0));
+        }
         notifyAll();
     }
 


Mime
View raw message