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/ff707101 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ff707101 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ff707101 Branch: refs/heads/devel-3.0 Commit: ff707101f18f59b6d596d24f6c803488de50b462 Parents: 6db66a6 Author: Gaurav <[email protected]> Authored: Fri Jul 24 13:06:04 2015 -0700 Committer: Chetan Narsude <[email protected]> Committed: Tue Aug 4 09:21:29 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/ff707101/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);
