Repository: nifi Updated Branches: refs/heads/NIFI-964 4138c8a6c -> 2382841e7
NIFI-964 Making Read Timeout optional Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2382841e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2382841e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2382841e Branch: refs/heads/NIFI-964 Commit: 2382841e7bc52e3c046b5572d27865f62cfd00ad Parents: 4138c8a Author: Bryan Bende <[email protected]> Authored: Wed Sep 16 16:30:55 2015 -0400 Committer: Bryan Bende <[email protected]> Committed: Wed Sep 16 16:30:55 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/processors/pcap/GetPcap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2382841e/nifi-nar-bundles/nifi-pcap-bundle/nifi-pcap-processors/src/main/java/org/apache/nifi/processors/pcap/GetPcap.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-pcap-bundle/nifi-pcap-processors/src/main/java/org/apache/nifi/processors/pcap/GetPcap.java b/nifi-nar-bundles/nifi-pcap-bundle/nifi-pcap-processors/src/main/java/org/apache/nifi/processors/pcap/GetPcap.java index 32fb6a5..599a2d6 100644 --- a/nifi-nar-bundles/nifi-pcap-bundle/nifi-pcap-processors/src/main/java/org/apache/nifi/processors/pcap/GetPcap.java +++ b/nifi-nar-bundles/nifi-pcap-bundle/nifi-pcap-processors/src/main/java/org/apache/nifi/processors/pcap/GetPcap.java @@ -90,7 +90,6 @@ public class GetPcap extends AbstractProcessor { .Builder().name("Read Timeout") .description("The read timeout in milliseconds. Must be non-negative. May be ignored by some OSs. " + "0 means disable buffering on Solaris. 0 means infinite on the other OSs. 1 through 9 means infinite on Solaris.") - .required(true) .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .defaultValue("10 ms") .build(); @@ -151,7 +150,8 @@ public class GetPcap extends AbstractProcessor { final String filter = context.getProperty(BPF_EXPRESSION).getValue(); final String mode = context.getProperty(CAPTURE_MODE).getValue(); final int snapLen = context.getProperty(SNAPSHOT_LENGTH).asDataSize(DataUnit.B).intValue(); - final int readTimeout = context.getProperty(READ_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue(); + final Long timePeriod = context.getProperty(READ_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS); + final int readTimeout = (timePeriod == null ? 0 : timePeriod.intValue()); final PcapNetworkInterface nif = Pcaps.getDevByName(interfaceName); if (nif == null) {
