diff options
| author | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-01-05 10:09:14 +0000 |
|---|---|---|
| committer | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-01-05 10:09:14 +0000 |
| commit | 9baaa04848053dfa6877e603eccc6b0ba148103c (patch) | |
| tree | fff4c66ecaa2abf6633f40e35031560baf10be30 /qpid/java | |
| parent | 65db6514e99bdce273d99d443d1be9b5d5c4882e (diff) | |
| download | qpid-python-9baaa04848053dfa6877e603eccc6b0ba148103c.tar.gz | |
QPID-213
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@492956 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rwxr-xr-x | qpid/java/management/eclipse-plugin/bin/qpidmc.sh | 10 | ||||
| -rw-r--r-- | qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/qpid/java/management/eclipse-plugin/bin/qpidmc.sh b/qpid/java/management/eclipse-plugin/bin/qpidmc.sh index c9ab423fdd..13e3edcc94 100755 --- a/qpid/java/management/eclipse-plugin/bin/qpidmc.sh +++ b/qpid/java/management/eclipse-plugin/bin/qpidmc.sh @@ -1,3 +1,13 @@ #!/bin/bash +if [ "$JAVA_HOME" == "" ]; then + echo "The JAVA_HOME environment variable is not defined"; + exit 0; +fi + +if [ "$QPIDMC_HOME" == "" ]; then + echo "The QPIDMC_HOME environment variable is not defined correctly"; + exit 0; +fi + "$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java index 96981e755f..62871c4c91 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java @@ -138,12 +138,13 @@ public class MBeanView extends ViewPart else { TreeObject parent = _selectedNode.getParent(); - while (!parent.getType().equals(Constants.SERVER)) + while (parent != null && !parent.getType().equals(Constants.SERVER)) { parent = parent.getParent(); } - _server = (ManagedServer)parent.getManagedObject(); + if (parent != null && parent.getType().equals(Constants.SERVER)) + _server = (ManagedServer)parent.getManagedObject(); } } |