Repository: incubator-nifi Updated Branches: refs/heads/develop b569a9d78 -> 7f0eb2e35
NIFI-51 fixed if/else logic/order Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c3944541 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c3944541 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c3944541 Branch: refs/heads/develop Commit: c39445415779cc6c0f21b226ea41c23daf29f6d1 Parents: 1374d1d Author: joewitt <joew...@apache.org> Authored: Tue Dec 23 15:12:37 2014 -0500 Committer: joewitt <joew...@apache.org> Committed: Tue Dec 23 15:12:37 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/controller/FlowController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3944541/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java index e6d67a0..bb98418 100644 --- a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -447,10 +447,11 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H rootGroup.setName(DEFAULT_ROOT_GROUP_NAME); instanceId = UUID.randomUUID().toString(); - if (Boolean.TRUE.equals(isSiteToSiteSecure) && sslContext == null) { - LOG.error("Unable to create Secure Site-to-Site Listener because not all required Keystore/Truststore Properties are set. Site-to-Site functionality will be disabled until this problem is has been fixed."); + if (remoteInputSocketPort == null){ + LOG.info("Not enabling Site-to-Site functionality because nifi.remote.input.socket.port is not set"); externalSiteListener = null; - } else if (remoteInputSocketPort == null) { + } else if (isSiteToSiteSecure && sslContext == null) { + LOG.error("Unable to create Secure Site-to-Site Listener because not all required Keystore/Truststore Properties are set. Site-to-Site functionality will be disabled until this problem is has been fixed."); externalSiteListener = null; } else { // Register the SocketFlowFileServerProtocol as the appropriate resource for site-to-site Server Protocol
