Repository: asterixdb Updated Branches: refs/heads/master db672753f -> 67ffd4c12
ResultWriterOperatorDescriptor fail() NPE on open() failure Conform to IFrameWriter contract for fail() Change-Id: I613dcae32596af43476cf61d0245bfed258359de Reviewed-on: https://asterix-gerrit.ics.uci.edu/1834 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/67ffd4c1 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/67ffd4c1 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/67ffd4c1 Branch: refs/heads/master Commit: 67ffd4c1284c2629a582b80d0564d26c5df38394 Parents: db67275 Author: Michael Blow <[email protected]> Authored: Sun Jun 11 23:01:08 2017 -0400 Committer: Michael Blow <[email protected]> Committed: Wed Jul 19 10:03:51 2017 -0700 ---------------------------------------------------------------------- .../dataflow/std/result/ResultWriterOperatorDescriptor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67ffd4c1/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java index 78417ac..58eee79 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java @@ -112,7 +112,9 @@ public class ResultWriterOperatorDescriptor extends AbstractSingleActivityOperat @Override public void fail() throws HyracksDataException { failed = true; - datasetPartitionWriter.fail(); + if (datasetPartitionWriter != null) { + datasetPartitionWriter.fail(); + } } @Override
