Fixed a bug where calling length() after obtaining a stream would close the stream for Clobs/NClobs

src/main/java/com/microsoft/sqlserver/jdbc/PLPInputStream.java

@@ -25,9 +25,6 @@ class PLPInputStream extends BaseInputStream {
     static final int PLP_TERMINATOR = 0x00000000;
     private final static byte[] EMPTY_PLP_BYTES = new byte[0];
 
-    // Stated length of the PLP stream payload; -1 if unknown length.
-    int payloadLength;
-
     private static final int PLP_EOS = -1;
     private int currentChunkRemain;
 

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java

@@ -5,11 +5,8 @@
 
 package com.microsoft.sqlserver.jdbc;
 
-import static java.nio.charset.StandardCharsets.US_ASCII;
-import static java.nio.charset.StandardCharsets.UTF_16LE;
-
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,6 +17,7 @@
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.sql.Clob;
 import java.sql.SQLException;
 import java.text.MessageFormat;
@@ -152,7 +150,7 @@ abstract class SQLServerClobBase extends SQLServerLob implements Serializable {
 
     // The value of the CLOB that this Clob object represents.
     // This value is never null unless/until the free() method is called.
-    private String value;
+    protected String value;
 
     private final SQLCollation sqlCollation;
 
@@ -181,8 +179,9 @@ final public String toString() {
     // Unique id generator for each instance (used for logging).
     static private final AtomicInteger baseID = new AtomicInteger(0);
 
+    private Charset defaultCharset = null;
+
     // Returns unique id for each instance.
-
     private static int nextInstanceID() {
         return baseID.incrementAndGet();
     }
@@ -281,9 +280,20 @@ public InputStream getAsciiStream() throws SQLException {
         if (null != sqlCollation && !sqlCollation.supportsAsciiConversion())
             DataTypes.throwConversionError(getDisplayClassName(), "AsciiStream");
 
-        getStringFromStream();
-        InputStream getterStream = new BufferedInputStream(
-                new ReaderInputStream(new StringReader(value), US_ASCII, value.length()));
+        // Need to use a BufferedInputStream since the stream returned by this method is assumed to support mark/reset
+        InputStream getterStream;
+        if (null == value && !activeStreams.isEmpty()) {
+            InputStream inputStream = (InputStream) activeStreams.get(0);
+            try {
+                inputStream.reset();
+                getterStream = inputStream;
+            } catch (IOException e) {
+                throw new SQLServerException(e.getMessage(), null, 0, e);
+            }
+        } else {
+            getStringFromStream();
+            getterStream = new ByteArrayInputStream(value.getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+        }
         activeStreams.add(getterStream);
         return getterStream;
     }
@@ -301,11 +311,18 @@ public Reader getCharacterStream() throws SQLException {
         Reader getterStream = null;
         if (null == value && !activeStreams.isEmpty()) {
             InputStream inputStream = (InputStream) activeStreams.get(0);
-            getterStream = new BufferedReader(new InputStreamReader(inputStream, UTF_16LE));
+            try {
+                inputStream.reset();
+            } catch (IOException e) {
+                throw new SQLServerException(e.getMessage(), null, 0, e);
+            }
+            Charset cs = (defaultCharset == null) ? typeInfo.getCharset() : defaultCharset;
+            getterStream = new BufferedReader(new InputStreamReader(inputStream, cs));
         } else {
+            getStringFromStream();
             getterStream = new StringReader(value);
-            activeStreams.add(getterStream);
         }
+        activeStreams.add(getterStream);
         return getterStream;
     }
 
@@ -381,9 +398,8 @@ public String getSubString(long pos, int length) throws SQLException {
      */
     public long length() throws SQLException {
         checkClosed();
-
-        if (value == null && activeStreams.get(0) instanceof PLPInputStream) {
-            return (long) ((PLPInputStream) activeStreams.get(0)).payloadLength / 2;
+        if (value == null && activeStreams.get(0) instanceof BaseInputStream) {
+            return (long) ((BaseInputStream) activeStreams.get(0)).payloadLength;
         }
         return value.length();
     }
@@ -412,7 +428,8 @@ private void getStringFromStream() throws SQLServerException {
             } catch (IOException e) {
                 throw new SQLServerException(e.getMessage(), null, 0, e);
             }
-            value = new String((stream).getBytes(), typeInfo.getCharset());
+            Charset cs = (defaultCharset == null) ? typeInfo.getCharset() : defaultCharset;
+            value = new String((stream).getBytes(), cs);
         }
     }
 
@@ -661,6 +678,10 @@ public int setString(long pos, String str, int offset, int len) throws SQLExcept
 
         return len;
     }
+
+    protected void setDefaultCharset(Charset c) {
+        this.defaultCharset = c;
+    }
 }
 
 

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerNClob.java

@@ -32,10 +32,12 @@ public final class SQLServerNClob extends SQLServerClobBase implements NClob {
 
     SQLServerNClob(SQLServerConnection connection) {
         super(connection, "", connection.getDatabaseCollation(), logger, null);
+        this.setDefaultCharset(java.nio.charset.StandardCharsets.UTF_16LE);
     }
 
     SQLServerNClob(BaseInputStream stream, TypeInfo typeInfo) throws SQLServerException, UnsupportedEncodingException {
         super(null, stream, typeInfo.getSQLCollation(), logger, typeInfo);
+        this.setDefaultCharset(java.nio.charset.StandardCharsets.UTF_16LE);
     }
 
     @Override
@@ -65,7 +67,9 @@ public String getSubString(long pos, int length) throws SQLException {
 
     @Override
     public long length() throws SQLException {
-        return super.length();
+        // If streaming, every 2 bytes represents 1 character. If not, length() just returns string length
+        long length = super.length();
+        return (value == null) ? length / 2 : length;
     }
 
     @Override

src/main/java/com/microsoft/sqlserver/jdbc/SimpleInputStream.java

@@ -24,6 +24,9 @@ abstract class BaseInputStream extends InputStream {
 
     // Flag indicating whether the stream consumes and discards data as it reads it
     final boolean isStreaming;
+
+    // Stated length of the payload
+    int payloadLength;
 
     /** Generate the logging ID */
     private String parentLoggingInfo = "";
@@ -131,9 +134,6 @@ void resetHelper() throws IOException {
 
 final class SimpleInputStream extends BaseInputStream {
 
-    // Stated length of the payload
-    private final int payloadLength;
-
     /**
      * Initializes the input stream.
      */