[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/Reader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e03d012047101043c0b71d79f5497728125e089
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jan 13 10:50:35 2017 +0100

    jdbc clob character stream: return 1 when returning a single odd byte
    
    if at that point nBytesToRead is 0, it may be that it was 1, but we
    have read one byte from the buffer (m_buf). So in this case, return 1,
    not 0 (which would signal EOF).
    
    Change-Id: I229e53f1c38c80f709df244a3509caccd69c8ecf
    Reviewed-on: https://gerrit.libreoffice.org/33030
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 4e96bfa..be0fc05 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -124,7 +124,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< s
     }
 
     if(nBytesToRead == 0)
-        return 0;
+        return nBytesWritten;
 
     sal_Int32 nCharsToRead = (nBytesToRead + 1)/2;