Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 85904 invoked from network); 19 Feb 2007 19:37:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Feb 2007 19:37:32 -0000 Received: (qmail 81176 invoked by uid 500); 19 Feb 2007 19:37:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 81131 invoked by uid 500); 19 Feb 2007 19:37:40 -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 81122 invoked by uid 99); 19 Feb 2007 19:37:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Feb 2007 11:37:40 -0800 X-ASF-Spam-Status: No, hits=-99.5 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; Mon, 19 Feb 2007 11:37:31 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 66CDE1A981A; Mon, 19 Feb 2007 11:37:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r509309 - /activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java Date: Mon, 19 Feb 2007 19:37:11 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070219193711.66CDE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Mon Feb 19 11:37:10 2007 New Revision: 509309 URL: http://svn.apache.org/viewvc?view=rev&rev=509309 Log: Protect against npe Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java?view=diff&rev=509309&r1=509308&r2=509309 ============================================================================== --- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java (original) +++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/command/Message.java Mon Feb 19 11:37:10 2007 @@ -92,7 +92,10 @@ copy.producerId = producerId; copy.transactionId = transactionId; copy.destination = destination; - copy.messageId = messageId.copy(); + if( messageId!=null ) + copy.messageId = messageId.copy(); + else + copy.messageId = messageId; copy.originalDestination = originalDestination; copy.originalTransactionId = originalTransactionId; copy.expiration = expiration;