You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/09/02 17:54:51 UTC
[1/2] incubator-apex-malhar git commit: Added missing channel
initialization when the receiver is replying to the source message
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/devel-3 91321cef5 -> a9bcce182
Added missing channel initialization when the receiver is replying to the source message
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/20a352f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/20a352f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/20a352f6
Branch: refs/heads/devel-3
Commit: 20a352f6cebc6c700b3dc6e36541e3cc885e3a39
Parents: 6155673
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Mon Aug 31 10:53:59 2015 -0700
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Wed Sep 2 07:41:06 2015 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/demos/echoserver/NetworkManager.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/20a352f6/demos/echoserver/src/main/java/com/datatorrent/demos/echoserver/NetworkManager.java
----------------------------------------------------------------------
diff --git a/demos/echoserver/src/main/java/com/datatorrent/demos/echoserver/NetworkManager.java b/demos/echoserver/src/main/java/com/datatorrent/demos/echoserver/NetworkManager.java
index 5b6e513..f9dd491 100644
--- a/demos/echoserver/src/main/java/com/datatorrent/demos/echoserver/NetworkManager.java
+++ b/demos/echoserver/src/main/java/com/datatorrent/demos/echoserver/NetworkManager.java
@@ -100,6 +100,8 @@ public class NetworkManager implements Runnable
channelConfiguration.connectionInfo = connectionInfo;
channels.put(connectionInfo, channelConfiguration);
channelConfigurations.put(channel, channelConfiguration);
+ } else {
+ channel = channelConfiguration.channel;
}
ChannelAction channelAction = new ChannelAction();
channelAction.channelConfiguration = channelConfiguration;
[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1831' of
https://github.com/PramodSSImmaneni/incubator-apex-malhar into devel-3
Posted by th...@apache.org.
Merge branch 'MLHR-1831' of https://github.com/PramodSSImmaneni/incubator-apex-malhar into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a9bcce18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a9bcce18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a9bcce18
Branch: refs/heads/devel-3
Commit: a9bcce1824a81c2dc7657bcc037ec9d4e6c29acc
Parents: 91321ce 20a352f
Author: Thomas Weise <th...@datatorrent.com>
Authored: Wed Sep 2 08:52:28 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Wed Sep 2 08:52:28 2015 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/demos/echoserver/NetworkManager.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------