[kaffe] DataInputStream related merge

[Dalibor Topic]

--0-441288651-1035368244=:25804
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

--- Jukka Santala <jsantala@morphine.tml.hut.fi>
wrote:
> On Tue, 8 Oct 2002, Dalibor Topic wrote: 
> > I switched DataInputStream to method b recently
> for
> > that reason. I don't think going back to the
> previous
> > version is a good idea, as it fixes one bug by
> > introducing another.
> 
> Actually, the switch to method b fixed one bug by
> introducing another ;)

Yeah, sorry about that. Could you try the attached
patch and see if it works in your context? It is an
attempt to get the best of both worlds, and runs your
test case as expected.

best regards,

dalibor topic


__________________________________________________
Do you Yahoo!?
Y! Web Hosting - Let the expert host your web site
http://webhosting.yahoo.com/
--0-441288651-1035368244=:25804
Content-Type: application/octet-stream; name="kaffe-datainputstream-readline.patch"
Content-Transfer-Encoding: base64
Content-Description: kaffe-datainputstream-readline.patch
Content-Disposition: attachment; filename="kaffe-datainputstream-readline.patch"

LS0tIGthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0
U3RyZWFtLmphdmEJV2VkIFNlcCAgNCAwNjoyMTo1MiAyMDAyCisrKyBwYXRj
aGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0
U3RyZWFtLmphdmEJV2VkIE9jdCAyMyAxMjowNTo0OSAyMDAyCkBAIC0xNyw3
ICsxNyw3IEBACiAJcHJpdmF0ZSBib29sZWFuIHNraXBOZXh0TEY7CiAKIHB1
YmxpYyBEYXRhSW5wdXRTdHJlYW0oSW5wdXRTdHJlYW0gaW4pIHsKLQlzdXBl
cihpbik7CisJc3VwZXIobmV3IFB1c2hiYWNrSW5wdXRTdHJlYW0oaW4pKTsK
IH0KIAogcHVibGljIGZpbmFsIGludCByZWFkKGJ5dGUgYltdKSB0aHJvd3Mg
SU9FeGNlcHRpb24gewpAQCAtMTAxLDcgKzEwMSwzNCBAQAogCQkJCWJyZWFr
OwogCQkJfQogCQkJaWYgKGNoID09ICdccicpIHsKLQkJCQlza2lwTmV4dExG
ID0gdHJ1ZTsKKwkJCQkvKiBTaW5jZSBub3QgYWxsIHN0cmVhbXMgc3VwcG9y
dCBtYXJraW5nCisJCQkJICAgYW5kIHJlc2V0dGluZywgdGhlIHVuZGVybHlp
bmcgc3RyZWFtIGlzCisJCQkJICAgd3JhcHBlZCBpbiBhIFB1c2hiYWNrSW5w
dXRTdHJlYW0uIElmCisJCQkJICAgdGhlcmUgYXJlIGJ5dGVzIGF2YWlsYWJs
ZSBmb3IgcmVhZGluZywKKwkJCQkgICB3ZSB1c2UgaXRzIHJlYWQoKSBhbmQg
dW5yZWFkKCkgbWV0aG9kcworCQkJCSAgIHRvIHNraXAgdGhlIGV2ZW50dWFs
ICdcbicgY2hhcmFjdGVyLgorCisJCQkJICAgTWFraW5nIHN1cmUgYnl0ZXMg
YXJlIGF2YWlsYWJsZSBiZWZvcmUKKwkJCQkgICByZWFkaW5nIHNob3VsZCBw
cmV2ZW50IGhhbmdpbmcgb24gYSBzb2NrZXQuCisKKwkJCQkgICBUaGUgYWx0
ZXJuYXRpdmUgbWV0aG9kIGlzIHRvCXNldCBhCisJCQkJICAgc2tpcE5leHRM
RiBmbGFnLiBJZiB0aGUgdXNlciBzd2l0Y2hlcyB0bworCQkJCSAgIGFub3Ro
ZXIgSW5wdXRTdHJlYW0gdXNpbmcgdGhlIHVuZGVybHlpbmcKKwkJCQkgICBz
dHJlYW0sIGFzIHNoZSBtaWdodCBoYXZlIHRvIGRlYWwgd2l0aCBhCisJCQkJ
ICAgJ1xuJyBjaGFyYWN0ZXIgdGhhdCBzaG91bGQgaGF2ZSBiZWVuCisJCQkJ
ICAgc2tpcHBlZC4KKwkJCQkqLworCQkJCWlmIChhdmFpbGFibGUoKSA+IDAp
IHsKKwkJCQkJZmluYWwgaW50IGxmID0gcmVhZCgpOworCisJCQkJCWlmIChs
ZiAhPSAtMSAmJiBsZiAhPSAnXG4nKSB7CisJCQkJCQkoKFB1c2hiYWNrSW5w
dXRTdHJlYW0pIGluKS51bnJlYWQoKGJ5dGUpIGxmKTsKKwkJCQkJfQorCQkJ
CX0KKwkJCQllbHNlIHsKKwkJCQkJc2tpcE5leHRMRiA9IHRydWU7CisJCQkJ
fQorCiAJCQkJYnJlYWs7CiAJCQl9CiAK

--0-441288651-1035368244=:25804--