summaryrefslogtreecommitdiff
path: root/qpid/java/management/eclipse-plugin/src
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
commitc7865d5b15e47eb090ff6c85d83bbfa3b4c3b565 (patch)
treed68a607eeabe7b36ff9ee8708080290e1a57d225 /qpid/java/management/eclipse-plugin/src
parent490c9dd20aba3fb77cb996cf2257925c941756c6 (diff)
downloadqpid-python-c7865d5b15e47eb090ff6c85d83bbfa3b4c3b565.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@1214145 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management/eclipse-plugin/src')
-rw-r--r--qpid/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/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 417734e5fb..cc2e4290a0 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/qpid/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;
}