[kaffe] [patch] Class.forName rewrite
Dalibor Topic
robilad@yahoo.com
Sun, 2 Jun 2002 17:31:18 -0700 (PDT)
--0-1114583979-1023064278=:63728
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
the atached patch does two things: It replaces the
native
Class.forName method by a java implementation, with
the fall-out from
the C version being heopfully included in the right
places, and it
encapsulates the lookup of the class loader of the
calling clas using
stack inspection into its own small class, hiding away
the ugly
details.
Since this patch touches very sensitive parts of the
class library, it
would be nice if you could test it, and tell me if it
breaks.
Performance should be equivalent to the former
version. Tested on i686
linux using jit3.
cheers,
dalibor topic
__________________________________________________
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com
--0-1114583979-1023064278=:63728
Content-Type: application/octet-stream; name=ChangeLog
Content-Transfer-Encoding: base64
Content-Description: ChangeLog
Content-Disposition: attachment; filename=ChangeLog
CSogbGlicmFyaWVzL2NsaWIvbmF0aXZlL0NsYXNzLmM6CgkoamF2YV9sYW5n
X0NsYXNzX2Zvck5hbWUpIGRlbGV0ZWQuIEltcGxlbWVudGVkIGluIEphdmEu
CgkqIGxpYnJhcmllcy9jbGliL25hdGl2ZS9DbGFzc0xvYWRlci5jOgoJKGph
dmFfbGFuZ19DbGFzc0xvYWRlcl9yZXNvbHZlQ2xhc3MwKSBwcm9jZXNzIGZp
bGVzIHRvCglDU1RBVEVfQ09NUExFVEUuCgkqIGxpYnJhcmllcy9jbGliL25h
dGl2ZS9TeXN0ZW1DbGFzc0xvYWRlci5jOgoJKGthZmZlX2xhbmdfU3lzdGVt
Q2xhc3NMb2FkZXJfZmluZENsYXNzMCkgQWRkZWQgY29kZSB0byBsb2FkCglh
cnJheXMuIE1lcmdlZCBjb2RlIHRvIGhhbmRsZSBOb0NsYXNzRGVmRm91bmRF
cnJvcnMgd2l0aCBzdWNoIGNvZGUKCWZyb20gamF2YV9sYW5nX0NsYXNzX2Zv
ck5hbWUuCgkqIGxpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9DbGFzcy5q
YXZhOgoJKGZvck5hbWUpIHJld3JpdHRlbiBpbiBKYXZhLgoJKENhbGxTdGFj
aykgbmV3IGlubmVyIGNsYXNzIGZvciBjYWxsIHN0YWNrIGluc3BlY3Rpb24u
CgkqIGxpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9SdW50aW1lLmphdmE6
CgkobG9hZExpYnJhcnkpIHVzZSBDYWxsU3RhY2suZ2V0Q2FsbGVyc0NsYXNz
TG9hZGVyKCkuCgkobG9hZCkgc2FtZS4KCWxpYnJhcmllcy9qYXZhbGliL2ph
dmEvbGFuZy9TeXN0ZW0uamF2YToKCShsb2FkKSB1c2UgQ2FsbFN0YWNrLmdl
dENhbGxlcnNDbGFzc0xvYWRlcigpLgoJKGxvYWRMaWJyYXJ5KSBzYW1lLgoJ
bGlicmFyaWVzL2phdmFsaWIva2FmZmUvbGFuZy9TeXN0ZW1DbGFzc0xvYWRl
ci5qYXZhOgoJKGNvbXBvbmVudFR5cGUpIG5ldyBwcml2YXRlIG1ldGhvZCB0
byBnZXQgdGhlIG5hbWUgb2YgdGhlCglpbm5lcm1vc3QgY29tcG9uZW50IHR5
cGUgb2YgYW4gYXJyYXkuCgkoZmluZENsYXNzKSBNb3ZlZCBzb21lIGVycm9y
IGNoZWNrcyBmcm9tIGphdmFfbGFuZ19DbGFzc19mb3JOYW1lCgloZXJlLgo=
--0-1114583979-1023064278=:63728
Content-Type: application/octet-stream; name="patch.diff"
Content-Transfer-Encoding: base64
Content-Description: patch.diff
Content-Disposition: attachment; filename="patch.diff"
ZGlmZiAtdXIgLXggQ1ZTIC14IE1ha2UqIC9ob21lL3RvcGljL2thZmZlL2xp
YnJhcmllcy9jbGliL25hdGl2ZS9DbGFzcy5jIGxpYnJhcmllcy9jbGliL25h
dGl2ZS9DbGFzcy5jCi0tLSAvaG9tZS90b3BpYy9rYWZmZS9saWJyYXJpZXMv
Y2xpYi9uYXRpdmUvQ2xhc3MuYwlUaHUgTWF5IDMwIDIzOjAzOjUxIDIwMDIK
KysrIGxpYnJhcmllcy9jbGliL25hdGl2ZS9DbGFzcy5jCVN1biBKdW4gIDIg
MTI6MjQ6MzUgMjAwMgpAQCAtMzUsMTM5ICszNSw2IEBACiBleHRlcm4gSGph
dmFfbGFuZ19PYmplY3QqIGJ1aWxkU3RhY2tUcmFjZShzdHJ1Y3QgX2V4Y2Vw
dGlvbkZyYW1lKik7CiAKIC8qCi0gKiBDb252ZXJ0IHN0cmluZyBuYW1lIHRv
IGNsYXNzIG9iamVjdC4KLSAqLwotc3RydWN0IEhqYXZhX2xhbmdfQ2xhc3Mq
Ci1qYXZhX2xhbmdfQ2xhc3NfZm9yTmFtZShzdHJ1Y3QgSGphdmFfbGFuZ19T
dHJpbmcqIHN0ciwgamJvb2wgZG9pbml0LAotCUhqYXZhX2xhbmdfQ2xhc3NM
b2FkZXIqIGxvYWRlcikKLXsKLQllcnJvckluZm8gZWluZm87Ci0JSGphdmFf
bGFuZ19DbGFzcyogY2xheno7Ci0JVXRmOENvbnN0ICp1dGY4YnVmOwotCWNv
bnN0IGNoYXIgKmJ1ZjsKLQlpbnQgamxlbjsKLQlqY2hhciAqanM7Ci0KLQkv
KgotCSAqIE5COiBpbnRlcm5hbGx5LCB3ZSBzdG9yZSBjbGFzcyBuYW1lcyBh
cyBwYXRoIG5hbWVzICh3aXRoIHNsYXNoZXMKLQkgKiAgICAgaW5zdGVhZCBv
ZiBkb3RzLiAgSG93ZXZlciwgd2UgbXVzdCBhbHNvIHByZXZlbnQgY2FsbHMg
dG8KLQkgKiAgICAgImphdmEvbGFuZy9PYmplY3QiIG9yICJbW0xqYXZhL2xh
bmcvT2JqZWN0OyIgZnJvbSBzdWNjZWVkaW5nLgotCSAqCVNpbmNlIGNsYXNz
IG5hbWVzIGNhbm5vdCBoYXZlIHNsYXNoZXMsIHdlIHJlamVjdCBhbGwgYXR0
ZW1wdHMKLQkgKgl0byBsb29rIHVwIG5hbWVzIHRoYXQgZG8uICBBd2t3YXJk
LiAgSW5lZmZpY2llbnQuCi0JICovCi0JanMgPSBTVFJJTkdfREFUQShzdHIp
OwotCWpsZW4gPSBTVFJJTkdfU0laRShzdHIpOwotCXdoaWxlICgtLWpsZW4g
PiAwKSB7Ci0JCWlmICgqanMrKyA9PSAnLycpIHsKLQkJCXBvc3RFeGNlcHRp
b25NZXNzYWdlKCZlaW5mbywKLQkJCQlKQVZBX0xBTkcoQ2xhc3NOb3RGb3Vu
ZEV4Y2VwdGlvbiksCi0JCQkJIkNhbm5vdCBoYXZlIHNsYXNoZXMgLSB1c2Ug
ZG90cyBpbnN0ZWFkLiIpOwotCQkJdGhyb3dFcnJvcigmZWluZm8pOwotCQl9
Ci0JfQotCi0JLyoKLQkgKiBOb3RlIHRoZSBmb2xsb3dpbmcgb2RkaXR5Ogot
CSAqCi0JICogSXQgaXMgYXBwYXJlbnRseSBwZXJmZWN0bHkgbGVnYWwgdG8g
Y2FsbCBmb3JOYW1lIGZvciBhcnJheSB0eXBlcywKLQkgKiBzdWNoIGFzICJb
TGphdmEubGFuZy5TdHJpbmc7IiBvciAiW0IiLgotCSAqIEhvd2V2ZXIsIGl0
IGlzIHdyb25nIHRvIGNhbGwgQ2xhc3MuZm9yTmFtZSgiTGphdmEubGFuZy5T
dHJpbmc7IikKLQkgKgotCSAqIFRoaXMgc2l0dWF0aW9uIGlzIHNpbWlsYXIg
dG8gdGhlIGNvbnN0YW50IHBvb2wgcmVzb2x1dGlvbi4gIFdlCi0JICogdGhl
cmVmb3JlIGRvIHRoZSBzYW1lIHRoaW5nIGFzIGluIGdldENsYXNzIGluIGth
ZmZldm0vbG9va3VwLmMsCi0JICogdGhhdCBpcywgdXNlIGVpdGhlciBsb2Fk
QXJyYXkgb3IgbG9hZENsYXNzIGRlcGVuZGluZyBvbiB0aGUgbmFtZS4KLQkg
KgotCSAqIFRoaXMgaXMgc29tZXdoYXQgZGVzY3JpYmVkIGluIFNlY3Rpb24g
NS4xLjMgb2YgdGhlIFZNCi0JICogU3BlY2lmaWNhdGlvbiwgdGl0bGVkICJB
cnJheSBDbGFzc2VzIi4gIFRoaXMgc2VjdGlvbiBzZWVtcyB0bwotCSAqIGlt
cGx5IHRoYXQgd2UgbXVzdCBhdm9pZCBhc2tpbmcgYSBjbGFzcyBsb2FkZXIg
dG8gcmVzb2x2ZSBzdWNoCi0JICogYXJyYXkgbmFtZXMgKHRob3NlIHN0YXJ0
aW5nIHdpdGggYW4gWyksIGFuZCB0aGlzIGlzIHdoYXQgY2FsbGluZwotCSAq
IGxvYWRBcnJheSBkb2VzLgotCSAqLwotCi0JLyogQ29udmVydCBzdHJpbmcg
dG8gdXRmOCwgY29udmVydGluZyAnLicgdG8gJy8nICovCi0JdXRmOGJ1ZiA9
IGNoZWNrUHRyKHN0cmluZ0phdmEyVXRmOENvbnN0UmVwbGFjZShzdHIsICcu
JywgJy8nKSk7Ci0JYnVmID0gdXRmOGJ1Zi0+ZGF0YTsKLQotCWlmIChidWZb
MF0gPT0gJ1snKSB7Ci0JCWNsYXp6ID0gbG9hZEFycmF5KHV0ZjhidWYsIGxv
YWRlciwgJmVpbmZvKTsKLQl9Ci0JZWxzZSB7Ci0JCWNsYXp6ID0gbG9hZENs
YXNzKHV0ZjhidWYsIGxvYWRlciwgJmVpbmZvKTsKLQl9Ci0KLQkvKiBpZiBh
biBlcnJvciBvY2N1cnJlZCwgdGhyb3cgYW4gZXhjZXB0aW9uICovCi0JaWYg
KGNsYXp6ID09IDApIHsKLQkJLyogVGhlIG9ubHkgY2hlY2tlZCBleGNlcHRp
b24gdGhhdCBDbGFzcy5mb3JOYW1lKCkgdGhyb3dzCi0JCSAqIGlzIENsYXNz
Tm90Rm91bmRFeGNlcHRpb24uICBUaGlzIGlzIGFuIGV4Y2VwdGlvbiwgbm90
IGFuCi0JCSAqIEVycm9yLCB3aGljaCB1c2VycyBvZnRlbiBjYXRjaC4KLQkJ
ICoKLQkJICogSG93ZXZlciwgQ2xhc3MuZm9yTmFtZSgpIGNhbiBhbHNvIHRo
cm93IGVycm9ycywgc3VjaCBhcwotCQkgKiBOb0NsYXNzRGVmRm91bmRFcnJv
ciwgaWYgZm9yIGluc3RhbmNlIGEgc3VwZXJjbGFzcyBmb3IKLQkJICogYSBj
bGFzcyBjb3VsZG4ndCBiZSBmb3VuZC4KLQkJICoKLQkJICogV2hlbiBpdCB0
aHJvd3Mgd2hpY2gsIHdlIGRvbid0IHJlYWxseSBrbm93LiAgV2UgdHJ5IHRv
IGJlCi0JCSAqIGNvbXBhdGlibGUsIHNvIHdlIHVwZ3JhZGUgdGhlIGVycm9y
IHRvIGFuIGV4Y2VwdGlvbiBpZiBpdCdzCi0JCSAqIChOb0NsYXNzRGVmRm91
bmRFcnJvciwgdGhpc19jbGFzc19uYW1lKSwgb3IgaWYgaXQncyBhCi0JCSAq
IFZlcmlmeUVycm9yLgotCQkgKiBOQjogMS4yIHNlZW1zIHRvIGJlIG1vcmUg
Y29uc2lzdGVudCBhbmQgdGhyb3dzCi0JCSAqIENsYXNzTm90Rm91bmRFeGNl
cHRpb24gaW4gbW9zdCBjYXNlcy4KLQkJICovCi0JCWlmICgoZWluZm8udHlw
ZSAmIEtFUlJfRVhDRVBUSU9OKSAmJiAhc3RyY21wKGVpbmZvLmNsYXNzbmFt
ZSwgImphdmEubGFuZy5WZXJpZnlFcnJvciIpKQotCQl7Ci0JCQllcnJvcklu
Zm8gZWluZm9fY29weSA9IGVpbmZvOwotCQkJcG9zdEV4Y2VwdGlvbk1lc3Nh
Z2UoJmVpbmZvLAotCQkJCUpBVkFfTEFORyhDbGFzc05vdEZvdW5kRXhjZXB0
aW9uKSwKLQkJCQkiJXMiLCBlaW5mby5tZXNzKTsKLQkJCWRpc2NhcmRFcnJv
ckluZm8oJmVpbmZvX2NvcHkpOwotCQl9IGVsc2UKLQkJaWYgKChlaW5mby50
eXBlICYgS0VSUl9FWENFUFRJT04pICYmICFzdHJjbXAoZWluZm8uY2xhc3Nu
YW1lLCAiamF2YS5sYW5nLk5vQ2xhc3NEZWZGb3VuZEVycm9yIikpCi0JCXsK
LQkJCS8qCi0JCQkgKiBIb3dldmVyLCB3ZSBkb24ndCB1cGdyYWRlIGlmIGl0
IGlzIGEgc2Vjb25kIGF0dGVtcHQKLQkJCSAqIHRvIGxvYWQgYSBjbGFzcyB3
aG9zZSBsb2FkaW5nIGhhcyBhbHJlYWR5IGZhaWxlZC4KLQkJCSAqLwotCQkJ
Y2xhc3NFbnRyeSogY2VudHJ5OwotCQkJY2VudHJ5ID0gbG9va3VwQ2xhc3NF
bnRyeSh1dGY4YnVmLCBsb2FkZXIsICZlaW5mbyk7Ci0JCQlpZiAoY2VudHJ5
ID09IDAgfHwgKGNlbnRyeS0+Y2xhc3MgJiYKLQkJCSAgICBjZW50cnktPmNs
YXNzLT5zdGF0ZSA9PSBDU1RBVEVfRkFJTEVEKSkgewotCQkJCXV0ZjhDb25z
dFJlbGVhc2UodXRmOGJ1Zik7Ci0JCQkJdGhyb3dFcnJvcigmZWluZm8pOwot
CQkJfQotCi0JCQkvKiBUaGlzIGlzIG5vdCBxdWl0ZSB3aGF0IFN1biBkb2Vz
OiB0aGV5IHVzZSB0aGUKLQkJCSAqIGNsYXNzbmFtZSwgd2UgdXNlIHRoZSBw
YXRobmFtZSBhcyB0aGUgbWVzc2FnZQotCQkJICogb2YgdGhlIGV4Y2VwdGlv
biAgKEZJWE1FPykKLQkJCSAqLwotCQkJaWYgKGJ1ZlswXSA9PSAnWycgfHwg
IXN0cmNtcChlaW5mby5tZXNzLCBidWYpKSB7Ci0JCQkJZXJyb3JJbmZvIGVp
bmZvX2NvcHkgPSBlaW5mbzsKLQkJCQlwb3N0RXhjZXB0aW9uTWVzc2FnZSgm
ZWluZm8sCi0JCQkJCUpBVkFfTEFORyhDbGFzc05vdEZvdW5kRXhjZXB0aW9u
KSwKLQkJCQkJIiVzIiwgZWluZm8ubWVzcyk7Ci0JCQkJZGlzY2FyZEVycm9y
SW5mbygmZWluZm9fY29weSk7Ci0JCQl9Ci0JCX0KLQkJdXRmOENvbnN0UmVs
ZWFzZSh1dGY4YnVmKTsKLQkJdGhyb3dFcnJvcigmZWluZm8pOwotCX0KLQl1
dGY4Q29uc3RSZWxlYXNlKHV0ZjhidWYpOwotCi0JLyoKLQkgKiBsb2FkQ2xh
c3MgcmV0dXJucyB0aGUgY2xhc3MgaW4gc3RhdGUgQ1NUQVRFX0xJTktFRC4K
LQkgKgotCSAqIFByb2Nlc3NpbmcgdG8gQ1NUQVRFX0NPTVBMRVRFIHdpbGwg
aW5pdGlhbGl6ZSB0aGUgY2xhc3MsIHJlc29sdmUKLQkgKiBpdHMgY29uc3Rh
bnRzIGFuZCBydW4gaXRzIHN0YXRpYyBpbml0aWFsaXplcnMuCi0JICoKLQkg
KiBUaGUgb3B0aW9uIHRvIGxvYWQgYSBjbGFzcyB2aWEgZm9yTmFtZSB3aXRo
b3V0IGluaXRpYWxpemluZyBpdAotCSAqIHdhcyBpbnRyb2R1Y2VkIGluIDEu
MiwgcHJlc3VtYWJseSBmb3IgdGhlIGNvbnZlbmllbmNlIG9mCi0JICogcHJv
Z3JhbXMgc3VjaCBhcyBzdHViIGNvbXBpbGVycy4KLQkgKi8KLQlpZiAoZG9p
bml0ICYmIHByb2Nlc3NDbGFzcyhjbGF6eiwgQ1NUQVRFX0NPTVBMRVRFLCAm
ZWluZm8pID09IGZhbHNlKSB7Ci0JCXRocm93RXJyb3IoJmVpbmZvKTsKLQl9
Ci0JcmV0dXJuIChjbGF6eik7Ci19Ci0KLS8qCiAgKiBDb252ZXJ0IGNsYXNz
IHRvIHN0cmluZyBuYW1lLgogICovCiBzdHJ1Y3QgSGphdmFfbGFuZ19TdHJp
bmcqCmRpZmYgLXVyIC14IENWUyAteCBNYWtlKiAvaG9tZS90b3BpYy9rYWZm
ZS9saWJyYXJpZXMvY2xpYi9uYXRpdmUvQ2xhc3NMb2FkZXIuYyBsaWJyYXJp
ZXMvY2xpYi9uYXRpdmUvQ2xhc3NMb2FkZXIuYwotLS0gL2hvbWUvdG9waWMv
a2FmZmUvbGlicmFyaWVzL2NsaWIvbmF0aXZlL0NsYXNzTG9hZGVyLmMJVGh1
IE1heSAzMCAyMzowMzo1MSAyMDAyCisrKyBsaWJyYXJpZXMvY2xpYi9uYXRp
dmUvQ2xhc3NMb2FkZXIuYwlTYXQgSnVuICAxIDAxOjU1OjA4IDIwMDIKQEAg
LTEyNyw3ICsxMjcsNyBAQAogamF2YV9sYW5nX0NsYXNzTG9hZGVyX3Jlc29s
dmVDbGFzczAoc3RydWN0IEhqYXZhX2xhbmdfQ2xhc3NMb2FkZXIqIHRoaXMs
IHN0cnVjdCBIamF2YV9sYW5nX0NsYXNzKiBjbGFzcykKIHsKIAllcnJvcklu
Zm8gaW5mbzsKLQlpZiAocHJvY2Vzc0NsYXNzKGNsYXNzLCBDU1RBVEVfTElO
S0VELCAmaW5mbykgPT0gZmFsc2UpIHsKKwlpZiAocHJvY2Vzc0NsYXNzKGNs
YXNzLCBDU1RBVEVfQ09NUExFVEUsICZpbmZvKSA9PSBmYWxzZSkgewogCQl0
aHJvd0Vycm9yKCZpbmZvKTsKIAl9CiB9CmRpZmYgLXVyIC14IENWUyAteCBN
YWtlKiAvaG9tZS90b3BpYy9rYWZmZS9saWJyYXJpZXMvY2xpYi9uYXRpdmUv
U3lzdGVtQ2xhc3NMb2FkZXIuYyBsaWJyYXJpZXMvY2xpYi9uYXRpdmUvU3lz
dGVtQ2xhc3NMb2FkZXIuYwotLS0gL2hvbWUvdG9waWMva2FmZmUvbGlicmFy
aWVzL2NsaWIvbmF0aXZlL1N5c3RlbUNsYXNzTG9hZGVyLmMJVGh1IE1heSAz
MCAyMzowMzo1MSAyMDAyCisrKyBsaWJyYXJpZXMvY2xpYi9uYXRpdmUvU3lz
dGVtQ2xhc3NMb2FkZXIuYwlTdW4gSnVuICAyIDExOjM3OjQyIDIwMDIKQEAg
LTUzLDggKzUzLDE0IEBACiAKIAkJYyA9IHV0ZjhDb25zdE5ldyhuYW1lLCBs
ZW4pOwogCQlpZiAoYykgeworCQkgICAgaWYgKGMtPmRhdGFbMF0gPT0gJ1sn
KSB7CisJCQljbGF6eiA9IGxvYWRBcnJheShjLCAwLCAmaW5mbyk7CisJCSAg
ICB9CisJCSAgICBlbHNlIHsKIAkJCWNsYXp6ID0gbG9hZENsYXNzKGMsIDAs
ICZpbmZvKTsKLQkJCXV0ZjhDb25zdFJlbGVhc2UoYyk7CisJCSAgICB9CisK
KwkJICAgIHV0ZjhDb25zdFJlbGVhc2UoYyk7CiAJCX0KIAl9CiAKQEAgLTYz
LDE1ICs2OSw0MCBAQAogCQkgKiB1cGdyYWRlIGVycm9yIHRvIGFuIGV4Y2Vw
dGlvbiBpZiAqdGhpcyogY2xhc3Mgd2Fzbid0IGZvdW5kLgogCQkgKiBTZWUg
ZGlzY3Vzc2lvbiBpbiBDbGFzcy5mb3JOYW1lKCkKIAkJICovCi0JCWlmICgh
c3RyY21wKGluZm8uY2xhc3NuYW1lLCAiamF2YS5sYW5nLk5vQ2xhc3NEZWZG
b3VuZEVycm9yIikKLQkJICAgICYmICFzdHJjbXAoaW5mby5tZXNzLCBuYW1l
KSkKLQkJewotCQkJZXJyb3JJbmZvIGluZm9fdG1wID0gaW5mbzsKLQkJCXBv
c3RFeGNlcHRpb25NZXNzYWdlKCZpbmZvLAotCQkJCUpBVkFfTEFORyhDbGFz
c05vdEZvdW5kRXhjZXB0aW9uKSwgCi0JCQkJIiVzIiwgaW5mby5tZXNzKTsK
LQkJCWRpc2NhcmRFcnJvckluZm8oJmluZm9fdG1wKTsKKwkJaWYgKCFzdHJj
bXAoaW5mby5jbGFzc25hbWUsICJqYXZhLmxhbmcuTm9DbGFzc0RlZkZvdW5k
RXJyb3IiKSkgeworCQkJLyoKKwkJCSAqIEhvd2V2ZXIsIHdlIGRvbid0IHVw
Z3JhZGUgaWYgaXQgaXMgYSBzZWNvbmQgYXR0ZW1wdAorCQkJICogdG8gbG9h
ZCBhIGNsYXNzIHdob3NlIGxvYWRpbmcgaGFzIGFscmVhZHkgZmFpbGVkLgor
CQkJICovCisJCQljbGFzc0VudHJ5KiBjZW50cnk7CisKKwkJCXN0cmluZ0ph
dmEyQ0J1ZihzdHIsIG5hbWUsIGxlbisxKTsKKwkJCWNsYXNzbmFtZTJwYXRo
bmFtZShuYW1lLCBuYW1lKTsKKwkJCWMgPSB1dGY4Q29uc3ROZXcobmFtZSwg
bGVuKTsKKworCQkJY2VudHJ5ID0gbG9va3VwQ2xhc3NFbnRyeShjLCAwLCAm
aW5mbyk7CisJCQlpZiAoY2VudHJ5ID09IDAKKwkJCSAgICB8fCAoY2VudHJ5
LT5jbGFzcworCQkJCSYmIGNlbnRyeS0+Y2xhc3MtPnN0YXRlID09IENTVEFU
RV9GQUlMRUQpKSB7CisJCQkJdXRmOENvbnN0UmVsZWFzZShjKTsKKwkJCQl0
aHJvd0Vycm9yKCZpbmZvKTsKKwkJCX0KKwkJCXV0ZjhDb25zdFJlbGVhc2Uo
Yyk7CisKKwkJCWlmICghc3RyY21wKGluZm8ubWVzcywgbmFtZSkpIHsKKwkJ
CQllcnJvckluZm8gaW5mb190bXAgPSBpbmZvOworCQkJCXBvc3RFeGNlcHRp
b25NZXNzYWdlKCZpbmZvLAorCQkJCQkJICAgICBKQVZBX0xBTkcoQ2xhc3NO
b3RGb3VuZEV4Y2VwdGlvbiksIAorCQkJCQkJICAgICAiJXMiLCBpbmZvLm1l
c3MpOworCQkJCWRpc2NhcmRFcnJvckluZm8oJmluZm9fdG1wKTsKKwkJCX0K
KwkJfQorCQllbHNlIGlmICgoaW5mby50eXBlICYgS0VSUl9FWENFUFRJT04p
CisJCQkgJiYgIXN0cmNtcChpbmZvLmNsYXNzbmFtZSwgImphdmEubGFuZy5O
b0NsYXNzRGVmRm91bmRFcnJvciIpKQorICAgICAgICAgICAgICAgIHsKKwog
CQl9CisKIAkJaWYgKG5hbWUgIT0gYnVmZmVyKSB7CiAJCQlLRlJFRShuYW1l
KTsKIAkJfQpkaWZmIC11ciAteCBDVlMgLXggTWFrZSogL2hvbWUvdG9waWMv
a2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0NsYXNzLmphdmEg
bGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0NsYXNzLmphdmEKLS0tIC9o
b21lL3RvcGljL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9D
bGFzcy5qYXZhCVRodSBNYXkgMzAgMjM6MDQ6MTQgMjAwMgorKysgbGlicmFy
aWVzL2phdmFsaWIvamF2YS9sYW5nL0NsYXNzLmphdmEJTW9uIEp1biAgMyAw
MDoyNzowMyAyMDAyCkBAIC0zNSwzMiArMzUsNjQgQEAKIHByaXZhdGUgQ2xh
c3MoKSB7CiB9CiAKLS8qCi0gKiBXZSBtdXN0IHVzZSB0aGUgQ2xhc3NMb2Fk
ZXIgYXNzb2NpYXRlZCB3aXRoIHRoZSBjYWxsaW5nIG1ldGhvZC9jbGFzcy4K
LSAqIFdlIG11c3QgaGFuZGxlIHRoZSBzcGVjaWFsIGNhc2Ugb2YgY29kZSBs
aWtlIHRoaXM6Ci0gKgotICogICAgQ2xhc3MgYyA9IENsYXNzLmNsYXNzOwot
ICogICAgTWV0aG9kIG0gPSBjLmdldE1ldGhvZCgiZm9yTmFtZSIsIG5ldyBD
bGFzc1tdIHsgU3RyaW5nLmNsYXNzIH0pOwotICogICAgYyA9IChDbGFzcylt
Lmludm9rZShjLCBuZXcgT2JqZWN0W10geyAiQ2xhc3MyIiB9KTsKLSAqCi0g
KiBJZiB3ZSBkaWRuJ3QsIHRoZW4gd2Ugd291bGQgZGV0ZWN0IGphdmEubGFu
Zy5yZWZsZWN0Lk1ldGhvZCBhcyB0aGUKLSAqIGNhbGxpbmcgY2xhc3MsIGFu
ZCBlbmQgdXAgYWx3YXlzIHVzaW5nIHRoZSBib290c3RyYXAgQ2xhc3NMb2Fk
ZXIuCi0gKiBUbyBkZWFsIHdpdGggdGhpcywgd2Ugc2tpcCBvdmVyIGphdmEu
bGFuZy5yZWZsZWN0Lk1ldGhvZC4KLSAqCi0gKiBTaW5jZSBNZXRob2QuaW52
b2tlIGltcGxlbWVudGF0aW9uIGhhcyBhIGphdmEgYW5kIGEgbmF0aXZlIHBh
cnQsCi0gKiB3ZSBuZWVkIHRvIHNraXAgYm90aC4KLSAqLwogcHVibGljIHN0
YXRpYyBDbGFzcyBmb3JOYW1lKFN0cmluZyBjbGFzc05hbWUpIHRocm93cyBD
bGFzc05vdEZvdW5kRXhjZXB0aW9uIHsKLQlDbGFzcyBjYWxsaW5nQ2xhc3Mg
PSBnZXRTdGFja0NsYXNzKDEpOwotCWlmIChjYWxsaW5nQ2xhc3MgIT0gbnVs
bAotCSAgICAmJiBjYWxsaW5nQ2xhc3MuZ2V0TmFtZSgpLmVxdWFscygiamF2
YS5sYW5nLnJlZmxlY3QuTWV0aG9kIikpCi0JCWNhbGxpbmdDbGFzcyA9IGdl
dFN0YWNrQ2xhc3MoMyk7Ci0JcmV0dXJuIGZvck5hbWUoY2xhc3NOYW1lLCB0
cnVlLAotCSAgICBjYWxsaW5nQ2xhc3MgPT0gbnVsbCA/IG51bGwgOiBjYWxs
aW5nQ2xhc3MuZ2V0Q2xhc3NMb2FkZXIoKSk7CisJcmV0dXJuIGZvck5hbWUo
Y2xhc3NOYW1lLCB0cnVlLCBudWxsKTsKIH0KIAotcHVibGljIHN0YXRpYyBu
YXRpdmUgQ2xhc3MgZm9yTmFtZShTdHJpbmcgY2xhc3NOYW1lLAotCWJvb2xl
YW4gaW5pdGlhbGl6ZSwgQ2xhc3NMb2FkZXIgbG9hZGVyKSB0aHJvd3MgQ2xh
c3NOb3RGb3VuZEV4Y2VwdGlvbjsKK3B1YmxpYyBzdGF0aWMgQ2xhc3MgZm9y
TmFtZShTdHJpbmcgY2xhc3NOYW1lLCBib29sZWFuIGluaXRpYWxpemUsIENs
YXNzTG9hZGVyIGxvYWRlcikgdGhyb3dzIENsYXNzTm90Rm91bmRFeGNlcHRp
b24geworICAgICAgICAvKgorICAgICAgICAgKiBOQjogaW50ZXJuYWxseSwg
d2Ugc3RvcmUgY2xhc3MgbmFtZXMgYXMgcGF0aCBuYW1lcyAod2l0aCBzbGFz
aGVzCisgICAgICAgICAqICAgICBpbnN0ZWFkIG9mIGRvdHMuICBIb3dldmVy
LCB3ZSBtdXN0IGFsc28gcHJldmVudCBjYWxscyB0bworICAgICAgICAgKiAg
ICAgImphdmEvbGFuZy9PYmplY3QiIG9yICJbW0xqYXZhL2xhbmcvT2JqZWN0
OyIgZnJvbSBzdWNjZWVkaW5nLgorICAgICAgICAgKiAgICAgIFNpbmNlIGNs
YXNzIG5hbWVzIGNhbm5vdCBoYXZlIHNsYXNoZXMsIHdlIHJlamVjdCBhbGwg
YXR0ZW1wdHMKKyAgICAgICAgICogICAgICB0byBsb29rIHVwIG5hbWVzIHRo
YXQgZG8uICBBd2t3YXJkLiAgSW5lZmZpY2llbnQuCisgICAgICAgICAqLwor
CWlmIChjbGFzc05hbWUuaW5kZXhPZignLycpICE9IC0xKSB7CisJCXRocm93
IG5ldyBDbGFzc05vdEZvdW5kRXhjZXB0aW9uKCJDYW5ub3QgaGF2ZSBzbGFz
aGVzIC0gdXNlIGRvdHMgaW5zdGVhZC4iKTsKKwl9CisKKwkvKiBmaW5kIHRo
ZSBhcHByb3ByaWF0ZSBjbGFzcyBsb2FkZXIgKi8KKwlpZiAobG9hZGVyID09
IG51bGwpIHsKKworCQlsb2FkZXIgPSBDYWxsU3RhY2suZ2V0Q2FsbGVyc0Ns
YXNzTG9hZGVyKCk7CisJCS8qIGlmIGxvYWRlciBpcyBudWxsLCB0aGVuIHRo
ZSBjYWxsaW5nIGNsYXNzIGhhcyBiZWVuIGxvYWRlZCBieSB0aGUKKwkJICog
Ym9vdHN0cmFwIGNsYXNzIGxvYWRlci4gV2UgY2FuIHVzZSB0aGUgc3lzdGVt
IGNsYXNzIGxvYWRlciB0bworCQkgKiBsb2FkIHRoZSByZXF1ZXN0ZWQgY2xh
c3MuCisJCSAqLworCQlpZiAobG9hZGVyID09IG51bGwpIHsKKwkJCWxvYWRl
ciA9IFN5c3RlbUNsYXNzTG9hZGVyLmdldENsYXNzTG9hZGVyKCk7CisJCX0K
Kwl9CisKKwkvKiBUaGUgb25seSBjaGVja2VkIGV4Y2VwdGlvbiB0aGF0IENs
YXNzLmZvck5hbWUoKSB0aHJvd3MKKwkgKiBpcyBDbGFzc05vdEZvdW5kRXhj
ZXB0aW9uLiAgVGhpcyBpcyBhbiBleGNlcHRpb24sIG5vdCBhbgorCSAqIEVy
cm9yLCB3aGljaCB1c2VycyBvZnRlbiBjYXRjaC4KKwkgKgorCSAqIEhvd2V2
ZXIsIENsYXNzLmZvck5hbWUoKSBjYW4gYWxzbyB0aHJvdyBlcnJvcnMsIHN1
Y2ggYXMKKwkgKiBOb0NsYXNzRGVmRm91bmRFcnJvciwgaWYgZm9yIGluc3Rh
bmNlIGEgc3VwZXJjbGFzcyBmb3IKKwkgKiBhIGNsYXNzIGNvdWxkbid0IGJl
IGZvdW5kLgorCSAqCisJICogV2hlbiBpdCB0aHJvd3Mgd2hpY2gsIHdlIGRv
bid0IHJlYWxseSBrbm93LiAgV2UgdHJ5IHRvIGJlCisJICogY29tcGF0aWJs
ZSwgc28gd2UgdXBncmFkZSB0aGUgZXJyb3IgdG8gYW4gZXhjZXB0aW9uIGlm
IGl0J3MKKwkgKiAoTm9DbGFzc0RlZkZvdW5kRXJyb3IsIHRoaXNfY2xhc3Nf
bmFtZSksIG9yIGlmIGl0J3MgYQorCSAqIFZlcmlmeUVycm9yLgorCSAqIE5C
OiAxLjIgc2VlbXMgdG8gYmUgbW9yZSBjb25zaXN0ZW50IGFuZCB0aHJvd3MK
KwkgKiBDbGFzc05vdEZvdW5kRXhjZXB0aW9uIGluIG1vc3QgY2FzZXMuCisJ
ICovCisKKwlDbGFzcyBjbHMgPSBsb2FkZXIuZmluZExvYWRlZENsYXNzKGNs
YXNzTmFtZSk7CisKKwlpZiAoY2xzID09IG51bGwpIHsKKwkJdHJ5IHsKKwkJ
CWNscyA9IGxvYWRlci5sb2FkQ2xhc3MoY2xhc3NOYW1lLCBpbml0aWFsaXpl
KTsKKwkJfQorCQljYXRjaCAoVmVyaWZ5RXJyb3IgZXJyb3IpIHsKKwkJCXRo
cm93IG5ldyBDbGFzc05vdEZvdW5kRXhjZXB0aW9uKGVycm9yLmdldE1lc3Nh
Z2UoKSk7CisJCX0KKwl9CisKKwlyZXR1cm4gY2xzOworfQogCiBwcml2YXRl
IFN0cmluZyBmdWxsUmVzb3VyY2VOYW1lKFN0cmluZyBuYW1lKSB7CiAJaWYg
KG5hbWUuY2hhckF0KDApID09ICcvJykgewpAQCAtMzY4LDI1ICs0MDAsOTUg
QEAKIAkgICAgKyBnZXROYW1lKCk7CiB9CiAKKy8qIENhbGxTdGFjayBpcyB1
c2VkIHRvIGVuY2Fwc3VsYXRlIGNhbGwgc3RhY2sgYmFzZWQKKyAqIGNsYXNz
IGxvYWRlciBpbnNwZWN0aW9uLgorICoKKyAqIEl0IGlzIHVzZWQgYnkgQ2xh
c3MuZm9yTmFtZSBhbmQgb3RoZXIgbWV0aG9kcyBpbiAKKyAqIGphdmEubGFu
ZyB0aGF0IG5lZWQgdG8gZ2V0IGhvbGQgb2YgdGhlIENsYXNzTG9hZGVyCisg
KiBhc3NvY2lhdGVkIHdpdGggdGhlaXIgY2FsbGluZyBjbGFzcy4KKyAqLwor
c3RhdGljIGNsYXNzIENhbGxTdGFjayB7CisJcHJpdmF0ZSBDbGFzcyBbXSBj
bGFzc1N0YWNrOworCisJQ2FsbFN0YWNrKCkgeworCQljbGFzc1N0YWNrID0g
U2VjdXJpdHlNYW5hZ2VyLmdldENsYXNzQ29udGV4dDAoKTsKKwl9CisKKwkv
KiBUaGlzIG1ldGhvZCB3YWxrcyB0aGUgY2FsbCBzdGFjayB0byBmaW5kIHRo
ZQorCSAqIGNsYXNzIGxvYWRlciBvZiB0aGUgY2FsbGluZyBjbGFzcy4gSXQg
dGFrZXMgY2FyZQorCSAqIG9mIHJlY3Vyc2l2ZSBjYWxscyB3aXRoaW4gbGli
cmFyeSBpbXBsZW1lbnRhdGlvbiwKKwkgKiBhbmQgTWV0aG9kLmludm9rZS4K
KwkgKi8KKwlzdGF0aWMgQ2xhc3NMb2FkZXIgZ2V0Q2FsbGVyc0NsYXNzTG9h
ZGVyKCkgeworCQlDYWxsU3RhY2sgY2FsbFN0YWNrID0gbmV3IENhbGxTdGFj
aygpOworCQkvKiBUaGlzIG1ldGhvZCBpcyBjYWxpbmcgQ2FsbFN0YWNrKCks
CisJCSAqIGFuZCB3ZSB3YW50IHRoZSBtZXRob2QgY2FsbGluZyB0aGlzIG1l
dGhvZC4KKwkJICogU28gdGhlIHN0YXJ0IGZyYW1lIGlzIDIuCisJCSAqLwor
CQlpbnQgZnJhbWUgPSAyOworCQlDbGFzcyBjYWxsaW5nQ2xhc3MgPSBjYWxs
U3RhY2suZ2V0U3RhY2tDbGFzcyhmcmFtZSk7CisKKwkJLyogV2UgY291bGQg
aGF2ZSBiZWVuIGNhbGxlZCByZWN1cnNpdmVseQorCQkgKiB3aXRoaW4gYSBj
bGFzcyBpbXBsZW1lbnRhdGlvbi4gVGhlbiB3ZQorCQkgKiBuZWVkIHRvIHdh
bGsgdXAgdGhlIHN0YWNrIHRvIGZpbmQgdGhlCisJCSAqIHJlYWwgY2FsbGlu
ZyBjbGFzcy4KKwkJICovCisJCWlmIChudWxsICE9IGNhbGxpbmdDbGFzcwor
CQkgICAgJiYgY2FsbFN0YWNrLmdldFN0YWNrQ2xhc3MoZnJhbWUgLSAxKSA9
PSBjYWxsaW5nQ2xhc3MpIHsKKwkJCXdoaWxlIChjYWxsU3RhY2suZ2V0U3Rh
Y2tDbGFzcygrK2ZyYW1lKSA9PSBjYWxsaW5nQ2xhc3MpIHsKKwkJCX0KKwor
CQkJY2FsbGluZ0NsYXNzID0gY2FsbFN0YWNrLmdldFN0YWNrQ2xhc3MoZnJh
bWUpOworCQl9CisKKwkJLyoKKwkJICogV2UgbXVzdCB1c2UgdGhlIENsYXNz
TG9hZGVyIGFzc29jaWF0ZWQgd2l0aCB0aGUgY2FsbGluZyBtZXRob2QvY2xh
c3MuCisJCSAqIFdlIG11c3QgaGFuZGxlIHRoZSBzcGVjaWFsIGNhc2Ugb2Yg
Y29kZSBsaWtlIHRoaXM6CisJCSAqCisJCSAqICAgIENsYXNzIGMgPSBDbGFz
cy5jbGFzczsKKwkJICogICAgTWV0aG9kIG0gPSBjLmdldE1ldGhvZCgiZm9y
TmFtZSIsIG5ldyBDbGFzc1tdIHsgU3RyaW5nLmNsYXNzIH0pOworCQkgKiAg
ICBjID0gKENsYXNzKW0uaW52b2tlKGMsIG5ldyBPYmplY3RbXSB7ICJDbGFz
czIiIH0pOworCQkgKgorCQkgKiBJZiB3ZSBkaWRuJ3QsIHRoZW4gd2Ugd291
bGQgZGV0ZWN0IGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZCBhcyB0aGUKKwkJ
ICogY2FsbGluZyBjbGFzcywgYW5kIGVuZCB1cCBhbHdheXMgdXNpbmcgdGhl
IGJvb3RzdHJhcCBDbGFzc0xvYWRlci4KKwkJICogVG8gZGVhbCB3aXRoIHRo
aXMsIHdlIHNraXAgb3ZlciBqYXZhLmxhbmcucmVmbGVjdC5NZXRob2QuCisJ
CSAqCisJCSAqIFNpbmNlIE1ldGhvZC5pbnZva2UgaW1wbGVtZW50YXRpb24g
aGFzIGEgamF2YSBhbmQgYSBuYXRpdmUgcGFydCwKKwkJICogd2UgbmVlZCB0
byBza2lwIGJvdGguCisJCSAqLworCisJCWlmIChjYWxsaW5nQ2xhc3MgIT0g
bnVsbAorCQkgICAgJiYgY2FsbGluZ0NsYXNzLmdldE5hbWUoKS5lcXVhbHMo
ImphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZCIpKSB7CisJCQlmcmFtZSArPSAy
OworCQkJY2FsbGluZ0NsYXNzID0gY2FsbFN0YWNrLmdldFN0YWNrQ2xhc3Mo
ZnJhbWUpOworCQl9CisKKwkJaWYgKGNhbGxpbmdDbGFzcyAhPSBudWxsKSB7
CisJCQlyZXR1cm4gY2FsbGluZ0NsYXNzLmdldENsYXNzTG9hZGVyKCk7CisJ
CX0KKworCQlyZXR1cm4gbnVsbDsKKwl9CisKIC8qCiAgKiBEZXRlcm1pbmUg
dGhlIENsYXNzIGFzc29jaWF0ZWQgd2l0aCB0aGUgbWV0aG9kIE4gZnJhbWVz
IHVwIHRoZSBzdGFjazoKICAqCiAgKiBGcmFtZSAjICAgICAgTWV0aG9kCiAg
KiAtLS0tLS0tICAgICAgLS0tLS0tCiAgKiAgIC0yCQlTZWN1cml0eU1hbmFn
ZXIuZ2V0Q2xhc3NDb250ZXh0MCgpCi0gKiAgIC0xCQlDbGFzcy5nZXRTdGFj
a0NsYXNzKCkKLSAqICAgIDAJCVRoZSBtZXRob2QgY2FsbGluZyBDbGFzcy5n
ZXRTdGFja0NsYXNzKCkKLSAqICAgIDEJCVRoZSBtZXRob2QgY2FsbGluZyB0
aGUgbWV0aG9kIGNhbGxpbmcgQ2xhc3MuZ2V0U3RhY2tDbGFzcygpCisgKiAg
IC0xICAgICAgICAgQ2xhc3MuQ2FsbFN0YWNrKCkKKyAqICAgIDAJCVRoZSBt
ZXRob2QgY2FsbGluZyBDbGFzcy5DYWxsU3RhY2soKQorICogICAgMQkJVGhl
IG1ldGhvZCBjYWxsaW5nIHRoZSBtZXRob2QgY2FsbGluZyBDbGFzcy5DYWxs
U3RhY2soKQogICogICAgMgkJLi4uZXRjLi4uCiAgKgogICogUmV0dXJucyBu
dWxsIGlmIG5vdCBmb3VuZC4KICAqLwotc3RhdGljIENsYXNzIGdldFN0YWNr
Q2xhc3MoaW50IGZyYW1lKSB7Ci0JQ2xhc3NbXSBjbGFzc1N0YWNrID0gU2Vj
dXJpdHlNYW5hZ2VyLmdldENsYXNzQ29udGV4dDAoKTsKLQlmcmFtZSArPSAy
OwotCWlmIChmcmFtZSA+PSAwICYmIGZyYW1lIDwgY2xhc3NTdGFjay5sZW5n
dGgpCi0JCXJldHVybiBjbGFzc1N0YWNrW2ZyYW1lXTsKLQlyZXR1cm4gbnVs
bDsKKwlwcml2YXRlIENsYXNzIGdldFN0YWNrQ2xhc3MoaW50IGZyYW1lKSB7
CisJCWZyYW1lICs9IDI7CisJCWlmIChmcmFtZSA+PSAwICYmIGZyYW1lIDwg
Y2xhc3NTdGFjay5sZW5ndGgpIHsKKwkJCXJldHVybiBjbGFzc1N0YWNrW2Zy
YW1lXTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CiB9Ci0KIH0KZGlmZiAt
dXIgLXggQ1ZTIC14IE1ha2UqIC9ob21lL3RvcGljL2thZmZlL2xpYnJhcmll
cy9qYXZhbGliL2phdmEvbGFuZy9SdW50aW1lLmphdmEgbGlicmFyaWVzL2ph
dmFsaWIvamF2YS9sYW5nL1J1bnRpbWUuamF2YQotLS0gL2hvbWUvdG9waWMv
a2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL1J1bnRpbWUuamF2
YQlUaHUgTWF5IDMwIDIzOjA0OjE0IDIwMDIKKysrIGxpYnJhcmllcy9qYXZh
bGliL2phdmEvbGFuZy9SdW50aW1lLmphdmEJTW9uIEp1biAgMyAwMDoxMzox
MiAyMDAyCkBAIC0xMjMsNyArMTIzLDggQEAKIH0KIAogcHVibGljIHZvaWQg
bG9hZExpYnJhcnkoU3RyaW5nIGxpYm5hbWUpIHsKLQlsb2FkTGlicmFyeShs
aWJuYW1lLCBDbGFzcy5nZXRTdGFja0NsYXNzKDEpLmdldENsYXNzTG9hZGVy
KCkpOworCWxvYWRMaWJyYXJ5KGxpYm5hbWUsCisJCSAgICBDbGFzcy5DYWxs
U3RhY2suZ2V0Q2FsbGVyc0NsYXNzTG9hZGVyKCkpOwogfQogCiB2b2lkIGxv
YWRMaWJyYXJ5KFN0cmluZyBsaWJuYW1lLCBDbGFzc0xvYWRlciBsb2FkZXIp
IHsKQEAgLTE1MSw3ICsxNTIsNyBAQAogfQogCiBwdWJsaWMgdm9pZCBsb2Fk
KFN0cmluZyBmaWxlbmFtZSkgewotCWxvYWQoZmlsZW5hbWUsIENsYXNzLmdl
dFN0YWNrQ2xhc3MoMSkuZ2V0Q2xhc3NMb2FkZXIoKSk7CisJbG9hZChmaWxl
bmFtZSwgQ2xhc3MuQ2FsbFN0YWNrLmdldENhbGxlcnNDbGFzc0xvYWRlcigp
KTsKIH0KIAogdm9pZCBsb2FkKFN0cmluZyBmaWxlbmFtZSwgQ2xhc3NMb2Fk
ZXIgbG9hZGVyKSB7CmRpZmYgLXVyIC14IENWUyAteCBNYWtlKiAvaG9tZS90
b3BpYy9rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvU3lzdGVt
LmphdmEgbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL1N5c3RlbS5qYXZh
Ci0tLSAvaG9tZS90b3BpYy9rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZh
L2xhbmcvU3lzdGVtLmphdmEJVGh1IE1heSAzMCAyMzowNDoxMyAyMDAyCisr
KyBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvU3lzdGVtLmphdmEJTW9u
IEp1biAgMyAwMDoxMjozOCAyMDAyCkBAIC0xMzUsMTIgKzEzNSwxMiBAQAog
CiBwdWJsaWMgc3RhdGljIHZvaWQgbG9hZChTdHJpbmcgZmlsZW5hbWUpIHsK
IAlSdW50aW1lLmdldFJ1bnRpbWUoKS5sb2FkKGZpbGVuYW1lLAotCSAgICBD
bGFzcy5nZXRTdGFja0NsYXNzKDEpLmdldENsYXNzTG9hZGVyKCkpOworCSAg
ICBDbGFzcy5DYWxsU3RhY2suZ2V0Q2FsbGVyc0NsYXNzTG9hZGVyKCkpOwog
fQogCiBwdWJsaWMgc3RhdGljIHZvaWQgbG9hZExpYnJhcnkoU3RyaW5nIGxp
Ym5hbWUpIHsKIAlSdW50aW1lLmdldFJ1bnRpbWUoKS5sb2FkTGlicmFyeShs
aWJuYW1lLAotCSAgICBDbGFzcy5nZXRTdGFja0NsYXNzKDEpLmdldENsYXNz
TG9hZGVyKCkpOworCSAgICBDbGFzcy5DYWxsU3RhY2suZ2V0Q2FsbGVyc0Ns
YXNzTG9hZGVyKCkpOwogfQogCiBwdWJsaWMgc3RhdGljIFN0cmluZyBtYXBM
aWJyYXJ5TmFtZShTdHJpbmcgZm4pIHsKZGlmZiAtdXIgLXggQ1ZTIC14IE1h
a2UqIC9ob21lL3RvcGljL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2thZmZl
L2xhbmcvU3lzdGVtQ2xhc3NMb2FkZXIuamF2YSBsaWJyYXJpZXMvamF2YWxp
Yi9rYWZmZS9sYW5nL1N5c3RlbUNsYXNzTG9hZGVyLmphdmEKLS0tIC9ob21l
L3RvcGljL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2thZmZlL2xhbmcvU3lz
dGVtQ2xhc3NMb2FkZXIuamF2YQlUaHUgTWF5IDMwIDIzOjA0OjI5IDIwMDIK
KysrIGxpYnJhcmllcy9qYXZhbGliL2thZmZlL2xhbmcvU3lzdGVtQ2xhc3NM
b2FkZXIuamF2YQlNb24gSnVuICAzIDAwOjQ2OjQwIDIwMDIKQEAgLTI4LDYg
KzI4LDE5IEBACiAJc3VwZXIobnVsbCk7CQkvLyB0aGlzIGxpbmUgaXMgbm90
IHJlYWxseSBuZWNlc3NhcnkhCiB9CiAKK3ByaXZhdGUgc3RhdGljIFN0cmlu
ZyBjb21wb25lbnRUeXBlKFN0cmluZyBuYW1lKSB7CisJaW50IGNvbXBvbmVu
dFN0YXJ0ID0gbmFtZS5sYXN0SW5kZXhPZignWycpICsgMTsKKwlpZiAobmFt
ZS5jaGFyQXQoY29tcG9uZW50U3RhcnQpID09ICdMJyAmJiBuYW1lLmVuZHNX
aXRoKCI7IikpIHsKKwkJcmV0dXJuIG5hbWUuc3Vic3RyaW5nKGNvbXBvbmVu
dFN0YXJ0ICsgMSwgbmFtZS5sZW5ndGgoKSAtIDEpOworCX0KKwllbHNlIGlm
IChuYW1lLmxlbmd0aCgpIC0gY29tcG9uZW50U3RhcnQgPiAxKSB7CisJCXJl
dHVybiBuYW1lLnN1YnN0cmluZyhjb21wb25lbnRTdGFydCk7CisJfQorCWVs
c2UgeworCQlyZXR1cm4gbmFtZS5zdWJzdHJpbmcoY29tcG9uZW50U3RhcnQg
LSAxKTsKKwl9Cit9CisKIHB1YmxpYyBzdGF0aWMgQ2xhc3NMb2FkZXIgZ2V0
Q2xhc3NMb2FkZXIoKSB7CiAJcmV0dXJuIChzaW5nbGV0b24pOwogfQpAQCAt
ODUsNiArOTgsMjcgQEAKIH0KIAogcHJvdGVjdGVkIENsYXNzIGZpbmRDbGFz
cyhTdHJpbmcgbmFtZSkgdGhyb3dzIENsYXNzTm90Rm91bmRFeGNlcHRpb24g
eworCS8qIEFycmF5cyBvZiB2b2lkIGFyZSBub3QgYWxsb3dlZC4KKwkgKiBU
aGUgc2ltcGxlc3Qgd2F5IHRvIGhhbmRsZSBpdCBpcyBoZXJlLgorCSAqLwor
CWlmIChuYW1lLmVuZHNXaXRoKCJbViIpKSB7CisJCXRocm93IG5ldyBDbGFz
c05vdEZvdW5kRXhjZXB0aW9uKG5hbWUpOworCX0KKwkvKiBBcnJheXMgb2Yg
YmFkIHR5cGVzIHdvdWxkIHRocm93IGEgTm9DbGFzc0RlZkZvdW5kRXJyb3Iu
CisJICogQ2F0Y2ggaXQgaGVyZSwgYW5kIHJldGhyb3cgYXMgQ2xhc3NOb3RG
b3VuZEV4Y2VwdGlvbi4KKwkgKi8KKwllbHNlIGlmIChuYW1lLnN0YXJ0c1dp
dGgoIlsiKQorCQkgJiYgbmFtZS5sZW5ndGgoKSA+PSAzKSB7CisJCXRyeSB7
CisJCQkvKiBsb2FkIHRoZSBjb21wb25lbnQgdHlwZSAqLworCQkJU3RyaW5n
IGNvbXBvbmVudE5hbWUgPSBjb21wb25lbnRUeXBlKG5hbWUpOworCQkJbG9h
ZENsYXNzKGNvbXBvbmVudE5hbWUpOworCQl9CisJCWNhdGNoIChOb0NsYXNz
RGVmRm91bmRFcnJvciBlcnJvcikgeworCQkJdGhyb3cgbmV3IENsYXNzTm90
Rm91bmRFeGNlcHRpb24oZXJyb3IuZ2V0TWVzc2FnZSgpKTsKKwkJfQorCX0K
KwogCXJldHVybiBmaW5kQ2xhc3MwKG5hbWUpOwogfQogCg==
--0-1114583979-1023064278=:63728--