summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2011-12-14 10:41:40 +0000
committerKeith Wall <kwall@apache.org>2011-12-14 10:41:40 +0000
commitb8ccd7ac40b7aedc9a1c2cd03b10cc896cd45f7e (patch)
tree1b3b299738c8d481e0f1267259deac5c81fd73cb
parentb5392ed03a3c918ba8f17e001a2b15417e79290b (diff)
downloadqpid-python-b8ccd7ac40b7aedc9a1c2cd03b10cc896cd45f7e.tar.gz
QPID-3672: Occasional NPE from Qpid Management Console when connecting to server
Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1214145 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 417734e5fb..cc2e4290a0 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
@@ -579,7 +579,7 @@ public class NavigationView extends ViewPart
List<TreeObject> childNodes = typeNode.getChildren();
for (TreeObject child : childNodes)
{
- if (MBEAN.equals(child.getType()) && mbeanName.equals(child.getName()))
+ if (MBEAN.equals(child.getType()) && mbeanName != null && mbeanName.equals(child.getName()))
{
return true;
}