Kaffe's HttpURLConnection implementation is broken

[Nic Ferrier]

This is a MIME message. If you are reading this text, you may want to 
consider changing to a mail reader or gateway that understands how to 
properly handle MIME multipart messages.

--=_61396BFF.A5C4A82A
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline

The current HttpURLConnection does not handle headers properly... or
anything like Sun's implementation.

The Kaffe impl uses a fixed array of response header keys which
indexes an instance array of values for those keys.


This has 2 problems:

1. if a particular key (that is present in the index) is not present
in the response the associated value will be null... this causes 2
problems:
(i) if a key is returned by:
   HttpURLConnection.getHeaderFieldKey(int)
then it's associated value should NEVER be null - with the current
Kaffe implementation it will be.

2. if additional response headers are sent by the server Kaffe will
never detect them.
This is a BIG problem. I have been helping someone on the Sun
Servlet-Interest list who was developing a proxy server using
HttpURLConnection, using Kaffe a proxy server would be impossible this
way.
So would an applet based tool which wanted to persist cookies over
connections.


There is also a third incompatability with the Sun version:

3. with Sun the header index 0 is reserved for the response message
so the header doesn't start till index: 1


I have redeveloped the class, my version is attached. 


How does the new implementation work?
It uses 2 Vector classes, 1 for keys and 1 for values. It needs to be
done like this (rather than with a hash) because of the appaling way
the class is speced.

The header manipulation uses int indexed methods which can only
return String, int or long.


Why can't a simple hash be used?
Therefore a hash cannot be used because if it were headers with
multiple values (such as Cookie) could only ever return the first
value.

The indexed system gets around this but requires the int indexing and
therefore the Vectors.


Have we lost performance?
There is still a quick index system of well known fields but this is
not really necessary and Kaffe maintainers might want to get rid of
it.

The implementation also changes the way the header is parsed to make
it more robust and ensures that the response line is stored at header
line index 0.



Could someone put this into Kaffe please? or fix the problem?


A couple of other (related) things:

- the BasicURLConnection needs to be altered too... I'm happy to do
that if people want me to (please let me know)

- I'm working on an HTTP/1.1 version which allows re-use of
connections by caching persistent connections for a short period of
time... it will use a single thread to manage the system.
Is there any interest in this?
Would people prefer it as an additional option rather than a
replacement of the current version?

- I'd never realised how utterly appaling this class was - is there
anyway Kaffe can lobby Sun to change this class? 
The header manipulation is absolutely awfull - a response header
needs to be treated as a hash of Strings or String[]s. See the Servlet
API for details.



Nic Ferrier

--=_61396BFF.A5C4A82A
Content-Type: application/octet-stream; name="HttpURLConnection.java"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="HttpURLConnection.java"

LyoNCiAqIEh0dHBVUkxDb25uZWN0aW9uIC0NCiAqICBTaW1wbGUgSFRUUCBVUkwgaGFuZGxlci4N
CiAqDQogKiBDb3B5cmlnaHQgKGMpIDE5OTgsIDE5OTkNCiAqICAgICAgVHJhbnN2aXJ0dWFsIFRl
Y2hub2xvZ2llcywgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4NCiAqDQogKiBTZWUgdGhlIGZp
bGUgImxpY2Vuc2UudGVybXMiIGZvciBpbmZvcm1hdGlvbiBvbiB1c2FnZSBhbmQgcmVkaXN0cmli
dXRpb24NCiAqIG9mIHRoaXMgZmlsZS4NCiAqLw0KDQpwYWNrYWdlIGthZmZlLm5ldC53d3cucHJv
dG9jb2wuaHR0cDsNCg0KaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247DQppbXBvcnQgamF2YS5p
by5JbnB1dFN0cmVhbTsNCmltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsNCmltcG9ydCBqYXZh
LmlvLkRhdGFPdXRwdXRTdHJlYW07DQppbXBvcnQgamF2YS5pby5EYXRhSW5wdXRTdHJlYW07DQpp
bXBvcnQgamF2YS5pby5CdWZmZXJlZElucHV0U3RyZWFtOw0KLy9pbXBvcnQgamF2YS51dGlsLlN0
cmluZ1Rva2VuaXplcjsgLy90aGlzIHRha2VuIG91dCBhbmQgcmVwbGFjZWQgd2l0aCBpbmRpdmlk
dWFsIHBhcnNpbmcNCmltcG9ydCBqYXZhLnV0aWwuVmVjdG9yOw0KaW1wb3J0IGphdmEubmV0LlVS
TDsNCmltcG9ydCBqYXZhLm5ldC5VUkxDb25uZWN0aW9uOw0KaW1wb3J0IGphdmEubmV0LlNvY2tl
dDsNCmltcG9ydCBqYXZhLmlvLkZpbGVJbnB1dFN0cmVhbTsNCmltcG9ydCBqYXZhLmF3dC5Ub29s
a2l0Ow0KDQpwdWJsaWMgY2xhc3MgSHR0cFVSTENvbm5lY3Rpb24NCmV4dGVuZHMgamF2YS5uZXQu
SHR0cFVSTENvbm5lY3Rpb24gew0KDQogIC8vdGhlc2UgaGF2ZSBiZWVuIGNoYW5nZWQgdG8gaW5z
dGFuY2UgdmFyaWFibGVzIGFzIHBhcnQgb2YgdGhlIHJlc3BvbnNlIGhlYWRlciBmaXgNCiAgcHJp
dmF0ZSBpbnQgQ29udGVudEVuY29kaW5nID0gLTE7DQogIHByaXZhdGUgaW50IENvbnRlbnRMZW5n
dGggPSAtMTsNCiAgcHJpdmF0ZSBpbnQgQ29udGVudFR5cGUgPSAtMTsNCiAgcHJpdmF0ZSBpbnQg
RGF0ZSA9IC0xOw0KICBwcml2YXRlIGludCBFeHBpcmF0aW9uID0gLTE7DQogIHByaXZhdGUgaW50
IElmTW9kaWZpZWRTaW5jZSA9IC0xOw0KICBwcml2YXRlIGludCBMYXN0TW9kaWZpZWQgPSAtMTsN
Cg0KICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgcHJveHlIb3N0Ow0KICBwcml2YXRlIHN0YXRpYyBp
bnQgcHJveHlQb3J0ID0gLTE7DQogIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gdXNlUHJveHkgPSBm
YWxzZTsNCg0KICAvL3BhcnQgb2YgdGhlIHJlc3BvbnNlLWhlYWRlciBmaXgNCiAgcHJpdmF0ZSBW
ZWN0b3IgcmVzcG9uc2VLZXlzPW5ldyBWZWN0b3IoKTsNCg0KICAvL3BhcnQgb2YgdGhlIHJlc3Bv
bnNlLWhlYWRlciBmaXgNCiAgcHJpdmF0ZSBWZWN0b3IgcmVzcG9uc2VWYWxzPW5ldyBWZWN0b3Io
KTsNCg0KICBwcml2YXRlIFNvY2tldCBzb2NrOw0KICBwcml2YXRlIElucHV0U3RyZWFtIGluOw0K
ICBwcml2YXRlIERhdGFPdXRwdXRTdHJlYW0gb3V0Ow0KICBwcml2YXRlIGJvb2xlYW4gcmVkaXIg
PSBnZXRGb2xsb3dSZWRpcmVjdHMoKTsNCg0KICAvKiogdGhpcyBpcyB0aGUgcG9zIG9mIHRoZSBz
dGFydCBvZiB0aGUgcmVzcG9uc2UgbWVzc2FnZSB3aXRoaW4gdGhlIHJlc3BvbnNlIGxpbmUuDQog
ICAqIFRoZSByZXNwb25zZSBtZXNzYWdlIGlzIHRoZSB0ZXh0IG1lc3NhZ2UgcmV0dXJuZWQgYnkg
SFRUUCB0byBleHBsYWluIHRoZSBzdGF0dXMgY29kZS4NCiAgICogRm9yIGV4YW1wbGU6DQogICAq
ICAyMDAgd2lsbCBub3JtYWxseSBiZSBhY2NvbXBhbmllZCB3aXRoIE9LDQogICAqICA1MDAgd2ls
bCBub3JtYWxseSBiZSBhY2NvbXBhbmllZCB3aXRoICJJbnRlcm5hbCBTZXJ2ZXIgRXJyb3IiDQog
ICAqIFRoaXMgaW50IGlzIHRoZSBzdGFydCBwb3NpdGlvbiBvZiB0aGUgbWVzc2FnZS4NCiAgICov
DQogIHByaXZhdGUgaW50IHJlc3BvbnNlTWVzc2FnZVBvc2l0aW9uOw0KDQogIHN0YXRpYyB7DQog
ICAgLy8gSG93IHRoZXNlIHByb3BlcnRpZXMgYXJlIHVuZG9jdW1lbnRlZCBpbiB0aGUgQVBJIGRv
Yy4gIFdlIGtub3cNCiAgICAvLyBhYm91dCB0aGVtIGZyb20gd3d3LmljZXNvZnQubm8ncyB3ZWJw
YWdlDQogICAgLy8NCiAgICBwcm94eUhvc3QgPSBTeXN0ZW0uZ2V0UHJvcGVydHkoImh0dHAucHJv
eHlIb3N0Iik7DQogICAgaWYgKHByb3h5SG9zdCAhPSBudWxsKSB7DQogICAgICAvLyBTdW4gYWxz
byBzdXBwb3J0cyBhIGh0dHAubm9uUHJveHlIb3N0cyBwcm9wZXJ0eSB0bw0KICAgICAgLy8gYXZv
aWQgcHJveHkgdXNlIGZvciBsb2NhbCBzaXRlcy4gIEl0J3MgYSByZWd1bGFyIGV4cHJlc3Npb24N
CiAgICAgIC8vIGxpa2Ugc28gIioucGEuZGVjLmNvbXwqLmNvbXBhcS5jb20iDQogICAgICAvLyBG
b3Igbm93LCB3ZSBhbHdheXMgdXNlIGEgcHJveHkgaWYgdGhlc2UgcHJvcGVydGllcyBhcmUgc2V0
Lg0KICAgICAgLy8gDQogICAgICAvLyBJbiBKREsgMS4yLCB0aGUgcHJvcGVydGllcyBhcmUgcmVh
ZCB3aGVuIGFuIGNvbm5lY3Rpb24NCiAgICAgIC8vIGlzIGVzdGFibGlzaGVkLCBhbGxvd2luZyB0
aGUgdXNlIG9mIGRpZmZlcmVudCBwcm94aWVzDQogICAgICAvLyBkdXJpbmcgdGhlIHJ1bi10aW1l
IG9mIGEgcHJvZ3JhbS4gIEZJWE1FDQogICAgICB1c2VQcm94eSA9IHRydWU7DQogICAgICBTdHJp
bmcgcHAgPSBTeXN0ZW0uZ2V0UHJvcGVydHkoImh0dHAucHJveHlQb3J0Iik7DQogICAgICBpZiAo
cHAgIT0gbnVsbCkgew0KCXByb3h5UG9ydCA9IEludGVnZXIucGFyc2VJbnQocHApOw0KICAgICAg
fQ0KICAgIH0NCiAgfQ0KDQoNCiAgcHVibGljIEh0dHBVUkxDb25uZWN0aW9uKFVSTCB1cmwpIHsN
CiAgICBzdXBlcih1cmwpOw0KICB9DQoNCiAgcHVibGljIHZvaWQgY29ubmVjdCgpIHRocm93cyBJ
T0V4Y2VwdGlvbiB7DQogICAgZm9yICg7Oykgew0KICAgICAgaW50IHBvcnQ7DQogICAgICBTdHJp
bmcgaG9zdDsNCiAgICAgIGlmICh1c2VQcm94eSkgew0KCXBvcnQgPSBwcm94eVBvcnQ7DQoJaG9z
dCA9IHByb3h5SG9zdDsNCiAgICAgIH0NCiAgICAgIGVsc2Ugew0KCXBvcnQgPSB1cmwuZ2V0UG9y
dCgpOw0KCWhvc3QgPSB1cmwuZ2V0SG9zdCgpOw0KICAgICAgfQ0KICAgICAgaWYgKHBvcnQgPT0g
LTEpIHsNCglwb3J0ID0gODA7DQogICAgICB9DQogICAgICBzb2NrID0gbmV3IFNvY2tldChob3N0
LCBwb3J0KTsNCg0KICAgICAgaW4gPSBuZXcgQnVmZmVyZWRJbnB1dFN0cmVhbShzb2NrLmdldElu
cHV0U3RyZWFtKCkpOw0KICAgICAgb3V0ID0gbmV3IERhdGFPdXRwdXRTdHJlYW0oc29jay5nZXRP
dXRwdXRTdHJlYW0oKSk7DQoNCiAgICAgIC8vIE1ha2UgdGhlIGh0dHAgcmVxdWVzdC4NCiAgICAg
IFN0cmluZyBmaWxlOw0KICAgICAgaWYgKHVzZVByb3h5KSB7DQoJZmlsZSA9IHVybC50b1N0cmlu
ZygpOw0KICAgICAgfQ0KICAgICAgZWxzZSB7DQoJZmlsZSA9IHVybC5nZXRGaWxlKCk7DQoJaWYg
KGZpbGUuZXF1YWxzKCIiKSkgew0KCSAgZmlsZSA9ICIvIjsNCgl9DQogICAgICB9DQogICAgICAv
L25lZWRzIHRvIGJlIGFkYXBldGVkIGZvciAxLjENCiAgICAgIG91dC53cml0ZUJ5dGVzKG1ldGhv
ZCArICIgIiArIGZpbGUgKyAiIEhUVFAvMS4wXHJcblxyXG4iKTsNCiAgICAgIG91dC5mbHVzaCgp
Ow0KDQogICAgICBEYXRhSW5wdXRTdHJlYW0gaW5wID0gbmV3IERhdGFJbnB1dFN0cmVhbShpbik7
DQoNCiAgICAgIC8qIHRoaXMgaXMgYW4gYWx0ZXJuYXRpdmUgaW1wbGVtZW50YXRpb24gdG8gdGhl
IEthZmZlIG9uZSBjb21tZW50ZWQgb3V0IGJlbG93Li4uDQoJIFRoZSBtYWluIGRpZmZlcmVuY2Ug
aXMgdGhhdCB0aGlzIG9uZSBmb3JjZXMgSFRUUCBwcm90b2NvbCBjb21wbGlhbmNlIGFuZA0KCSBk
b2Vzbid0IHVzZSBhIHRva2VuaXplci4uLiBpdCBtYXkgYmUgYSBiaXQgcXVpY2tlci4NCiAgICAg
ICovDQogICAgICAvLyB0aGVyZSAqbXVzdCogYmUgYSByZXNwb25zZSBsaW5lDQogICAgICByZXNw
b25zZU1lc3NhZ2U9aW5wLnJlYWRMaW5lKCk7DQogICAgICBTdHJpbmcgcmVzcG9uc2VsaW5lPXJl
c3BvbnNlTWVzc2FnZTsNCiAgICAgIGlmKHJlc3BvbnNlbGluZT09bnVsbCkNCiAgICAgIHRocm93
IG5ldyBJT0V4Y2VwdGlvbigidGhlIHNlcnZlciBkaWRuJ3QgcmVzcG9uZCBjb3JyZWN0bHkuIik7
DQogICAgICBlbHNlDQogICAgICByZXNwb25zZVZhbHMuYWRkRWxlbWVudChyZXNwb25zZWxpbmUp
Ow0KICAgICAgaW50IHZlcnNpb25Qb3M9cmVzcG9uc2VsaW5lLmluZGV4T2YoJy8nKTsNCiAgICAg
IGludCBzcGFjZVBvcz1yZXNwb25zZWxpbmUuaW5kZXhPZignICcpOw0KICAgICAgLy8gZm9yIHRo
ZSBsZW5ndGggb2YgdGhlIHZlcnNpb24gbiB1bSB3ZSBjb3VsZCB1c2UgMyBidXQgY29tcHV0aW5n
IHRoZSB2YWx1ZS4uLg0KICAgICAgLy8uLi4gaXMgcHJvYmFibHkgc2FmZXI7IFczQyBtaWdodCBp
bnRyb2R1Y2UgSFRUUC8xLjEyIGZvciBleGFtcGxlDQogICAgICBTdHJpbmcgaHR0cFJlc3BvbnNl
VmVyc2lvbj1yZXNwb25zZWxpbmUuc3Vic3RyaW5nKHZlcnNpb25Qb3Msc3BhY2VQb3MtdmVyc2lv
blBvcyk7DQogICAgICBpbnQgbmV4dFNwYWNlUG9zPXJlc3BvbnNlbGluZS5pbmRleE9mKCcgJywr
K3NwYWNlUG9zKTsNCiAgICAgIFN0cmluZyByZXNwb25zZUNvZGVTdHI9cmVzcG9uc2VsaW5lLnN1
YnN0cmluZyhzcGFjZVBvcyxuZXh0U3BhY2VQb3MpOw0KICAgICAgdHJ5DQogICAgICB7DQoJLy8g
c2V0IHRoZSANCglyZXNwb25zZUNvZGU9SW50ZWdlci5wYXJzZUludChyZXNwb25zZUNvZGVTdHIp
Ow0KICAgICAgfQ0KICAgICAgY2F0Y2goTnVtYmVyRm9ybWF0RXhjZXB0aW9uIGJhZF9yZXNwb25z
ZV9jb2RlKQ0KICAgICAgew0KCXJlc3BvbnNlQ29kZT1IVFRQX1NFUlZFUl9FUlJPUjsNCgkvL0NP
TVBMSUFOQ0U/IHdoYXQgZG9lcyB0aGUgU3VuIEFQSSBkbz8NCgkvLyBzaG91bGQgdGhlIHBhcnNp
bmcgc3RvcCBub3c/IEkgdGhpbmsgc28uLi4NCgkvLy4uLiBJJ2QgcHJlZmVyIHRvIGlzc3VlIGFu
IElPRXhjZXB0aW9uIGhlcmUuLi4NCiAgICAgIH0NCiAgICAgIC8vIHRoZSBsYXN0IHRoaW5nIHRv
IGRvIGlzIHRvIG5vdGUgdGhlIHBvc2l0aW9uIG9mIHRoZSByZXNwb25zZSBtZXNzYWdlIHdpdGhp
biB0aGUgbGluZQ0KICAgICAgcmVzcG9uc2VNZXNzYWdlUG9zaXRpb249KytuZXh0U3BhY2VQb3M7
DQogICAgICAvLyBub3cgcmVhZCB0aGUgaGVhZGVyOyB0aGlzIHdpbGwgaGF2ZSBiaWcgcHJvYmxl
bXMgaWYgdGhlIHBhcnNpbmcgYWJvdmUgaGFzIGZhaWxlZA0KICAgICAgU3RyaW5nIGhlYWRlcmxp
bmU9aW5wLnJlYWRMaW5lKCk7DQogICAgICB3aGlsZShoZWFkZXJsaW5lIT1udWxsICYmICFoZWFk
ZXJsaW5lLmVxdWFscygiIikpDQogICAgICB7DQoJLy8gdGhpcyBpcyB0aGUgb3JpZ2luYWwgS2Fm
ZmUgY29kZSBkdW1wZWQgaW4gaGVyZQ0KCWludCBwb3MgPSBoZWFkZXJsaW5lLmluZGV4T2YoJzon
KTsNCglpZiAocG9zID4gMCkNCgl7DQoJICBTdHJpbmcga2V5ID0gaGVhZGVybGluZS5zdWJzdHJp
bmcoMCwgcG9zKTsNCgkgIGZvciAocG9zKys7IENoYXJhY3Rlci5pc1doaXRlc3BhY2UoaGVhZGVy
bGluZS5jaGFyQXQocG9zKSk7IHBvcysrKQ0KCSAgOw0KCSAgU3RyaW5nIHZhbCA9IGhlYWRlcmxp
bmUuc3Vic3RyaW5nKHBvcyk7DQoJICBzZXRIZWFkZXJGaWVsZChrZXksIHZhbCk7DQoJfQ0KCWhl
YWRlcmxpbmU9aW5wLnJlYWRMaW5lKCk7DQogICAgICB9DQogICAgICAvLyB3aGVuIHdlIGdldCBo
ZXJlIHRoZSBoZWFkZXIgaGFzIGJlZW4gcmVhZCwgd2hhdCdzIG9uIHRoZSBzdHJlYW0gbm93Li4u
DQogICAgICAvLy4uLiBpcyBhbiBlbnRpdHkgb3IgbXVsdGlwbGUgZW50aXRpZXMNCg0KICAgICAg
LyogSUYgV0UgV0FOVCBIVFRQLzEuMSBOT1cgSVMgVEhFIFRJTUUgVE8gSEFORExFIENIVU5LRUQg
RU5DT0RJTkchICovDQoNCiAgICAgIC8vIEhhbmRsZSByZWRpcmVjdGlvbg0KICAgICAgU3RyaW5n
IGxvY2F0aW9uID0gZ2V0SGVhZGVyRmllbGQoImxvY2F0aW9uIik7DQogICAgICBpZiAocmVkaXIg
PT0gZmFsc2UgfHwgcmVzcG9uc2VDb2RlIDwgSFRUUF9NVUxUX0NIT0lDRSB8fCByZXNwb25zZUNv
ZGUgPiBIVFRQX1VTRV9QUk9YWSB8fCBsb2NhdGlvbiA9PSBudWxsKSB7DQoJYnJlYWs7DQogICAg
ICB9DQogICAgICB1cmwgPSBuZXcgVVJMKGxvY2F0aW9uKTsNCiAgICB9DQogIH0NCg0KICBwdWJs
aWMgSW5wdXRTdHJlYW0gZ2V0SW5wdXRTdHJlYW0oKSB0aHJvd3MgSU9FeGNlcHRpb24gew0KICAg
IHJldHVybiAoaW4pOw0KICB9DQoNCiAgcHVibGljIFN0cmluZyBnZXRIZWFkZXJGaWVsZChTdHJp
bmcgbmFtZSkgew0KICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcmVzcG9uc2VLZXlzLnNpemUoKTsg
aSsrKSB7DQogICAgICBpZiAocmVzcG9uc2VLZXlzLmVsZW1lbnRBdChpKS50b1N0cmluZygpLmVx
dWFsc0lnbm9yZUNhc2UoIG5hbWUpKSB7DQoJcmV0dXJuIChnZXRIZWFkZXJGaWVsZChpKSk7DQog
ICAgICB9DQogICAgfQ0KICAgIHJldHVybiAobnVsbCk7DQogIH0NCg0KICBwdWJsaWMgU3RyaW5n
IGdldEhlYWRlckZpZWxkKGludCBwb3MpIHsNCiAgICBpZiAocG9zIDwgMCB8fCBwb3MgPj0gcmVz
cG9uc2VWYWxzLnNpemUoKSkgew0KICAgICAgcmV0dXJuIChudWxsKTsNCiAgICB9DQogICAgcmV0
dXJuIChyZXNwb25zZVZhbHMuZWxlbWVudEF0KHBvcykudG9TdHJpbmcoKSk7DQogIH0NCg0KICBw
dWJsaWMgU3RyaW5nIGdldEhlYWRlckZpZWxkS2V5KGludCBwb3MpIHsNCiAgICBpZiAocG9zIDwg
MCB8fCBwb3MgPj0gcmVzcG9uc2VLZXlzLnNpemUoKSkgew0KICAgICAgcmV0dXJuIChudWxsKTsN
CiAgICB9DQogICAgcmV0dXJuIChyZXNwb25zZUtleXMuZWxlbWVudEF0KHBvcykudG9TdHJpbmco
KSk7DQogIH0NCg0KICBwcm90ZWN0ZWQgdm9pZCBzZXRIZWFkZXJGaWVsZCggU3RyaW5nIGtleSwg
U3RyaW5nIHZhbHVlKSB7DQogICAgYm9vbGVhbiBkb25lPWZhbHNlOw0KICAgIGludCBpOw0KICAg
IGZvciAoIGk9MTsgaTxyZXNwb25zZUtleXMuc2l6ZSgpICYmICFkb25lOyBpKysgKSB7DQogICAg
ICBpZiAoIHJlc3BvbnNlS2V5cy5lbGVtZW50QXQoaSkudG9TdHJpbmcoKS5lcXVhbHNJZ25vcmVD
YXNlKCBrZXkpICkgew0KCXJlc3BvbnNlVmFscy5zZXRFbGVtZW50QXQodmFsdWUsaSk7DQoJYnJl
YWs7DQogICAgICB9DQogICAgfQ0KICAgIC8vaWYgdGhlIGtleSBkaWQgbm90IGV4aXN0IGluIHRo
ZSBoZWFkZXIgdGhlbiBhZGQgaXQgbm93DQogICAgaWYoIWRvbmUpDQogICAgew0KICAgICAgcmVz
cG9uc2VLZXlzLmFkZEVsZW1lbnQoa2V5KTsNCiAgICAgIHJlc3BvbnNlVmFscy5hZGRFbGVtZW50
KHZhbHVlKTsNCiAgICB9DQogICAgaWYoa2V5LmVxdWFsc0lnbm9yZUNhc2UoIkNvbnRlbnQtRW5j
b2RpbmciKSkNCiAgICB7DQogICAgICBDb250ZW50RW5jb2Rpbmc9aTsNCiAgICAgIHJldHVybjsN
CiAgICB9DQogICAgaWYoa2V5LmVxdWFsc0lnbm9yZUNhc2UoIkNvbnRlbnQtTGVuZ3RoIikpDQog
ICAgew0KICAgICAgQ29udGVudExlbmd0aD1pOw0KICAgICAgcmV0dXJuOw0KICAgIH0NCiAgICBp
ZihrZXkuZXF1YWxzSWdub3JlQ2FzZSgiQ29udGVudC1UeXBlIikpDQogICAgew0KICAgICAgQ29u
dGVudFR5cGU9aTsNCiAgICAgIHJldHVybjsNCiAgICB9DQogICAgaWYoa2V5LmVxdWFsc0lnbm9y
ZUNhc2UoIkRhdGUiKSkNCiAgICB7DQogICAgICBEYXRlPWk7DQogICAgICByZXR1cm47DQogICAg
fQ0KICAgIGlmKGtleS5lcXVhbHNJZ25vcmVDYXNlKCJFeHBpcmF0aW9uIikpDQogICAgew0KICAg
ICAgRXhwaXJhdGlvbj1pOw0KICAgICAgcmV0dXJuOw0KICAgIH0NCiAgICBpZihrZXkuZXF1YWxz
SWdub3JlQ2FzZSgiSWYtTW9kaWZpZWQtU2luY2UiKSkNCiAgICB7DQogICAgICBJZk1vZGlmaWVk
U2luY2U9aTsNCiAgICAgIHJldHVybjsNCiAgICB9DQogICAgaWYoa2V5LmVxdWFsc0lnbm9yZUNh
c2UoIkxhc3QtTW9kaWZpZWQiKSkNCiAgICBMYXN0TW9kaWZpZWQ9aTsNCiAgICAvL3RoaXMgaXMg
dGhlIGZpbmFsIHJldHVybg0KICAgIHJldHVybjsNCiAgfQ0KDQogIHB1YmxpYyBPYmplY3QgZ2V0
Q29udGVudCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7DQogICAgaWYgKENvbnRlbnRFbmNvZGluZzwx
KSB7DQogICAgICByZXR1cm4gKGluKTsNCiAgICB9DQogICAgLyoNCiAgICAgKiBXZSBvbmx5IHVu
ZGVyc3RhbmQgYSBsaW1pdGVkIG51bWJlciBvZiB0aGluZ3Mgc28gZmFyDQogICAgICovDQogICAg
aWYgKHJlc3BvbnNlVmFscy5lbGVtZW50QXQoQ29udGVudEVuY29kaW5nKS50b1N0cmluZygpLnN0
YXJ0c1dpdGgoImltYWdlLyIpKSB7DQogICAgICByZXR1cm4gKFRvb2xraXQuZ2V0RGVmYXVsdFRv
b2xraXQoKS5nZXRJbWFnZSh1cmwpLmdldFNvdXJjZSgpKTsNCiAgICB9DQoNCiAgICAvLyBSZXR1
cm4gdGhlIGlucHV0IHN0cmVhbSBpZiB3ZSBkb24ndCB1bmRlcnN0YW5kDQogICAgcmV0dXJuIChp
bik7DQogIH0NCg0KICBwcm90ZWN0ZWQgdm9pZCBzZXRDb250ZW50VHlwZUZyb21OYW1lKCkgew0K
ICAgIC8vSSdtIG5vdCBzdXJlIHRoaXMgaXMgY29ycmVjdCAtDQogICAgLy8tIHdoeSBpcyB0aGUg
ZW5jb2RpbmcgYW5kIHRoZSB0eXBlIGJlaW5nIHNldCB0byB0aGUgc2FtZSB2YWx1ZT8NCiAgICBT
dHJpbmcgY3QgPSBnZXRGaWxlTmFtZU1hcCgpLmdldENvbnRlbnRUeXBlRm9yKCB1cmwuZ2V0Rmls
ZSgpKTsNCiAgICBpZihDb250ZW50VHlwZT4wKQ0KICAgIHJlc3BvbnNlVmFscy5zZXRFbGVtZW50
QXQoY3QsQ29udGVudFR5cGUpOw0KICAgIGVsc2UNCiAgICB7DQogICAgICByZXNwb25zZUtleXMu
YWRkRWxlbWVudCgiQ29udGVudC1UeXBlIik7DQogICAgICByZXNwb25zZVZhbHMuYWRkRWxlbWVu
dChjdCk7DQogICAgfQ0KICAgIGlmKENvbnRlbnRFbmNvZGluZz4wKQ0KICAgIHJlc3BvbnNlVmFs
cy5zZXRFbGVtZW50QXQoY3QsQ29udGVudEVuY29kaW5nKTsNCiAgICBlbHNlDQogICAgew0KICAg
ICAgcmVzcG9uc2VLZXlzLmFkZEVsZW1lbnQoIkNvbnRlbnQtRW5jb2RpbmciKTsNCiAgICAgIHJl
c3BvbnNlVmFscy5hZGRFbGVtZW50KGN0KTsNCiAgICB9DQogIH0NCg0KICBwdWJsaWMgdm9pZCBk
aXNjb25uZWN0KCkgew0KICAgIHRyeSB7DQogICAgICBzb2NrLmNsb3NlKCk7DQogICAgfQ0KICAg
IGNhdGNoIChJT0V4Y2VwdGlvbiBfKSB7DQogICAgfQ0KICAgIHNvY2sgPSBudWxsOw0KICB9DQoN
CiAgcHVibGljIGJvb2xlYW4gdXNpbmdQcm94eSgpIHsNCiAgICByZXR1cm4gKHVzZVByb3h5KTsN
CiAgfQ0KDQogIC8qKg0KICAgKiBVc2VkIGJ5IHRoZSBJQ0UgYnJvd3Nlci4NCiAgICovDQogIHB1
YmxpYyB2b2lkIHNldEluc3RhbmNlRm9sbG93UmVkaXJlY3RzKGJvb2xlYW4gcmVkaXIpIHsNCiAg
ICB0aGlzLnJlZGlyID0gcmVkaXI7DQogIH0NCg0KfQ0K

--=_61396BFF.A5C4A82A--