NIFI-1160: - Addressing possible NPE when removing a drop request. - Only updating a connection status once it's been retrieved for the first time.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/64369f67 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/64369f67 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/64369f67 Branch: refs/heads/NIFI-655 Commit: 64369f67f92c21be3845bf8766ccdd8cecd88adf Parents: da9f40b Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Mon Nov 16 08:34:04 2015 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Mon Nov 16 08:34:04 2015 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/web/dao/impl/StandardConnectionDAO.java | 8 +++++++- .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/64369f67/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java index 66730a3..df271a5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java @@ -499,7 +499,13 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO public DropFlowFileStatus deleteFlowFileDropRequest(String groupId, String connectionId, String dropRequestId) { final Connection connection = locateConnection(groupId, connectionId); final FlowFileQueue queue = connection.getFlowFileQueue(); - return queue.cancelDropFlowFileRequest(dropRequestId); + + final DropFlowFileStatus dropFlowFileStatus = queue.cancelDropFlowFileRequest(dropRequestId); + if (dropFlowFileStatus == null) { + throw new ResourceNotFoundException(String.format("Unable to find drop request with id '%s'.", dropRequestId)); + } + + return dropFlowFileStatus; } /* setters */ http://git-wip-us.apache.org/repos/asf/nifi/blob/64369f67/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js index 1b80700..e1ed3fe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js @@ -1018,7 +1018,7 @@ nf.Actions = (function () { $('#drop-request-status-message').text(dropRequest.state); // update the current number of enqueued flowfiles - if (nf.Common.isDefinedAndNotNull(dropRequest.currentCount)) { + if (nf.Common.isDefinedAndNotNull(connection.status) && nf.Common.isDefinedAndNotNull(dropRequest.currentCount)) { connection.status.queued = dropRequest.current; nf.Connection.refresh(connection.id); }