You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/04/04 15:39:03 UTC
nifi git commit: NIFI-1697 Ensuring FlowController appropriately
wraps code with NarCloseable. This closes #312
Repository: nifi
Updated Branches:
refs/heads/master 65b26e6f4 -> 65b5c1a5f
NIFI-1697 Ensuring FlowController appropriately wraps code with NarCloseable. This closes #312
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/65b5c1a5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/65b5c1a5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/65b5c1a5
Branch: refs/heads/master
Commit: 65b5c1a5f1899fd58d306b81983a015e79f9355f
Parents: 65b26e6
Author: Bryan Bende <bb...@apache.org>
Authored: Wed Mar 30 11:46:52 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Apr 4 09:22:55 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/controller/FlowController.java | 12 +++++++++---
.../apache/nifi/controller/StandardProcessorNode.java | 4 +++-
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/65b5c1a5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index c9aaceb..09c4da6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -3220,13 +3220,19 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
final PrimaryNodeState nodeState = primary ? PrimaryNodeState.ELECTED_PRIMARY_NODE : PrimaryNodeState.PRIMARY_NODE_REVOKED;
final ProcessGroup rootGroup = getGroup(getRootGroupId());
for (final ProcessorNode procNode : rootGroup.findAllProcessors()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, procNode.getProcessor(), nodeState);
+ try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) {
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, procNode.getProcessor(), nodeState);
+ }
}
for (final ControllerServiceNode serviceNode : getAllControllerServices()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, serviceNode.getControllerServiceImplementation(), nodeState);
+ try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) {
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, serviceNode.getControllerServiceImplementation(), nodeState);
+ }
}
for (final ReportingTaskNode reportingTaskNode : getAllReportingTasks()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, reportingTaskNode.getReportingTask(), nodeState);
+ try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) {
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnPrimaryNodeStateChange.class, reportingTaskNode.getReportingTask(), nodeState);
+ }
}
// update primary
http://git-wip-us.apache.org/repos/asf/nifi/blob/65b5c1a5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 8ac82a0..b544f38 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -908,7 +908,9 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
getAnnotationData());
final Collection<ValidationResult> validationResults;
- validationResults = getProcessor().validate(validationContext);
+ try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) {
+ validationResults = getProcessor().validate(validationContext);
+ }
for (final ValidationResult result : validationResults) {
if (!result.isValid()) {