# HG changeset patch
# User Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
# Date 1529487018 -7200
# Node ID b992f0ea77c254deace0a54a0c063dda0063f306
# Parent  0a118436067b886977e647a71f69ab4b45d25246
Fixes for bugs 6614, 6615 and 6616 (ie in a MAPI connection Datablock check for a null value first before retrieving a value as an object or string)

diff --git a/src/main/java/nl/cwi/monetdb/mcl/protocol/oldmapi/OldMapiDataBlockResponse.java b/src/main/java/nl/cwi/monetdb/mcl/protocol/oldmapi/OldMapiDataBlockResponse.java
--- a/src/main/java/nl/cwi/monetdb/mcl/protocol/oldmapi/OldMapiDataBlockResponse.java
+++ b/src/main/java/nl/cwi/monetdb/mcl/protocol/oldmapi/OldMapiDataBlockResponse.java
@@ -226,6 +226,9 @@ public class OldMapiDataBlockResponse ex
 
 	@Override
 	public String getValueAsString(int column) {
+		if(this.checkValueIsNull(column)) {
+			return null;
+		}
 		switch (this.jdbcSQLTypes[column]) {
 			case Types.CHAR:
 			case Types.VARCHAR:
@@ -274,6 +277,9 @@ public class OldMapiDataBlockResponse ex
 
 	@Override
 	public Object getValueAsObject(int column) {
+		if(this.checkValueIsNull(column)) {
+			return null;
+		}
 		switch (this.jdbcSQLTypes[column]) {
 			case Types.BOOLEAN:
 				return ((byte[]) this.data[column])[this.blockLine] == 1;