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

New commits:
commit f17000e35c861de1171a6e2a75403f40ee3bffb0
Author: Lionel Elie Mamane <lio...@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/33028
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx 
b/connectivity/source/drivers/jdbc/Reader.cxx
index 2f39150..aaf5ff5 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( 
css::uno::Sequence< sal_Int8 >& aD
     }
 
     if(nBytesToRead == 0)
-        return 0;
+        return nBytesWritten;
 
     sal_Int32 nCharsToRead = (nBytesToRead + 1)/2;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to