diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-01-27 12:27:19 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-01-27 12:27:19 +0000 |
| commit | 77638d7b61ef2aedbf2b4a330c558704e326d231 (patch) | |
| tree | 6cc430e7b5009691dd7a7e6ea7cb1e635f767c06 /qpid/java/management | |
| parent | 5d72e9d1fd97f666f0fddbc9dcc25a6e45733412 (diff) | |
| download | qpid-python-77638d7b61ef2aedbf2b4a330c558704e326d231.tar.gz | |
QPID-1128 - Patch from Robbert Gemmell to prevent NPE whilst adding queue to navigation.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@738068 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management')
2 files changed, 8 insertions, 4 deletions
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java index 24dfb519fd..d4b2ed1db6 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java @@ -204,6 +204,11 @@ public abstract class MBeanTypeTabControl for (int i = 0; i < selectedItems.length; i++) { String name = selectedItems[i]; + int nameEnd = name.indexOf(" ("); + if (nameEnd != -1) + { + name = name.substring(0, nameEnd); + } // pass the ManagedBean to the navigation view to be added ManagedBean mbean = _objectsMap.get(name); IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java index 31a0bc857b..9fcf32abdd 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java @@ -246,11 +246,10 @@ public class QueueTypeTabControl extends MBeanTypeTabControl { continue; } - AttributeData data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_DEPTH); - String value = mbean.getName() + " (" + data.getValue().toString() + " KB)"; + String value = mbean.getName(); items.add(value); - //items[i] = mbean.getName() + " (" + value + " KB)"; getMBeansMap().put(value, mbean); + AttributeData data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_DEPTH); _queueDepthMap.put(data, mbean); data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_CONSUMERCOUNT); _queueConsumerCountMap.put(data, mbean); @@ -289,7 +288,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl { ManagedBean mbean = _queueConsumerCountMap.get(data); String value = data.getValue().toString(); - items[i++] = mbean.getName() + " (" + value + " )"; + items[i++] = mbean.getName() + " (" + value + ")"; } getListWidget().setItems(items); } |