fixes #808

hawtio · Dec 4, 2013 · 2883413 · 2883413
1 parent 13a302e
commit 2883413
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/brokerDiagram.ts b/hawtio-web/src/main/webapp/app/fabric/js/brokerDiagram.ts
@@ -108,15 +108,18 @@ module Fabric {
         });
 
         // TODO do we need to create a physical broker node per container and logical broker maybe?
-        var container = getOrAddNode("container", containerId, brokerStatus, () => {
-          return {
-            containerId: containerId,
-            popup: {
-              title: "Container: " + containerId,
-              content: "<p>" + containerId + " version: " + versionId + "</p>"
-            }
-          };
-        });
+        var container = null;
+        if (containerId) {
+          container = getOrAddNode("container", containerId, brokerStatus, () => {
+            return {
+              containerId: containerId,
+              popup: {
+                title: "Container: " + containerId,
+                content: "<p>" + containerId + " version: " + versionId + "</p>"
+              }
+            };
+          });
+        }
 
 
         if (container && container.validContainer) {
@@ -138,11 +141,14 @@ module Fabric {
             addLink(profile, broker, "broker");
           }
         }
-        if ((master || $scope.showFlags.slave) && $scope.showFlags.container) {
-          addLink(broker, container, "container");
-          container.destinationLinkNode = container;
-        } else {
-          container.destinationLinkNode = broker;
+
+        if (container) {
+          if ((master || $scope.showFlags.slave) && $scope.showFlags.container) {
+            addLink(broker, container, "container");
+            container.destinationLinkNode = container;
+          } else {
+            container.destinationLinkNode = broker;
+          }
         }
       });