INTEGRATION: CWS beansplit (1.2.20); FILE MERGED

2004/10/19 10:52:07 mi 1.2.20.1: Null-Pointer Access and wrong EOF return value

1 files changed, 4 insertions, 4 deletions

diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index e75ee96a1864..995096474f80 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: InputStreamToXInputStreamAdapter.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-05-19 10:29:18 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 11:18:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,7 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
             // must <= len.
             //
             if (bytesRead <= 0) {
-                return(-1);
+                return(0);
         }
         return ((int)bytesRead);
 
@@ -157,7 +157,7 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
             // must <= len.
             //
             if (bytesRead <= 0) {
-                return(-1);
+                return(0);
         }
         return ((int)bytesRead);