Author: robbie
Date: Wed Jul 16 16:59:42 2014
New Revision: 1611095
URL: http://svn.apache.org/r1611095
Log:
PROTON-631: avoid NPE in InboundTransformer if the 'x-opt-jms-type' message
annotation was set with a null value rather than being ommitted
Applied patch from Timothy Bish.
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java?rev=1611095&r1=1611094&r2=1611095&view=diff
==============================================================================
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
Wed Jul 16 16:59:42 2014
@@ -137,7 +137,7 @@ public abstract class InboundTransformer
if( ma!=null ) {
for (Map.Entry<?,?> entry : ma.getValue().entrySet()) {
String key = entry.getKey().toString();
- if( "x-opt-jms-type".equals(key.toString()) ) {
+ if( "x-opt-jms-type".equals(key.toString()) &&
entry.getValue() != null ) {
jms.setJMSType(entry.getValue().toString());
} else if( "x-opt-to-type".equals(key.toString()) ) {
toAttributes =
toClassFromAttributes(entry.getValue().toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
