Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Matt Gilman 2015-04-07 10:14:09 -04:00
parent e79db821b6 3a2b12d7c9
commit 4f015f5f43
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
View File

@ -297,7 +297,9 @@ public final class StandardProcessScheduler implements ProcessScheduler {
final Class<? extends ControllerService> serviceDefinition = descriptor.getControllerServiceDefinition(); final Class<? extends ControllerService> serviceDefinition = descriptor.getControllerServiceDefinition();
if ( serviceDefinition != null ) { if ( serviceDefinition != null ) {
final String serviceId = processContext.getProperty(descriptor).getValue(); final String serviceId = processContext.getProperty(descriptor).getValue();
serviceIds.add(serviceId); if ( serviceId != null ) {
serviceIds.add(serviceId);
}
} }
} }