Merge "Reorder public/private modifiers as per JLS. (fixes sonar warnings)"

[controller.git] / opendaylight / web / troubleshoot / src / main / resources / js / page.js

diff --git a/opendaylight/web/troubleshoot/src/main/resources/js/page.js b/opendaylight/web/troubleshoot/src/main/resources/js/page.js
index 3f0dc9e81231b50dc098011f20dd53f11ffdcfeb..bcf911f0a5583a46bf14b5150ff20a01c1096bfc 100644 (file)
--- a/opendaylight/web/troubleshoot/src/main/resources/js/page.js
+++ b/opendaylight/web/troubleshoot/src/main/resources/js/page.js
@@ -119,6 +119,9 @@ one.f.troubleshooting.existingNodes = {
             },
             flows: function(nodeId) {
                 try {
+                    if(one.f.troubleshooting === undefined){
+                        return;
+                    }
                     clearTimeout(one.f.troubleshooting.existingNodes.registry.refreshTimer);
                     $.getJSON(one.main.constants.address.prefix + "/troubleshoot/flowStats?nodeId=" + nodeId, function(content) {
                         $rightBottomDashlet = one.f.troubleshooting.rightBottomDashlet.get();
@@ -150,6 +153,9 @@ one.f.troubleshooting.existingNodes = {
             },
             ports: function(nodeId) {
                 try {
+                    if(one.f.troubleshooting === undefined){
+                        return;
+                    }
                     clearTimeout(one.f.troubleshooting.existingNodes.registry.refreshTimer);
                     $.getJSON(one.main.constants.address.prefix + "/troubleshoot/portStats?nodeId=" + nodeId, function(content) {
                         $rightBottomDashlet = one.f.troubleshooting.rightBottomDashlet.get();
@@ -400,16 +406,6 @@ one.f.troubleshooting.existingNodes = {
                             label: 'Idle Timeout',
                             sortable: true
                         },
-                        {
-                            property: 'outPorts',
-                            label: 'Out Ports',
-                            sortable: true
-                        },
-                        {
-                            property: 'outVlanId',
-                            label: 'Out VlanId',
-                            sortable: true
-                        },
                         {
                             property: 'priority',
                             label: 'Priority',
@@ -442,8 +438,6 @@ one.f.troubleshooting.existingNodes = {
                     entry.push(value["packetCount"]);
                     entry.push(value["durationSeconds"]);
                     entry.push(value["idleTimeout"]);
-                    entry.push(value["outPorts"]);
-                    entry.push(value["outVlanId"]);
                     entry.push(value["priority"]);
                     tr.entry = entry;
                     result.push(tr);