Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-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 E8547BBFB for ; Wed, 4 Jan 2012 13:55:58 +0000 (UTC) Received: (qmail 95413 invoked by uid 500); 4 Jan 2012 13:55:58 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 95372 invoked by uid 500); 4 Jan 2012 13:55:58 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 95365 invoked by uid 99); 4 Jan 2012 13:55:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2012 13:55:58 +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, 04 Jan 2012 13:55:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 65C75238890B for ; Wed, 4 Jan 2012 13:55:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1227162 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Date: Wed, 04 Jan 2012 13:55:37 -0000 To: commits@qpid.apache.org From: rgodfrey@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120104135537.65C75238890B@eris.apache.org> Author: rgodfrey Date: Wed Jan 4 13:55:37 2012 New Revision: 1227162 URL: http://svn.apache.org/viewvc?rev=1227162&view=rev Log: QPID-3714 : Fix for NPE when a transient message (or when using the Memory Store) has no body Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java?rev=1227162&r1=1227161&r2=1227162&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Wed Jan 4 13:55:37 2012 @@ -84,6 +84,10 @@ public class StoredMemoryMessage impleme public int getContent(int offset, ByteBuffer dst) { + if(_content == null) + { + return 0; + } ByteBuffer src = _content.duplicate(); int oldPosition = src.position(); @@ -102,6 +106,10 @@ public class StoredMemoryMessage impleme public ByteBuffer getContent(int offsetInMessage, int size) { + if(_content == null) + { + return null; + } ByteBuffer buf = _content.duplicate(); if(offsetInMessage != 0) --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org