NIFI-572 possible null dereference in PersistentProvenanceRepository.submitQuery
Signed-off-by: Mark Payne <marka...@hotmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/018473b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/018473b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/018473b3 Branch: refs/heads/master Commit: 018473b352ef5216e8581fa843b1a3a958c51d9b Parents: fea59e3 Author: Mark Latimer <mark.lati...@gmail.com> Authored: Sat May 2 12:18:51 2015 +0100 Committer: Mark Payne <marka...@hotmail.com> Committed: Sun May 3 17:13:22 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/provenance/PersistentProvenanceRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/018473b3/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java index 27f2cbb..5da5d6f 100644 --- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java +++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java @@ -1438,9 +1438,10 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository trimmed = latestList; } - final Long maxEventId = getMaxEventId(); + Long maxEventId = getMaxEventId(); if (maxEventId == null) { result.getResult().update(Collections.<ProvenanceEventRecord>emptyList(), 0L); + maxEventId = 0L; } Long minIndexedId = indexConfig.getMinIdIndexed(); if (minIndexedId == null) {