Fully fix #326

hawtio · May 8, 2013 · 7eb6528 · 7eb6528
1 parent d252cd2
commit 7eb6528
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts
@@ -18,15 +18,26 @@ module Fabric {
 
             var isValid = (workspace) => {
               if (workspace.treeContainsDomainAndProperties(jmxDomain, {type: 'Fabric'})) {
-
-                var status = workspace.jolokia.getAttribute(managerMBean, 'FabricServiceStatus');
-
-                console.log("status:", status);
-
-                if (status) {
-                  return status.clientValid && status.clientConnected;
-                } else {
-                  return false;
+                try {
+                  var status = workspace.jolokia.getAttribute(managerMBean, 'FabricServiceStatus');
+
+                  if (status) {
+                    return status.clientValid && status.clientConnected;
+                  } else {
+                    return false;
+                  }
+                } catch (e) {
+                    try {
+                      var container = workspace.jolokia.execute(managerMBean, 'currentContainer()');
+                      if (container) {
+                        return true;
+                      } else {
+                        return false;
+                      }
+
+                    } catch (e) {
+                      return false;
+                    }
                 }
               }
               return false;