Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master
# Conflicts: # modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18d0d0d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18d0d0d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18d0d0d9 Branch: refs/heads/ignite-4371 Commit: 18d0d0d94d2f46c323ff7d567b0c5b120b5807a6 Parents: 892c829 2c1881c Author: sboikov <[email protected]> Authored: Wed Dec 7 14:56:53 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 7 14:56:53 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/stream/StreamAdapter.java | 4 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 +- .../ignite/stream/kafka/KafkaStreamer.java | 48 +++++--------------- .../kafka/KafkaIgniteStreamerSelfTest.java | 36 +++++++++++---- 4 files changed, 42 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/18d0d0d9/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java ---------------------------------------------------------------------- diff --cc modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java index 221538c,5767790..73820b7 --- a/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java +++ b/modules/kafka/src/main/java/org/apache/ignite/stream/kafka/KafkaStreamer.java @@@ -168,8 -142,8 +142,8 @@@ public class KafkaStreamer<K, V> extend stopped = false; // Now create an object to consume the messages. - for (final KafkaStream<K, V> stream : streams) { + for (final KafkaStream<byte[], byte[]> stream : streams) { - executor.submit(new Runnable() { + executor.execute(new Runnable() { @Override public void run() { while (!stopped) { try {
