Author: aco
Date: Sun Mar 19 04:48:32 2006
New Revision: 386960
URL: http://svn.apache.org/viewcvs?rev=386960&view=rev
Log:
- Added checking for NPE
- Added newline in maven.xml
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
incubator/activemq/trunk/maven.xml
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java?rev=386960&r1=386959&r2=386960&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
Sun Mar 19 04:48:32 2006
@@ -140,7 +140,8 @@
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;
}
Modified: incubator/activemq/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/maven.xml?rev=386960&r1=386959&r2=386960&view=diff
==============================================================================
--- incubator/activemq/trunk/maven.xml (original)
+++ incubator/activemq/trunk/maven.xml Sun Mar 19 04:48:32 2006
@@ -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>
