PatchSet 5552
Date: 2004/12/06 18:50:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: handle 0 byte reads in BufferedInputStream
2004-12-06 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/io/BufferedInputStream.java:
Resynced with GNU Classpath.
2004-12-06 Jeroen Frijters <[EMAIL PROTECTED]>
* java/io/BufferedInputStream.java
(read(byte,int,int)): Handle case when zero bytes are requested.
Members:
ChangeLog:1.3098->1.3099
libraries/javalib/java/io/BufferedInputStream.java:1.15->1.16
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3098 kaffe/ChangeLog:1.3099
--- kaffe/ChangeLog:1.3098 Mon Dec 6 18:39:46 2004
+++ kaffe/ChangeLog Mon Dec 6 18:50:24 2004
@@ -1,5 +1,15 @@
2004-12-06 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/io/BufferedInputStream.java:
+ Resynced with GNU Classpath.
+
+ 2004-12-06 Jeroen Frijters <[EMAIL PROTECTED]>
+
+ * java/io/BufferedInputStream.java
+ (read(byte,int,int)): Handle case when zero bytes are requested.
+
+2004-12-06 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/awt/color/ICC_Profile.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/io/BufferedInputStream.java
diff -u kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.15
kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.16
--- kaffe/libraries/javalib/java/io/BufferedInputStream.java:1.15 Mon Jul
12 03:33:34 2004
+++ kaffe/libraries/javalib/java/io/BufferedInputStream.java Mon Dec 6
18:50:26 2004
@@ -261,6 +261,9 @@
if (off < 0 || len < 0 || b.length - off < len)
throw new IndexOutOfBoundsException();
+ if (len == 0)
+ return 0;
+
if (pos >= count && !refill())
return -1; // No bytes were read before EOF.
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
