You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:12:33 UTC
[02/50] incubator-apex-core git commit: APEX-14 #resolve added check
to see if address is null
APEX-14 #resolve added check to see if address is null
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/0f9fb471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0f9fb471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0f9fb471
Branch: refs/heads/master
Commit: 0f9fb471ec6a4b4e36bd7c6569c9d61e41423685
Parents: 66a75e0
Author: Gaurav <ga...@datatorrent.com>
Authored: Fri Jul 24 13:06:04 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Tue Aug 4 11:11:13 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/engine/StreamingContainer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0f9fb471/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
index 35861f1..71364a2 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
@@ -905,7 +905,8 @@ public class StreamingContainer extends YarnContainerMain
bssc.put(StreamContext.EVENT_LOOP, eventloop);
bssc.setBufferServerAddress(InetSocketAddress.createUnresolved(nodi.bufferServerHost, nodi.bufferServerPort));
bssc.put(StreamContext.BUFFER_SERVER_TOKEN, nodi.bufferServerToken);
- if (NetUtils.isLocalAddress(bssc.getBufferServerAddress().getAddress())) {
+ InetAddress inetAddress = bssc.getBufferServerAddress().getAddress();
+ if (inetAddress != null && NetUtils.isLocalAddress(inetAddress)) {
bssc.setBufferServerAddress(new InetSocketAddress(InetAddress.getByName(null), nodi.bufferServerPort));
}
@@ -1096,7 +1097,8 @@ public class StreamingContainer extends YarnContainerMain
StreamContext context = new StreamContext(nidi.declaredStreamId);
context.setBufferServerAddress(InetSocketAddress.createUnresolved(nidi.bufferServerHost, nidi.bufferServerPort));
- if (NetUtils.isLocalAddress(context.getBufferServerAddress().getAddress())) {
+ InetAddress inetAddress = context.getBufferServerAddress().getAddress();
+ if (inetAddress != null && NetUtils.isLocalAddress(inetAddress)) {
context.setBufferServerAddress(new InetSocketAddress(InetAddress.getByName(null), nidi.bufferServerPort));
}
context.put(StreamContext.BUFFER_SERVER_TOKEN, nidi.bufferServerToken);