From 27ec68d22d0cfc7b8a5145d2d67b18d0b8b0b5b1 Mon Sep 17 00:00:00 2001
From: "Adrian T. Co" <aco@apache.org>
Date: Sun, 19 Mar 2006 12:48:32 +0000
Subject: [PATCH] - Added checking for NPE - Added newline in maven.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386960 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/activemq/transport/stomp/StompWireFormat.java   | 3 ++-
 maven.xml                                                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
index 8499ac7500..cd35b2c085 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
@@ -140,7 +140,8 @@ public class StompWireFormat implements WireFormat {
             MessageDispatch md = (MessageDispatch)packet;
             Message message = md.getMessage();
             Subscription sub = (Subscription) subscriptionsByConsumerId.get(md.getConsumerId());
-            sub.receive(md, out);
+            if (sub != null)
+                sub.receive(md, out);
         }
         return null;
     }
diff --git a/maven.xml b/maven.xml
index d7bc5aa90a..d8925302e7 100755
--- a/maven.xml
+++ b/maven.xml
@@ -181,6 +181,7 @@
     <maven:reactor basedir="." goals="test" includes="${maven.multiproject.includes}" ignoreFailures="true"/>
     
     <j:if test="${!failedProjects.isEmpty()}">
+        <ant:echo> </ant:echo>
         <ant:echo>There are test failures in the following modules:</ant:echo>
         <j:forEach var="failedProj" items="${failedProjects}">
             <ant:echo>  ${failedProj} </ant:echo>