Repository: nifi Updated Branches: refs/heads/master 730d999d4 -> 07d4d7005
NIFI-1612: Do not ignore Remote Process Group's timeout configuration Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ce068ffc Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ce068ffc Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ce068ffc Branch: refs/heads/master Commit: ce068ffc6c4f9b979d2736b5c5527326f2d9c3a8 Parents: 730d999 Author: Mark Payne <[email protected]> Authored: Wed Mar 9 16:02:57 2016 -0500 Committer: joewitt <[email protected]> Committed: Sun Mar 13 13:40:45 2016 -0400 ---------------------------------------------------------------------- .../apache/nifi/remote/StandardRemoteGroupPort.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/ce068ffc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java index d8f130e..552c0c6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java @@ -128,13 +128,14 @@ public class StandardRemoteGroupPort extends RemoteGroupPort { final long penalizationMillis = FormatUtils.getTimeDuration(remoteGroup.getYieldDuration(), TimeUnit.MILLISECONDS); final SiteToSiteClient client = new SiteToSiteClient.Builder() - .url(remoteGroup.getTargetUri().toString()) - .portIdentifier(getIdentifier()) - .sslContext(sslContext) - .eventReporter(remoteGroup.getEventReporter()) - .peerPersistenceFile(getPeerPersistenceFile(getIdentifier())) - .nodePenalizationPeriod(penalizationMillis, TimeUnit.MILLISECONDS) - .build(); + .url(remoteGroup.getTargetUri().toString()) + .portIdentifier(getIdentifier()) + .sslContext(sslContext) + .eventReporter(remoteGroup.getEventReporter()) + .peerPersistenceFile(getPeerPersistenceFile(getIdentifier())) + .nodePenalizationPeriod(penalizationMillis, TimeUnit.MILLISECONDS) + .timeout(remoteGroup.getCommunicationsTimeout(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS) + .build(); clientRef.set(client); }
