[kaffe] DataInputStream related merge

[Jukka Santala]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---559023410-1804928587-1033740880=:21835
Content-Type: TEXT/PLAIN; charset=US-ASCII

Fairly straightforward merge from PocketLinux version, only problem is
neither version of Kaffe has exact implementation. With Kaffe.org's
version the problem is actually encountered, though - using Xerces XML
parser, the HTTP code will eat out the headers using readLine, but then
Xerces will use something else than DataInputStream to parse the remaining
data. Because that reader doesn't know to eat the extra line-feed, it gets
stuck at the beginning of the parse-input, which then doesn't fullfill the
XML-production condition, and causes all XML documents read over HTTP to
fail. If anybody can come up with an implementation that doesn't need
mark()/reset(), I'd be happy. If not, this corrects few exception issues
and at least works, unlike the old code :)

 -Jukka Santala

---559023410-1804928587-1033740880=:21835
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="kaffe-donwulff-fismerge.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.GSO.4.44.0210041714400.21835@morphine.tml.hut.fi>
Content-Description: 
Content-Disposition: attachment; filename="kaffe-donwulff-fismerge.patch"

SW5kZXg6IGxpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0Lmph
dmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL2th
ZmZlL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0
LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjUNCmRpZmYgLXUgLXIx
LjUgRGF0YUlucHV0LmphdmENCi0tLSBsaWJyYXJpZXMvamF2YWxpYi9qYXZh
L2lvL0RhdGFJbnB1dC5qYXZhCTI0IE5vdiAyMDAxIDAxOjUyOjQ5IC0wMDAw
CTEuNQ0KKysrIGxpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0
LmphdmEJNCBPY3QgMjAwMiAxNDowMjo1MCAtMDAwMA0KQEAgLTExLDIzICsx
MSwyNCBAQA0KICAqIG9mIHRoaXMgZmlsZS4NCiAgKi8NCiANCitpbXBvcnQg
amF2YS5sYW5nLlN0cmluZzsNCiANCiBwdWJsaWMgaW50ZXJmYWNlIERhdGFJ
bnB1dCB7DQogDQotYm9vbGVhbiByZWFkQm9vbGVhbigpIHRocm93cyBJT0V4
Y2VwdGlvbjsNCi1ieXRlIHJlYWRCeXRlKCkgdGhyb3dzIElPRXhjZXB0aW9u
Ow0KLWNoYXIgcmVhZENoYXIoKSB0aHJvd3MgSU9FeGNlcHRpb247DQotZG91
YmxlIHJlYWREb3VibGUoKSB0aHJvd3MgSU9FeGNlcHRpb247DQotZmxvYXQg
cmVhZEZsb2F0KCkgdGhyb3dzIElPRXhjZXB0aW9uOw0KLXZvaWQgcmVhZEZ1
bGx5KGJ5dGUgYltdKSB0aHJvd3MgSU9FeGNlcHRpb247DQotdm9pZCByZWFk
RnVsbHkoYnl0ZSBiW10sIGludCBvZmYsIGludCBsZW4pIHRocm93cyBJT0V4
Y2VwdGlvbjsNCi1pbnQgcmVhZEludCgpIHRocm93cyBJT0V4Y2VwdGlvbjsN
Ci1TdHJpbmcgcmVhZExpbmUoKSB0aHJvd3MgSU9FeGNlcHRpb247DQotbG9u
ZyByZWFkTG9uZygpIHRocm93cyBJT0V4Y2VwdGlvbjsNCi1zaG9ydCByZWFk
U2hvcnQoKSB0aHJvd3MgSU9FeGNlcHRpb247DQotU3RyaW5nIHJlYWRVVEYo
KSB0aHJvd3MgSU9FeGNlcHRpb247DQotaW50IHJlYWRVbnNpZ25lZEJ5dGUo
KSB0aHJvd3MgSU9FeGNlcHRpb247DQotaW50IHJlYWRVbnNpZ25lZFNob3J0
KCkgdGhyb3dzIElPRXhjZXB0aW9uOw0KLWludCBza2lwQnl0ZXMoaW50IG4p
IHRocm93cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFjdCBwdWJsaWMgYm9vbGVh
biByZWFkQm9vbGVhbigpIHRocm93cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFj
dCBwdWJsaWMgYnl0ZSByZWFkQnl0ZSgpIHRocm93cyBJT0V4Y2VwdGlvbjsN
CithYnN0cmFjdCBwdWJsaWMgY2hhciByZWFkQ2hhcigpIHRocm93cyBJT0V4
Y2VwdGlvbjsNCithYnN0cmFjdCBwdWJsaWMgZG91YmxlIHJlYWREb3VibGUo
KSB0aHJvd3MgSU9FeGNlcHRpb247DQorYWJzdHJhY3QgcHVibGljIGZsb2F0
IHJlYWRGbG9hdCgpIHRocm93cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFjdCBw
dWJsaWMgdm9pZCByZWFkRnVsbHkoYnl0ZSBiW10pIHRocm93cyBJT0V4Y2Vw
dGlvbjsNCithYnN0cmFjdCBwdWJsaWMgdm9pZCByZWFkRnVsbHkoYnl0ZSBi
W10sIGludCBvZmYsIGludCBsZW4pIHRocm93cyBJT0V4Y2VwdGlvbjsNCith
YnN0cmFjdCBwdWJsaWMgaW50IHJlYWRJbnQoKSB0aHJvd3MgSU9FeGNlcHRp
b247DQorYWJzdHJhY3QgcHVibGljIFN0cmluZyByZWFkTGluZSgpIHRocm93
cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFjdCBwdWJsaWMgbG9uZyByZWFkTG9u
ZygpIHRocm93cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFjdCBwdWJsaWMgc2hv
cnQgcmVhZFNob3J0KCkgdGhyb3dzIElPRXhjZXB0aW9uOw0KK2Fic3RyYWN0
IHB1YmxpYyBTdHJpbmcgcmVhZFVURigpIHRocm93cyBJT0V4Y2VwdGlvbjsN
CithYnN0cmFjdCBwdWJsaWMgaW50IHJlYWRVbnNpZ25lZEJ5dGUoKSB0aHJv
d3MgSU9FeGNlcHRpb247DQorYWJzdHJhY3QgcHVibGljIGludCByZWFkVW5z
aWduZWRTaG9ydCgpIHRocm93cyBJT0V4Y2VwdGlvbjsNCithYnN0cmFjdCBw
dWJsaWMgaW50IHNraXBCeXRlcyhpbnQgbikgdGhyb3dzIElPRXhjZXB0aW9u
Ow0KIA0KIH0NCkluZGV4OiBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL2lvL0Rh
dGFJbnB1dFN0cmVhbS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS
Q1MgZmlsZTogL2N2cy9rYWZmZS9rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9q
YXZhL2lvL0RhdGFJbnB1dFN0cmVhbS5qYXZhLHYNCnJldHJpZXZpbmcgcmV2
aXNpb24gMS4xNQ0KZGlmZiAtdSAtcjEuMTUgRGF0YUlucHV0U3RyZWFtLmph
dmENCi0tLSBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL2lvL0RhdGFJbnB1dFN0
cmVhbS5qYXZhCTMgU2VwIDIwMDIgMTk6NTM6NDcgLTAwMDAJMS4xNQ0KKysr
IGxpYnJhcmllcy9qYXZhbGliL2phdmEvaW8vRGF0YUlucHV0U3RyZWFtLmph
dmEJNCBPY3QgMjAwMiAxNDowMjo1MCAtMDAwMA0KQEAgLTEzLDggKzEzLDYg
QEANCiBpbXBvcnQga2FmZmUudXRpbC5VVEY4Ow0KIA0KIHB1YmxpYyBjbGFz
cyBEYXRhSW5wdXRTdHJlYW0gZXh0ZW5kcyBGaWx0ZXJJbnB1dFN0cmVhbSBp
bXBsZW1lbnRzIERhdGFJbnB1dCB7DQotCS8qIHVzZWQgdG8gZGV0ZXJtaW5l
IHdoZXRoZXIgdG8gc2tpcCBuZXh0ICdcbicgKi8NCi0JcHJpdmF0ZSBib29s
ZWFuIHNraXBOZXh0TEY7DQogDQogcHVibGljIERhdGFJbnB1dFN0cmVhbShJ
bnB1dFN0cmVhbSBpbikgew0KIAlzdXBlcihpbik7DQpAQCAtMjUsMTAgKzIz
LDYgQEANCiB9DQogDQogcHVibGljIGZpbmFsIGludCByZWFkKGJ5dGUgYltd
LCBpbnQgb2ZmLCBpbnQgbGVuKSB0aHJvd3MgSU9FeGNlcHRpb24gew0KLQlp
ZiAob2ZmIDwgMCB8fCBsZW4gPCAwIHx8IG9mZiArIGxlbiA+IGIubGVuZ3Ro
KSB7DQotCSAgIHRocm93IG5ldyBJbmRleE91dE9mQm91bmRzRXhjZXB0aW9u
KCk7DQotCX0NCi0NCiAJcmV0dXJuIHN1cGVyLnJlYWQoYiwgb2ZmLCBsZW4p
Ow0KIH0NCiANCkBAIC00MSwxOCArMzUsMTUgQEANCiAJaWYgKHZhbHVlID09
IC0xKSB7DQogCQl0aHJvdyBuZXcgRU9GRXhjZXB0aW9uKCk7DQogCX0NCi0J
aWYgKHNraXBOZXh0TEYpIHsNCi0JCXNraXBOZXh0TEYgPSBmYWxzZTsNCi0J
CWlmICh2YWx1ZSA9PSAnXG4nKSB7DQotCQkJdmFsdWUgPSByZWFkQnl0ZSgp
Ow0KLQkJfQ0KLQl9DQogCXJldHVybiAoKGJ5dGUpdmFsdWUpOw0KIH0NCiAN
CiBwdWJsaWMgZmluYWwgY2hhciByZWFkQ2hhcigpIHRocm93cyBJT0V4Y2Vw
dGlvbiB7DQotCWludCB2YWwgPSByZWFkVW5zaWduZWRCeXRlKCkgPDwgODsN
Ci0JdmFsIHw9IHJlYWRVbnNpZ25lZEJ5dGUoKTsNCisJaW50IHZhbCA9IHJl
YWQoKSA8PCA4Ow0KKwl2YWwgfD0gcmVhZCgpOw0KKwlpZiAodmFsID09IC0x
KSB7DQorCQl0aHJvdyBuZXcgRU9GRXhjZXB0aW9uKCk7DQorCX0NCiAJcmV0
dXJuICgoY2hhcil2YWwpOw0KIH0NCiANCkBAIC02OSw5ICs2MCwxMiBAQA0K
IH0NCiANCiBwdWJsaWMgZmluYWwgdm9pZCByZWFkRnVsbHkoYnl0ZSBiW10s
IGludCBvZmYsIGludCBsZW4pIHRocm93cyBJT0V4Y2VwdGlvbiB7DQorCWlm
IChiID09IG51bGwpIHsNCisJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2Vw
dGlvbigpOw0KKwl9DQogCWludCB0b3RhbCA9IDA7DQogCXdoaWxlICh0b3Rh
bCA8IGxlbikgew0KLQkJZmluYWwgaW50IGdvdCA9IHJlYWQoYiwgb2ZmICsg
dG90YWwsIGxlbiAtIHRvdGFsKTsNCisJCWludCBnb3QgPSByZWFkKGIsIG9m
ZiArIHRvdGFsLCBsZW4gLSB0b3RhbCk7DQogCQlpZiAoZ290ID09IC0xKSB7
DQogCQkJdGhyb3cgbmV3IEVPRkV4Y2VwdGlvbigpOw0KIAkJfQ0KQEAgLTgw
LDExICs3NCwxNCBAQA0KIH0NCiANCiBwdWJsaWMgZmluYWwgaW50IHJlYWRJ
bnQoKSB0aHJvd3MgSU9FeGNlcHRpb24gew0KLQlpbnQgdjEgPSByZWFkVW5z
aWduZWRCeXRlKCkgPDwgMjQ7DQotCXYxIHw9IHJlYWRVbnNpZ25lZEJ5dGUo
KSA8PCAxNjsNCi0JdjEgfD0gcmVhZFVuc2lnbmVkQnl0ZSgpIDw8IDg7DQot
CXYxIHw9IHJlYWRVbnNpZ25lZEJ5dGUoKTsNCi0JcmV0dXJuIHYxOw0KKwlp
bnQgdjEgPSByZWFkKCkgPDwgMjQ7DQorCXYxIHw9IHJlYWQoKSA8PCAxNjsN
CisJdjEgfD0gcmVhZCgpIDw8IDg7DQorCWludCB2MiA9IHJlYWQoKTsNCisJ
aWYgKHYyID09IC0xKSB7DQorCQl0aHJvdyBuZXcgRU9GRXhjZXB0aW9uKCk7
DQorCX0NCisJcmV0dXJuICh2MSB8IHYyKTsNCiB9DQogDQogLyoqDQpAQCAt
OTIsMjcgKzg5LDQzIEBADQogICovDQogcHVibGljIGZpbmFsIFN0cmluZyBy
ZWFkTGluZSgpIHRocm93cyBJT0V4Y2VwdGlvbiB7DQogCWZpbmFsIFN0cmlu
Z0J1ZmZlciBidWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCk7DQorCWZpbmFs
IGJ5dGVbXSBkYXRhID0gbmV3IGJ5dGVbMV07DQogCWJvb2xlYW4gZW9mID0g
ZmFsc2U7DQogDQotCXRyeSB7DQotCQl3aGlsZSAodHJ1ZSkgew0KLQkJCWZp
bmFsIGNoYXIgY2ggPSAoY2hhcikgcmVhZFVuc2lnbmVkQnl0ZSgpOw0KLQkJ
CWlmIChjaCA9PSAnXG4nKSB7DQotCQkJCWJyZWFrOw0KLQkJCX0NCi0JCQlp
ZiAoY2ggPT0gJ1xyJykgew0KLQkJCQlza2lwTmV4dExGID0gdHJ1ZTsNCi0J
CQkJYnJlYWs7DQotCQkJfQ0KKwl3aGlsZSAodHJ1ZSkgew0KKwkJaWYgKHJl
YWQoZGF0YSwgMCwgMSkgIT0gMSkgew0KKwkJCWVvZiA9IHRydWU7DQorCQkJ
YnJlYWs7DQorCQl9DQorCQlmaW5hbCBjaGFyIGNoID0gKGNoYXIpIChkYXRh
WzBdICYgMHhmZik7DQorCQlpZiAoY2ggPT0gJ1xuJykgew0KKwkJCWJyZWFr
Ow0KKwkJfQ0KIA0KLQkJCWJ1ZmZlci5hcHBlbmQoY2gpOw0KKwkJaWYgKGNo
ID09ICdccicpIHsgICAgICAgLy8gQ2hlY2sgZm9yICdcclxuJw0KKwkJCS8v
IE5vdGUgdGhhdCB3ZSBkb24ndCBrbm93IHdoZXRoZXIgdGhlIElucHV0U3Ry
ZWFtDQorCQkJLy8gaW1wbGVtZW50cyBtYXJrKCkgYW5kIHJlc2V0KCksIGJ1
dCB3ZSdyZSB1c2luZw0KKwkJCS8vIHRoZW0gYW55d2F5LiBJZiB0aGV5IGRv
bid0LCB0aGVuIGNoYXJhY3RlcnMNCisJCQkvLyBhZnRlciBhIGxvbmUgJ1xy
JyB3aWxsIGJlIGVsaWRlZCBmcm9tIHRoZSBpbnB1dA0KKwkJCS8vIChpZSwg
dGhpcyBpcyBhIGJ1ZykuIFdlIGNvdWxkIG92ZXJyaWRlIG1hcmsoKQ0KKwkJ
CS8vIGFuZCByZXNldCgpIHRvIGFsd2F5cyBwcm92aWRlIGF0IGxlYXN0IGEN
CisJCQkvLyBvbmUtY2hhcmFjdGVyIGJ1ZmZlciwgYnV0IHRoZW4gd2UnZCB2
aW9sYXRlDQorCQkJLy8gdGhlIHNwZWMsIHdoaWNoIHNheXMgdG8gaW5oZXJp
dCB0aGVzZSBmcm9tDQorCQkJLy8gRmlsdGVySW5wdXRTdHJlYW0uLi4NCisN
CisJCQlzdXBlci5tYXJrKDEpOw0KKwkJCWlmIChyZWFkKGRhdGEsIDAsIDEp
ID09IDEgJiYgZGF0YVswXSAhPSAnXG4nKSB7DQorCQkJCXRyeSB7DQorCQkJ
CQlzdXBlci5yZXNldCgpOw0KKwkJCQl9DQorCQkJCWNhdGNoIChJT0V4Y2Vw
dGlvbiBlKSB7DQorCQkJCX0NCisJCQl9DQorCQkJYnJlYWs7DQogCQl9DQor
CQlidWZmZXIuYXBwZW5kKGNoKTsNCiAJfQ0KLQljYXRjaCAoRU9GRXhjZXB0
aW9uIGUpIHsNCi0JCWVvZiA9IHRydWU7DQotCX0NCi0NCi0JaWYgKGVvZiAm
JiBidWZmZXIubGVuZ3RoKCkgPT0gMCkgew0KKwlpZiAoZW9mID09IHRydWUg
JiYgYnVmZmVyLmxlbmd0aCgpID09IDApIHsNCiAJCXJldHVybiAobnVsbCk7
DQogCX0NCiAJcmV0dXJuIChidWZmZXIudG9TdHJpbmcoKSk7DQpAQCAtMTIz
LDggKzEzNiwxMSBAQA0KIH0NCiANCiBwdWJsaWMgZmluYWwgc2hvcnQgcmVh
ZFNob3J0KCkgdGhyb3dzIElPRXhjZXB0aW9uIHsNCi0JaW50IHZhbCA9IHJl
YWRVbnNpZ25lZEJ5dGUoKSA8PCA4Ow0KLQl2YWwgfD0gcmVhZFVuc2lnbmVk
Qnl0ZSgpOw0KKwlpbnQgdmFsID0gcmVhZCgpIDw8IDg7DQorCXZhbCB8PSBy
ZWFkKCk7DQorCWlmICh2YWwgPT0gLTEpIHsNCisJCXRocm93IG5ldyBFT0ZF
eGNlcHRpb24oKTsNCisJfQ0KIAlyZXR1cm4gKChzaG9ydCl2YWwpOw0KIH0N
CiANCg==
---559023410-1804928587-1033740880=:21835--