[nifi] branch master updated: NIFI-6916 - handle null text message in JMSConsumer

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c3eba1  NIFI-6916 - handle null text message in JMSConsumer
3c3eba1 is described below

commit 3c3eba190937aee849da52149953b7cc63304166
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Fri Dec 6 05:43:39 2019 +0100

    NIFI-6916 - handle null text message in JMSConsumer
    
    This closes #3919.
    
    Signed-off-by: Mark Payne <marka...@hotmail.com>
---
 .../org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
index e23e795..7dd77e4 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
@@ -48,6 +48,9 @@ abstract class MessageBodyToBytesConverter {
      */
     public static byte[] toBytes(TextMessage message, Charset charset) {
         try {
+            if (message.getText() == null) {
+                return new byte[0];
+            }
             if (charset == null) {
                 return message.getText().getBytes();
             } else {
@@ -72,7 +75,6 @@ abstract class MessageBodyToBytesConverter {
         }
     }
 
-
     private static class BytesMessageInputStream extends InputStream {
         private BytesMessage message;
 
@@ -112,7 +114,6 @@ abstract class MessageBodyToBytesConverter {
         }
     }
 
-
     static class MessageConversionException extends RuntimeException {
         private static final long serialVersionUID = -1464448549601643887L;