summaryrefslogtreecommitdiff
path: root/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java')
-rw-r--r--java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java b/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java
index 213d8b7730..9b97f87d04 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/subscription/AbstractSubscription.java
@@ -178,7 +178,7 @@ public abstract class AbstractSubscription implements Subscription
else
{
// no interest in messages we can't convert
- if(MessageConverterRegistry.getConverter(entry.getMessage().getClass(), _messageClass)==null)
+ if(_messageClass != null && MessageConverterRegistry.getConverter(entry.getMessage().getClass(), _messageClass)==null)
{
return false;
}