Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 67254 invoked from network); 18 Jul 2008 04:08:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jul 2008 04:08:03 -0000 Received: (qmail 1349 invoked by uid 500); 18 Jul 2008 04:08:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1300 invoked by uid 500); 18 Jul 2008 04:08:03 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 1291 invoked by uid 99); 18 Jul 2008 04:08:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2008 21:08:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2008 04:07:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF09123889FE; Thu, 17 Jul 2008 21:07:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r677815 - in /geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager: helper/JMSMessageHelper.java wizard/ListScreenHandler.java Date: Fri, 18 Jul 2008 04:07:11 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080718040711.BF09123889FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Thu Jul 17 21:07:10 2008 New Revision: 677815 URL: http://svn.apache.org/viewvc?rev=677815&view=rev Log: use queueName as PhysicalName if PhysicalName is undefined Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java?rev=677815&r1=677814&r2=677815&view=diff ============================================================================== --- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java (original) +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java Thu Jul 17 21:07:10 2008 @@ -48,6 +48,7 @@ import org.apache.geronimo.console.util.PortletManager; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.KernelRegistry; import org.apache.geronimo.kernel.proxy.GeronimoManagedBean; @@ -256,7 +257,14 @@ for (int j = 0; j < admins.length; j++) { GeronimoManagedBean bean = (GeronimoManagedBean) admins[j]; ObjectName name = ObjectName.getInstance(bean.getObjectName()); - String physicalNameTemp = (String) admins[j].getConfigProperty("PhysicalName"); + String queueName = name.getKeyProperty(NameFactory.J2EE_NAME); + String physicalNameTemp = null; + try { + physicalNameTemp = (String) admins[j].getConfigProperty("PhysicalName"); + } catch (Exception e) { + log.warn("PhysicalName undefined, using queueName as PhysicalName"); + physicalNameTemp = queueName; + } if (physicalName != null && physicalName.equals(physicalNameTemp)) { AbstractName absName = kernel.getAbstractNameFor(bean); dest = (Destination) kernel.invoke(absName, "$getResource"); Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java?rev=677815&r1=677814&r2=677815&view=diff ============================================================================== --- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (original) +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Thu Jul 17 21:07:10 2008 @@ -183,7 +183,7 @@ try { physicalName = (String) admins[j].getConfigProperty("PhysicalName"); } catch (Exception e) { - log.warn("PhysicalName undefined, using queueName as PhysicalName", e); + log.warn("PhysicalName undefined, using queueName as PhysicalName"); physicalName = queueName; } String destType = admins[j].getAdminObjectInterface().indexOf("Queue") > -1 ? "Queue" : "Topic";