[Libreoffice-commits] core.git: connectivity/source

Stephan Bergmann sbergman at redhat.com
Fri May 8 07:17:13 PDT 2015


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

New commits:
commit 2c70139d6a8d8fabd671455d3edd32117783d4d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 8 16:16:35 2015 +0200

    ...or rather, like this
    
    Change-Id: I87b547b76f6e214730757bec375b1d7b3d5d8f41

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index cd99994..be913dd 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -90,7 +90,7 @@ sal_Int32 SAL_CALL java_io_Reader::available(  ) throw(::com::sun::star::io::Not
         out = t.pEnv->CallBooleanMethod( object, mID);
         ThrowRuntimeException(t.pEnv,*this);
     } //t.pEnv
-    return (m_buf != boost::none && out) ? 1 : 0; // no way to tell *how much* is ready
+    return (m_buf != boost::none ? 1 : 0) + (out ? 1 : 0); // no way to tell *how much* is ready
 }
 
 void SAL_CALL java_io_Reader::closeInput(  ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)


More information about the Libreoffice-commits mailing list