From fe9bd4f59412c5aa98a17ef375c0d381de5ef88a Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Mon, 15 Oct 2007 21:36:37 +0000 Subject: [PATCH] fix for npe git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@584929 13f79535-47bb-0310-9956-ffa450edef68 --- .../activemq/store/amq/AMQMessageStore.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java index d69bbb2688..d597b7d4d2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java @@ -379,14 +379,17 @@ public class AMQMessageStore implements MessageStore { */ public Message getMessage(MessageId identity) throws IOException { Location location = getLocation(identity); - DataStructure rc = peristenceAdapter.readCommand(location); - try { - return (Message) rc; - } catch (ClassCastException e) { - throw new IOException("Could not read message " + identity - + " at location " + location - + ", expected a message, but got: " + rc); + if (location != null) { + DataStructure rc = peristenceAdapter.readCommand(location); + try { + return (Message) rc; + } catch (ClassCastException e) { + throw new IOException("Could not read message " + identity + + " at location " + location + + ", expected a message, but got: " + rc); + } } + return null; } protected Location getLocation(MessageId messageId) throws IOException {