You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tk...@apache.org on 2015/11/02 21:49:00 UTC
nifi git commit: fix problem introduced during merge
Repository: nifi
Updated Branches:
refs/heads/NIFI-274 3d759feca -> 63dec2b95
fix problem introduced during merge
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/63dec2b9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/63dec2b9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/63dec2b9
Branch: refs/heads/NIFI-274
Commit: 63dec2b95c1d40cf5338d92577198f4c2426220b
Parents: 3d759fe
Author: Tony Kurc <tr...@gmail.com>
Authored: Mon Nov 2 15:48:45 2015 -0500
Committer: Tony Kurc <tr...@gmail.com>
Committed: Mon Nov 2 15:48:45 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/standard/TestListenSyslog.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/63dec2b9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java
index 0e0d972..7796868 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java
@@ -391,7 +391,7 @@ public class TestListenSyslog {
}
@Override
- protected ChannelReader createChannelReader(String protocol, BufferPool bufferPool, SyslogParser syslogParser, final BlockingQueue<SyslogEvent> syslogEvents) throws IOException {
+ protected ChannelReader createChannelReader(final String protocol, final BufferPool bufferPool, final SyslogParser syslogParser, final BlockingQueue<SyslogEvent> syslogEvents, int maxConnections) {
return new ChannelReader() {
@Override
public void open(int port, int maxBufferSize) throws IOException {