Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 12517 invoked from network); 22 Aug 2008 08:11:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Aug 2008 08:11:21 -0000 Received: (qmail 31474 invoked by uid 500); 22 Aug 2008 08:11:20 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 31448 invoked by uid 500); 22 Aug 2008 08:11:20 -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 31439 invoked by uid 99); 22 Aug 2008 08:11:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 01:11:20 -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, 22 Aug 2008 08:10:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2419523889C2; Fri, 22 Aug 2008 01:11:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688014 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java Date: Fri, 22 Aug 2008 08:11:00 -0000 To: commits@activemq.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080822081101.2419523889C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jstrachan Date: Fri Aug 22 01:11:00 2008 New Revision: 688014 URL: http://svn.apache.org/viewvc?rev=688014&view=rev Log: fixed bad use of null for AMQ-1904 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java?rev=688014&r1=688013&r2=688014&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java Fri Aug 22 01:11:00 2008 @@ -26,6 +26,7 @@ import javax.jms.DeliveryMode; import javax.jms.JMSException; +import javax.jms.Destination; import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; @@ -154,7 +155,7 @@ rc.put("JMSCorrelationID", m.getJMSCorrelationID()); rc.put("JMSDestination", "" + m.getJMSDestination()); rc.put("JMSMessageID", m.getJMSMessageID()); - rc.put("JMSReplyTo", "" + m.getJMSReplyTo()); + rc.put("JMSReplyTo",toString(m.getJMSReplyTo())); rc.put("JMSType", m.getJMSType()); rc.put("JMSDeliveryMode", m.getJMSDeliveryMode() == DeliveryMode.PERSISTENT ? "PERSISTENT" : "NON-PERSISTENT"); rc.put("JMSExpiration", Long.valueOf(m.getJMSExpiration())); @@ -212,6 +213,13 @@ return rc; } + protected String toString(Object value) { + if (value == null) { + return null; + } + return value.toString(); + } + protected TabularType createTabularType(Class type, OpenType openType) throws OpenDataException { String typeName = "java.util.Map";