Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 40508 invoked from network); 5 Jan 2007 10:10:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2007 10:10:15 -0000 Received: (qmail 21929 invoked by uid 500); 5 Jan 2007 10:10:22 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 21916 invoked by uid 500); 5 Jan 2007 10:10:22 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 21907 invoked by uid 99); 5 Jan 2007 10:10:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:10:22 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:10:13 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A48931A981A; Fri, 5 Jan 2007 02:09:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492956 - in /incubator/qpid/trunk/qpid/java/management/eclipse-plugin: bin/qpidmc.sh src/main/java/org/apache/qpid/management/ui/views/MBeanView.java Date: Fri, 05 Jan 2007 10:09:15 -0000 To: qpid-commits@incubator.apache.org From: bhupendrab@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070105100915.A48931A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bhupendrab Date: Fri Jan 5 02:09:14 2007 New Revision: 492956 URL: http://svn.apache.org/viewvc?view=rev&rev=492956 Log: QPID-213 Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh?view=diff&rev=492956&r1=492955&r2=492956 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh Fri Jan 5 02:09:14 2007 @@ -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" Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java?view=diff&rev=492956&r1=492955&r2=492956 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java Fri Jan 5 02:09:14 2007 @@ -138,12 +138,13 @@ 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(); } }