Merge branch 'NIFI-548' of https://github.com/bbende/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ca7e3c0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ca7e3c0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ca7e3c0d Branch: refs/heads/develop Commit: ca7e3c0daf04f1485e752a78d930b4ead944b2f8 Parents: 6787afc badf101 Author: Mark Payne <[email protected]> Authored: Fri May 15 14:58:35 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri May 15 14:58:35 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/io/nio/ChannelDispatcher.java | 6 ++++-- .../java/org/apache/nifi/io/nio/ChannelListener.java | 4 ++-- .../org/apache/nifi/io/nio/DatagramChannelReader.java | 8 ++++++-- .../org/apache/nifi/io/nio/example/ServerMain.java | 2 +- .../apache/nifi/processors/standard/ListenUDP.java | 14 ++++++++++++-- .../processors/standard/util/UDPStreamConsumer.java | 11 +++++++---- 6 files changed, 32 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
