Merge pull request #232 from pierresouchay/bugfixes

Fixed missing this -> wrong semantics
microsoft · Apr 17, 2017 · 1bc07b2 · 1bc07b2
2 parents 7d65ebb + e178fca
commit 1bc07b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java
@@ -152,6 +152,9 @@ public InputStream getBinaryStream() throws SQLException {
             return (InputStream) activeStreams.get(0);
         }
         else {
+            if (value == null) {
+                throw new SQLServerException("Unexpected Error: blob value is null while all streams are closed.", null);
+            }
             return getBinaryStreamInternal(0, value.length);
         }
     }

diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercion.java b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercion.java
@@ -45,7 +45,7 @@ public DBCoercion(Class type) {
     public DBCoercion(Class type,
             int[] tempflags) {
         name = type.toString();
-        type = type;
+        this.type = type;
         for (int i = 0; i < tempflags.length; i++)
             flags.set(tempflags[i]);
     }