Merge branch 'hotfix-1.3.1'

Particular · Aug 21, 2015 · e39805f · e39805f
2 parents 86744c0 + 0da94fe
commit e39805f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ServiceInsight/Explorer/EndpointExplorer/EndpointExplorerViewModel.cs b/src/ServiceInsight/Explorer/EndpointExplorer/EndpointExplorerViewModel.cs
@@ -171,7 +171,7 @@ public void RefreshData()
 
             ServiceControlRoot.Children.Clear();
 
-            var endpointInstancesGroupedByName = endpoints.GroupBy(x => x.Name);
+            var endpointInstancesGroupedByName = endpoints.OrderBy(x => x.Name).GroupBy(x => x.Name);
             foreach (var scaledOutEndpoint in endpointInstancesGroupedByName)
             {
                 var instances = scaledOutEndpoint.ToList();

diff --git a/src/ServiceInsight/SequenceDiagram/SequenceDiagramViewModel.cs b/src/ServiceInsight/SequenceDiagram/SequenceDiagramViewModel.cs
@@ -135,7 +135,7 @@ private void CreateEndpoints(IList<StoredMessage> messages)
 
             foreach (var message in messages)
             {
-                if (endpointInfos.Exists(e => e.FullName == message.ReceivingEndpoint.Name && e.Host == message.ReceivingEndpoint.Host))
+                if (message.ReceivingEndpoint == null || endpointInfos.Exists(e => e.FullName == message.ReceivingEndpoint.Name && e.Host == message.ReceivingEndpoint.Host))
                 {
                     continue;
                 }