From 19e833912ff85991285bbdc352d6c02efe5a0dbf Mon Sep 17 00:00:00 2001
From: rene-ye <rene-ye@users.noreply.github.com>
Date: Thu, 22 Feb 2018 13:23:44 -0800
Subject: [PATCH] merge conflict #1

---
 .../microsoft/sqlserver/jdbc/SQLServerResultSet.java | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java
index cb5442511..6e8e064a4 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java
@@ -6534,18 +6534,6 @@ private void fillBlobs() {
 				activeBlob = null;
 			}
     	}
-    	
-        /*for (int i = 0; i < streamObjects.size(); i++)	{
-        	if(streamObjects.get(i) instanceof SQLServerBlob) {
-	    		try {
-					((SQLServerBlob) streamObjects.get(i)).fillByteArray();
-					streamObjects.remove(i);
-				} catch (SQLException e) {
-	                if (logger.isLoggable(java.util.logging.Level.FINER))
-	                    logger.finer(toString() + "Filling blobs before closing: " + e.getMessage());
-				}
-        	}
-        }*/
     }
 
     /**