From commits-return-16373-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Jun 8 21:37:41 2011 Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD18F4EE6 for ; Wed, 8 Jun 2011 21:37:41 +0000 (UTC) Received: (qmail 72137 invoked by uid 500); 8 Jun 2011 21:37:41 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 72108 invoked by uid 500); 8 Jun 2011 21:37:41 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 72101 invoked by uid 99); 8 Jun 2011 21:37:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2011 21:37:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 08 Jun 2011 21:37:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8077523889C5; Wed, 8 Jun 2011 21:37:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133564 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Date: Wed, 08 Jun 2011 21:37:18 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110608213718.8077523889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Wed Jun 8 21:37:18 2011 New Revision: 1133564 URL: http://svn.apache.org/viewvc?rev=1133564&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3337 Create a better ObjectName for dynamic destination producers. Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=1133564&r1=1133563&r2=1133564&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Wed Jun 8 21:37:18 2011 @@ -707,8 +707,8 @@ public class ManagedRegionBroker extends String destinationName = "destinationName="; if (producerInfo.getDestination() == null) { - destinationType += "NOTSET"; - destinationName += "NOTSET"; + destinationType += "dynamic"; + destinationName = null; } else { destinationType += producerInfo.getDestination().getDestinationTypeAsString(); destinationName += JMXSupport.encodeObjectNamePart(producerInfo.getDestination().getPhysicalName()); @@ -719,7 +719,8 @@ public class ManagedRegionBroker extends ObjectName objectName = new ObjectName(brokerObjectName.getDomain() + ":" + "BrokerName=" + map.get("BrokerName") + "," + "Type=Producer" + "," - + destinationType + "," + destinationName + "," + + destinationType + "," + + (destinationName != null ? destinationName + "," : "") + clientId + "," + producerId); return objectName; }