[nifi] branch master updated: NIFI-6100 Use setBytes in JdbcCommon for binary types

[mthomsen]

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

mthomsen 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 81ddd02  NIFI-6100 Use setBytes in JdbcCommon for binary types
81ddd02 is described below

commit 81ddd02ca89cc068a6367eaeae575bac5c5e2ad5
Author: Aaron Leon <aaronl...@u.northwestern.edu>
AuthorDate: Thu Apr 4 23:23:33 2019 -0500

    NIFI-6100 Use setBytes in JdbcCommon for binary types
    
    This closes #3410
    
    Signed-off-by: Mike Thomsen <mikerthom...@gmail.com>
---
 .../src/main/java/org/apache/nifi/util/db/JdbcCommon.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
index e41b3cb..9d57f10 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
@@ -807,7 +807,11 @@ public class JdbcCommon {
                             throw new ParseException("Unable to parse binary 
data using the formatter `" + valueFormat + "`.",0);
                     }
 
-                    stmt.setBinaryStream(parameterIndex, new 
ByteArrayInputStream(bValue), bValue.length);
+                    try {
+                        stmt.setBinaryStream(parameterIndex, new 
ByteArrayInputStream(bValue), bValue.length);
+                    } catch (Exception ex) {
+                        stmt.setBytes(parameterIndex, bValue);
+                    }
 
                     break;
                 case Types.CHAR: