[libpostgresql-jdbc-java] 85/93: setNull, setString, setObject may fail if a specified type cannot be transfered in a binary mode #151

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1102
in repository libpostgresql-jdbc-java.

commit 5ea20426a944b5eede78867c5ef329727a04082e
Author: Dave Cramer <davecramer at gmail.com>
Date:   Thu May 1 09:18:06 2014 -0400

    setNull, setString, setObject may fail if a specified type cannot be transfered in a binary mode #151
---
 org/postgresql/core/v3/SimpleParameterList.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/org/postgresql/core/v3/SimpleParameterList.java b/org/postgresql/core/v3/SimpleParameterList.java
index 05d8b5e..220e50e 100644
--- a/org/postgresql/core/v3/SimpleParameterList.java
+++ b/org/postgresql/core/v3/SimpleParameterList.java
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
 *
-* Copyright (c) 2004-2012, PostgreSQL Global Development Group
+* Copyright (c) 2004-2014, PostgreSQL Global Development Group
 * Copyright (c) 2004, Open Cloud Limited.
 *
 *
@@ -131,7 +131,14 @@ class SimpleParameterList implements V3ParameterList {
     }
 
     public void setNull(int index, int oid) throws SQLException {
-        bind(index, NULL_OBJECT, oid, BINARY);
+        
+        int binaryTransfer = TEXT;
+        
+        if (protoConnection.useBinaryForReceive(oid))
+        {
+            binaryTransfer = BINARY;
+        }
+        bind(index, NULL_OBJECT, oid, binaryTransfer);
     }
 
     public String toString(int index) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git