Repository: reef
Updated Branches:
  refs/heads/master 1038a6da8 -> 0ab1c2729


[REEF-1523] Fix Null Point exception in NameServer when message is null

JIRA:
  [REEF-1523](https://issues.apache.org/jira/browse/REEF-1523)

Pull request:
  This closes #1093


Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/0ab1c272
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/0ab1c272
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/0ab1c272

Branch: refs/heads/master
Commit: 0ab1c2729c54266a2aa29004b8fb2b8eec506c51
Parents: 1038a6d
Author: Julia Wang <[email protected]>
Authored: Thu Aug 11 11:54:11 2016 -0700
Committer: Mariia Mykhailova <[email protected]>
Committed: Fri Aug 12 15:57:08 2016 -0700

----------------------------------------------------------------------
 lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/reef/blob/0ab1c272/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs 
b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
index 4ea4438..96ffd34 100644
--- a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
@@ -195,9 +195,16 @@ namespace Org.Apache.REEF.Network.Naming
 
             public override void OnNext(TransportEvent<NamingEvent> value)
             {
-                NamingEvent message = value.Data;
-                message.Link = value.Link;
-                _handler.OnNext(message);
+                if (value != null && value.Data != null)
+                { 
+                    NamingEvent message = value.Data;
+                    message.Link = value.Link;
+                    _handler.OnNext(message);
+                }
+                else
+                {
+                    Logger.Log(Level.Warning, 
"NameServer.OnNext(TransportEvent<NamingEvent> value), message received is 
null");
+                }
             }
         }
     }

Reply via email to