1 files changed, 32 insertions, 9 deletions
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index b5c044e7be..04890e4e63 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
@@ -277,8 +277,16 @@ public class AttributesTabControl extends TabControl
             {
                 public void widgetSelected(SelectionEvent e)
                 {
-                    // refresh the attributes list                
-                    refresh(_mbean);
+                    try
+                    {
+                        // refresh the attributes list                
+                        refresh(_mbean);
+                    }
+                    catch (Exception ex)
+                    {
+                        MBeanUtility.handleException(_mbean, ex);
+                    }
+                    
                 }
             });
     }
@@ -582,12 +590,19 @@ public class AttributesTabControl extends TabControl
             {
                 public void widgetSelected(SelectionEvent event)
                 {
-                    Button button = (Button)event.widget;
-                    Text text = (Text)button.getData();
-                    AttributeData data = (AttributeData)button.getParent().getData();
-                    MBeanUtility.updateAttribute(_mbean, data, text.getText());
-                    button.getShell().close();
-                    refresh();
+                    try
+                    {
+                        Button button = (Button)event.widget;
+                        Text text = (Text)button.getData();
+                        AttributeData data = (AttributeData)button.getParent().getData();
+                        MBeanUtility.updateAttribute(_mbean, data, text.getText());
+                        button.getShell().close();
+                        refresh();
+                    }
+                    catch (Exception ex)
+                    {
+                        MBeanUtility.handleException(_mbean, ex);
+                    }
                 }
             });
         
@@ -612,7 +627,15 @@ public class AttributesTabControl extends TabControl
             _tableViewer.setInput(null);
             return;
         }
-        ManagedAttributeModel attributesList = MBeanUtility.getAttributes(mbean);
+        ManagedAttributeModel attributesList = null;
+        try
+        {
+            attributesList = MBeanUtility.getAttributes(mbean);
+        }
+        catch(Exception ex)
+        {
+            MBeanUtility.handleException(_mbean, ex);
+        }
         _tableViewer.setInput(attributesList);
         _table.setItemCount(attributesList.getCount());