merge conflict #1

sehrope · Feb 22, 2018 · 19e8339 · 19e8339
1 parent 9a1300e
commit 19e8339
Showing 1 changed file with 0 additions and 12 deletions.
diff --git 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());
-				}
-        	}
-        }*/
     }
 
     /**