110229 2013-02-19 09:00:13 -0800 Web Inspector: Make UISourceCode.path() an array of path segments. 2013-02-20 04:35:07 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 836451 0 vsevik 2013-02-19 09:00:13 -0800 Patch to follow. 836461 1 189100 vsevik 2013-02-19 09:04:28 -0800 Created attachment 189100 Patch 837346 2 vsevik 2013-02-20 04:35:07 -0800 Committed r143451: <http://trac.webkit.org/changeset/143451> 189100 2013-02-19 09:04:28 -0800 2013-02-20 01:41:56 -0800 Patch bug-110229-20130219210049.patch text/plain 18673 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzcwZTk3ZTQ2NTRiNTk3 NTNjYjM0YjMxNTFjOWM2NjRhYTU5ZWEzNi4uMjMwMjM4NWI3NWE2ZDdjODI1NDVkYmUxNzUzMmQ2 ZWNhNmRkYTIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEzLTAyLTE5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE1ha2UgVUlTb3VyY2VDb2RlLnBhdGgoKSBhbiBhcnJheSBvZiBwYXRoIHNlZ21lbnRzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMjI5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUuX2ZpbGVQYXRoRm9y UGF0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5w cm90b3R5cGUuaW5uZXJDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUucmVxdWVzdEZpbGVDb250ZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5fY29udGVu dFR5cGVGb3JQYXRoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERl bGVnYXRlLnByb3RvdHlwZS5wb3B1bGF0ZS5maWxlc0xvYWRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUucG9wdWxhdGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5yZXF1 ZXN0RmlsZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpbXBsZVByb2plY3REZWxl Z2F0ZS5wcm90b3R5cGUuc2VhcmNoSW5GaWxlQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2ltcGxlUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5hZGRGaWxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TaW1wbGVQcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLl9lbnN1cmVVbmlxdWVQ YXRoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaW1wbGVQcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlLnJlbW92ZUZpbGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtzcGFjZVBy b3ZpZGVyLnBhdGhGb3JTcGxpdHRlZFVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2ltcGxl V29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBlLmFkZEZpbGVCeU5hbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLnByb3RvdHlwZS5yZW1vdmVGaWxlQnlO YW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLnVyaSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvamVjdC5wcm90b3R5cGUuX2ZpbGVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UHJvamVjdC5wcm90b3R5cGUuX2ZpbGVSZW1vdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q cm9qZWN0LnByb3RvdHlwZS51aVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLldv cmtzcGFjZS5wcm90b3R5cGUudWlTb3VyY2VDb2RlRm9yVVJMKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Xb3Jrc3BhY2UucHJvdG90eXBlLnVybEZvclBhdGgpOgorCisyMDEzLTAyLTE5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE1vdmUgd29ya3NwYWNlIHNwZWNpZmljIGNvZGUgZnJvbSBGaWxlTWFwcGluZyB0byB3b3Jr c3BhY2UuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTAyMTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9G aWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCmluZGV4IGIzZDcxMzkzMWFlZjRh NWY0M2UyMmNlNTYxNDkyNDkwZTkxYzBjODUuLjA2MDE5YmRlM2Q0YmY1YWExZGMxYmY5ZTlhYWUy OWJiNTU2YjRlNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMKQEAgLTY5LDE2ICs2 OSwxNiBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUg PSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAg ICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqIEByZXR1cm4ge3N0cmluZ30K ICAgICAgKi8KICAgICBfZmlsZVBhdGhGb3JQYXRoOiBmdW5jdGlvbihwYXRoKQogICAgIHsKLSAg ICAgICAgcmV0dXJuICIvIiArIHBhdGg7CisgICAgICAgIHJldHVybiAiLyIgKyBwYXRoLmpvaW4o Ii8iKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAg ICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCiAgICAgICogQHBhcmFtIHtmdW5jdGlv big/c3RyaW5nLGJvb2xlYW4sc3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8KICAgICByZXF1ZXN0 RmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHBhdGgsIGNhbGxiYWNrKQpAQCAtOTEsMTMgKzkxLDEzIEBA IFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICovCiAgICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soY29udGVudCkKICAgICAg ICAgewotICAgICAgICAgICAgdmFyIGNvbnRlbnRUeXBlID0gdGhpcy5fY29udGVudFR5cGVGb3JQ YXRoKGZpbGVQYXRoKTsKKyAgICAgICAgICAgIHZhciBjb250ZW50VHlwZSA9IHRoaXMuX2NvbnRl bnRUeXBlRm9yUGF0aChwYXRoKTsKICAgICAgICAgICAgIGNhbGxiYWNrKGNvbnRlbnQsIGZhbHNl LCBjb250ZW50VHlwZS5jYW5vbmljYWxNaW1lVHlwZSgpKTsKICAgICAgICAgfQogICAgIH0sCiAK ICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAgICAqIEBwYXJhbSB7QXJy YXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbmV3Q29udGVudAogICAg ICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCkBAIC0xMDgs NyArMTA4LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAor ICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge3N0cmlu Z30gcXVlcnkKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGNhc2VTZW5zaXRpdmUKICAgICAgKiBA cGFyYW0ge2Jvb2xlYW59IGlzUmVnZXgKQEAgLTEzMywxMyArMTMzLDEyIEBAIFdlYkluc3BlY3Rv ci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0ge0FycmF5Ljxz dHJpbmc+fSBwYXRoCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZX0K ICAgICAgKi8KICAgICBfY29udGVudFR5cGVGb3JQYXRoOiBmdW5jdGlvbihwYXRoKQogICAgIHsK LSAgICAgICAgdmFyIHNwbGl0dGVkUGF0aCA9IHBhdGguc3BsaXQoIi8iKTsKLSAgICAgICAgdmFy IGZpbGVOYW1lID0gc3BsaXR0ZWRQYXRoW3NwbGl0dGVkUGF0aC5sZW5ndGggLSAxXTsKKyAgICAg ICAgdmFyIGZpbGVOYW1lID0gcGF0aFtwYXRoLmxlbmd0aCAtIDFdOwogICAgICAgICB2YXIgZXh0 ZW5zaW9uSW5kZXggPSBmaWxlTmFtZS5sYXN0SW5kZXhPZigiLiIpOwogICAgICAgICB2YXIgZXh0 ZW5zaW9uID0gIiI7CiAgICAgICAgIGlmIChleHRlbnNpb25JbmRleCAhPT0gLTEpCkBAIC0xNjEs OCArMTYwLDEwIEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgZnVuY3Rpb24gZmlsZXNMb2FkZWQoZmlsZXMpCiAgICAgICAgIHsK ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZmlsZXMubGVuZ3RoOyArK2kpIHsKKyAg ICAgICAgICAgICAgICB2YXIgcGF0aCA9IGZpbGVzW2ldLnNwbGl0KCIvIik7CisgICAgICAgICAg ICAgICAgcGF0aC5zaGlmdCgpOworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHBhdGgu bGVuZ3RoKTsKICAgICAgICAgICAgICAgICB2YXIgZnVsbFBhdGggPSB0aGlzLl9maWxlU3lzdGVt LnBhdGgoKSArIGZpbGVzW2ldOwotICAgICAgICAgICAgICAgIHZhciBwYXRoID0gZmlsZXNbaV0u c3Vic3RyKDEpOyAKICAgICAgICAgICAgICAgICB2YXIgdXJsID0gdGhpcy5fd29ya3NwYWNlLnVy bEZvclBhdGgoZnVsbFBhdGgpOwogICAgICAgICAgICAgICAgIHZhciBjb250ZW50VHlwZSA9IHRo aXMuX2NvbnRlbnRUeXBlRm9yUGF0aChwYXRoKTsKICAgICAgICAgICAgICAgICB2YXIgZmlsZURl c2NyaXB0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVEZXNjcmlwdG9yKHBhdGgsICJmaWxlOi8v IiArIGZ1bGxQYXRoLCB1cmwsIGNvbnRlbnRUeXBlLCB0cnVlKTsKQEAgLTE4MCw3ICsxODEsNyBA QCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBh cmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqLwogICAgIF9yZW1vdmVGaWxlOiBmdW5j dGlvbihwYXRoKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLmpzCmluZGV4IDA0NTYwZWQ4 ZjA3NjczN2FmYjIwODlhZGE3MTAxN2I4NDMwZmJjOTkuLjUwZWZmNjE3Njg1ZjAxYzYzNzJmNjky MzU4NmY2MzBmNTFjMTZlOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVXb3Jrc3BhY2VQcm92aWRlci5qcwpAQCAtODUsMTcg Kzg1LDE3IEBAIFdlYkluc3BlY3Rvci5TaW1wbGVQcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlID0g ewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAgICAq IEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9z dHJpbmcsYm9vbGVhbixzdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RGaWxl Q29udGVudDogZnVuY3Rpb24ocGF0aCwgY2FsbGJhY2spCiAgICAgewotICAgICAgICB2YXIgY29u dGVudFByb3ZpZGVyID0gdGhpcy5fY29udGVudFByb3ZpZGVyc1twYXRoXTsKKyAgICAgICAgdmFy IGNvbnRlbnRQcm92aWRlciA9IHRoaXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aC5qb2luKCIvIild OwogICAgICAgICBjb250ZW50UHJvdmlkZXIucmVxdWVzdENvbnRlbnQoY2FsbGJhY2spOwogICAg IH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAgICAqIEBwYXJh bSB7QXJyYXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbmV3Q29udGVu dAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCkBA IC0xMDUsNyArMTA1LDcgQEAgV2ViSW5zcGVjdG9yLlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm90 b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRo CisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqIEBwYXJhbSB7c3Ry aW5nfSBxdWVyeQogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gY2FzZVNlbnNpdGl2ZQogICAgICAq IEBwYXJhbSB7Ym9vbGVhbn0gaXNSZWdleApAQCAtMTEzLDQ2ICsxMTMsNDggQEAgV2ViSW5zcGVj dG9yLlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgc2Vh cmNoSW5GaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgcXVlcnksIGNhc2VTZW5zaXRpdmUsIGlz UmVnZXgsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IHRo aXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aF07CisgICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIg PSB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigiLyIpXTsKICAgICAgICAgY29udGVu dFByb3ZpZGVyLnNlYXJjaEluQ29udGVudChxdWVyeSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwg Y2FsbGJhY2spOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0 aAorICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge3N0 cmluZ30gdXJsCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfSBj b250ZW50UHJvdmlkZXIKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzRWRpdGFibGUKICAgICAg KiBAcGFyYW0ge2Jvb2xlYW49fSBpc0NvbnRlbnRTY3JpcHQKLSAgICAgKiBAcmV0dXJuIHtzdHJp bmd9CisgICAgICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59CiAgICAgICovCiAgICAgYWRkRmls ZTogZnVuY3Rpb24ocGF0aCwgZm9yY2VVbmlxdWVQYXRoLCB1cmwsIGNvbnRlbnRQcm92aWRlciwg aXNFZGl0YWJsZSwgaXNDb250ZW50U2NyaXB0KQogICAgIHsKICAgICAgICAgaWYgKGZvcmNlVW5p cXVlUGF0aCkKLSAgICAgICAgICAgIHBhdGggPSB0aGlzLl91bmlxdWVQYXRoKHBhdGgpOyAKKyAg ICAgICAgICAgIHRoaXMuX2Vuc3VyZVVuaXF1ZVBhdGgocGF0aCk7CiAgICAgICAgIHZhciBmaWxl RGVzY3JpcHRvciA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZURlc2NyaXB0b3IocGF0aCwgdXJsLCB1 cmwsIGNvbnRlbnRQcm92aWRlci5jb250ZW50VHlwZSgpLCBpc0VkaXRhYmxlLCBpc0NvbnRlbnRT Y3JpcHQpOwotICAgICAgICB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGhdID0gY29udGVudFBy b3ZpZGVyOworICAgICAgICB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigiLyIpXSA9 IGNvbnRlbnRQcm92aWRlcjsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlByb2plY3REZWxlZ2F0ZS5FdmVudHMuRmlsZUFkZGVkLCBmaWxlRGVzY3Jp cHRvcik7CiAgICAgICAgIHJldHVybiBwYXRoOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cGFyYW0ge3N0cmluZ30gcGF0aAotICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKiBAcGFy YW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCiAgICAgICovCi0gICAgX3VuaXF1ZVBhdGg6IGZ1bmN0 aW9uKHBhdGgpCi0gICAgewotICAgICAgICB2YXIgdW5pcXVlUGF0aCA9IHBhdGg7Ci0gICAgICAg IHdoaWxlICh0aGlzLl9jb250ZW50UHJvdmlkZXJzW3VuaXF1ZVBhdGhdKQotICAgICAgICAgICAg dW5pcXVlUGF0aCA9IHBhdGggKyAiICgiICsgKCsrdGhpcy5fbGFzdFVuaXF1ZVN1ZmZpeCkgKyAi KSI7Ci0gICAgICAgIHJldHVybiB1bmlxdWVQYXRoOworICAgIF9lbnN1cmVVbmlxdWVQYXRoOiBm dW5jdGlvbihwYXRoKQorICAgICB7CisgICAgICAgIHZhciB1bmlxdWVQYXRoID0gcGF0aC5qb2lu KCIvIik7CisgICAgICAgIHZhciBzdWZmaXggPSAiIjsKKyAgICAgICAgd2hpbGUgKHRoaXMuX2Nv bnRlbnRQcm92aWRlcnNbdW5pcXVlUGF0aF0pIHsKKyAgICAgICAgICAgIHN1ZmZpeCA9ICIgKCIg KyAoKyt0aGlzLl9sYXN0VW5pcXVlU3VmZml4KSArICIpIjsKKyAgICAgICAgICAgIHVuaXF1ZVBh dGggPSBwYXRoICsgc3VmZml4OworICAgICAgICB9CisgICAgICAgIHBhdGhbcGF0aC5sZW5ndGgg LSAxXSArPSBzdWZmaXg7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5n fSBwYXRoCisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqLwogICAg IHJlbW92ZUZpbGU6IGZ1bmN0aW9uKHBhdGgpCiAgICAgewotICAgICAgICBkZWxldGUgdGhpcy5f Y29udGVudFByb3ZpZGVyc1twYXRoXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2NvbnRlbnRQcm92 aWRlcnNbcGF0aC5qb2luKCIvIildOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuUHJvamVjdERlbGVnYXRlLkV2ZW50cy5GaWxlUmVtb3ZlZCwgcGF0 aCk7CiAgICAgfSwKIApAQCAtMjExLDEyICsyMTMsMTMgQEAgV2ViSW5zcGVjdG9yLlNpbXBsZVdv cmtzcGFjZVByb3ZpZGVyLnNwbGl0VVJMID0gZnVuY3Rpb24odXJsKQogCiAvKioKICAqIEBwYXJh bSB7QXJyYXkuPHN0cmluZz59IHNwbGl0dGVkVVJMCi0gKiBAcmV0dXJuIHtzdHJpbmd9CisgKiBA cmV0dXJuIHtBcnJheS48c3RyaW5nPn0KICAqLwogV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtzcGFj ZVByb3ZpZGVyLnBhdGhGb3JTcGxpdHRlZFVSTCA9IGZ1bmN0aW9uKHNwbGl0dGVkVVJMKQogewot ICAgIHNwbGl0dGVkVVJMLnNoaWZ0KCk7Ci0gICAgcmV0dXJuIHNwbGl0dGVkVVJMLmpvaW4oIi8i KTsKKyAgICB2YXIgcmVzdWx0ID0gc3BsaXR0ZWRVUkwuc2xpY2UoKTsKKyAgICByZXN1bHQuc2hp ZnQoKTsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCiBXZWJJbnNwZWN0b3IuU2ltcGxlV29ya3Nw YWNlUHJvdmlkZXIucHJvdG90eXBlID0gewpAQCAtMjg0LDEyICsyODcsMTIgQEAgV2ViSW5zcGVj dG9yLlNpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBh ZGRGaWxlQnlOYW1lOiBmdW5jdGlvbihwcm9qZWN0TmFtZSwgbmFtZSwgY29udGVudFByb3ZpZGVy LCBpc0VkaXRhYmxlLCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICByZXR1cm4gdGhp cy5faW5uZXJBZGRGaWxlKCIiLCBuYW1lLCBuYW1lLCBjb250ZW50UHJvdmlkZXIsIGlzRWRpdGFi bGUsIGZhbHNlLCBpc0NvbnRlbnRTY3JpcHQpOworICAgICAgICByZXR1cm4gdGhpcy5faW5uZXJB ZGRGaWxlKCIiLCBbbmFtZV0sIG5hbWUsIGNvbnRlbnRQcm92aWRlciwgaXNFZGl0YWJsZSwgZmFs c2UsIGlzQ29udGVudFNjcmlwdCk7CiAgICAgfSwKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7 c3RyaW5nfSBwcm9qZWN0TmFtZQotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICog QHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LkNvbnRlbnRQcm92aWRlcn0gY29udGVudFByb3ZpZGVyCiAgICAgICogQHBhcmFtIHtib29sZWFu fSBpc0VkaXRhYmxlCiAgICAgICogQHBhcmFtIHtib29sZWFufSBmb3JjZVVuaXF1ZQpAQCAtMzA1 LDEyICszMDgsMTIgQEAgV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLnByb3Rv dHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwcm9qZWN0TmFtZQot ICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IG5hbWUK ICAgICAgKi8KLSAgICByZW1vdmVGaWxlQnlOYW1lOiBmdW5jdGlvbihwcm9qZWN0TmFtZSwgcGF0 aCkKKyAgICByZW1vdmVGaWxlQnlOYW1lOiBmdW5jdGlvbihwcm9qZWN0TmFtZSwgbmFtZSkKICAg ICB7CiAgICAgICAgIHZhciBwcm9qZWN0RGVsZWdhdGUgPSB0aGlzLl9wcm9qZWN0RGVsZWdhdGUo cHJvamVjdE5hbWUpOwotICAgICAgICBwcm9qZWN0RGVsZWdhdGUucmVtb3ZlRmlsZShwYXRoKTsK KyAgICAgICAgcHJvamVjdERlbGVnYXRlLnJlbW92ZUZpbGUoW25hbWVdKTsKICAgICB9LAogCiAg ICAgcmVzZXQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9VSVNvdXJjZUNvZGUuanMKaW5kZXggNzJiYWM4YTgxODJkMjk4NzcwMGMxMWY2NTQ0 ZWMxMDFlZTYxZjcxZi4uMzBlMDhkZTU5YzQzOTI5ZTE2MWExNDI4ODA1Mzk5OGY3MmMzOGIxYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNv ZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNv ZGUuanMKQEAgLTM0LDcgKzM0LDcgQEAKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0 fQogICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXJ9CiAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5Qcm9qZWN0fSBwcm9qZWN0Ci0gKiBAcGFyYW0ge3N0cmluZ30gcGF0 aAorICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICogQHBhcmFtIHtzdHJpbmd9IHVy bAogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlfSBjb250ZW50VHlwZQogICog QHBhcmFtIHtib29sZWFufSBpc0VkaXRhYmxlCkBAIC04MSwzNyArODEsNiBAQCBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlLkV2ZW50cyA9IHsKICAgICBTb3VyY2VNYXBwaW5nQ2hhbmdlZDogIlNv dXJjZU1hcHBpbmdDaGFuZ2VkIiwKIH0KIAotLyoqCi0gKiBAcGFyYW0ge3N0cmluZ30gcHJvamVj dElkCi0gKiBAcGFyYW0ge3N0cmluZ30gcGF0aAotICogQHJldHVybiB7c3RyaW5nfQotICovCi1X ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnVyaSA9IGZ1bmN0aW9uKHByb2plY3RJZCwgcGF0aCkK LXsKLSAgICBpZiAoIXByb2plY3RJZCkKLSAgICAgICAgcmV0dXJuIHBhdGg7Ci0gICAgaWYgKCFw YXRoKQotICAgICAgICByZXR1cm4gcHJvamVjdElkOwotICAgIHJldHVybiBwcm9qZWN0SWQgKyAi LyIgKyBwYXRoOwotfQotCi0vKioKLSAqIEBwYXJhbSB7c3RyaW5nfSBwcm9qZWN0SWQKLSAqIEBw YXJhbSB7c3RyaW5nfSB1cmkKLSAqIEByZXR1cm4gez9zdHJpbmd9Ci0gKi8KLVdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUucGF0aCA9IGZ1bmN0aW9uKHByb2plY3RJZCwgdXJpKQotewotICAgIGlm ICghcHJvamVjdElkKQotICAgICAgICByZXR1cm4gdXJpOwotICAgIGlmICghdXJpLnN0YXJ0c1dp dGgocHJvamVjdElkKSkKLSAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgdmFyIHBhdGggPSB1cmku c3Vic3RyKHByb2plY3RJZC5sZW5ndGgpOwotICAgIGlmIChwYXRoLmxlbmd0aCAmJiBwYXRoWzBd ID09PSAiLyIpCi0gICAgICAgIHBhdGggPSBwYXRoLnN1YnN0cigxKTsKLSAgICByZXR1cm4gcGF0 aDsKLX0KLQogV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgLyoq CiAgICAgICogQHJldHVybiB7c3RyaW5nfQpAQCAtMTIyLDcgKzkxLDcgQEAgV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBy ZXR1cm4ge3N0cmluZ30KKyAgICAgKiBAcmV0dXJuIHtBcnJheS48c3RyaW5nPn0KICAgICAgKi8K ICAgICBwYXRoOiBmdW5jdGlvbigpCiAgICAgewpAQCAtMTM0LDcgKzEwMywxMSBAQCBXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICB1cmk6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnVy aSh0aGlzLl9wcm9qZWN0LmlkKCksIHRoaXMuX3BhdGgpOworICAgICAgICBpZiAoIXRoaXMuX3By b2plY3QuaWQoKSkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9wYXRoLmpvaW4oIi8iKTsKKyAg ICAgICAgaWYgKCF0aGlzLl9wYXRoLmxlbmd0aCkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9w cm9qZWN0LmlkKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9wcm9qZWN0LmlkKCkgKyAiLyIgKyB0 aGlzLl9wYXRoLmpvaW4oIi8iKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzCmluZGV4IGExYTM0MDkzOTlmODU5 OTMzMDI0M2NlZjA5NWQ1Mzk0ZjkyYTJlYzQuLjY1MzJhM2NkNDJhZWQxMjEyNzY2MmNmYmM4M2Nj NzJlZGY3MWI0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvV29ya3NwYWNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv V29ya3NwYWNlLmpzCkBAIC00OSw3ICs0OSw3IEBAIFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VDb250 cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqIEBwYXJhbSB7 c3RyaW5nfSBwYXRoCisgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCiAgKiBAcGFyYW0g e3N0cmluZ30gb3JpZ2luVVJMCiAgKiBAcGFyYW0ge3N0cmluZ30gdXJsCiAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5SZXNvdXJjZVR5cGV9IGNvbnRlbnRUeXBlCkBAIC05NCwyMCArOTQsMjAgQEAg V2ViSW5zcGVjdG9yLlByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgZGlzcGxheU5h bWU6IGZ1bmN0aW9uKCkgeyB9LCAKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBw YXRoCisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAgICAqIEBwYXJhbSB7 ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCiAgICAg cmVxdWVzdEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBjYWxsYmFjaykgeyB9LAogCiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0ge0FycmF5Ljxz dHJpbmc+fSBwYXRoCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld0NvbnRlbnQKICAgICAgKiBA cGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwogICAgIHNldEZpbGVD b250ZW50OiBmdW5jdGlvbihwYXRoLCBuZXdDb250ZW50LCBjYWxsYmFjaykgeyB9LAogCiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0ge0FycmF5Ljxz dHJpbmc+fSBwYXRoCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHF1ZXJ5CiAgICAgICogQHBhcmFt IHtib29sZWFufSBjYXNlU2Vuc2l0aXZlCiAgICAgICogQHBhcmFtIHtib29sZWFufSBpc1JlZ2V4 CkBAIC0xOTQsMTcgKzE5NCwxNyBAQCBXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIH0KICAgICAgICAgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUodGhpcywgZmlsZURlc2NyaXB0b3IucGF0aCwgZmlsZURlc2NyaXB0b3Iub3JpZ2lu VVJMLCBmaWxlRGVzY3JpcHRvci51cmwsIGZpbGVEZXNjcmlwdG9yLmNvbnRlbnRUeXBlLCBmaWxl RGVzY3JpcHRvci5pc0VkaXRhYmxlKTsgCiAgICAgICAgIHVpU291cmNlQ29kZS5pc0NvbnRlbnRT Y3JpcHQgPSBmaWxlRGVzY3JpcHRvci5pc0NvbnRlbnRTY3JpcHQ7Ci0gICAgICAgIHRoaXMuX3Vp U291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnBhdGgoKV0gPSB1aVNvdXJjZUNvZGU7CisgICAgICAg IHRoaXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnBhdGgoKS5qb2luKCIvIildID0gdWlT b3VyY2VDb2RlOwogICAgICAgICB0aGlzLl93b3Jrc3BhY2UuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2Rl QWRkZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAogICAgIF9maWxlUmVtb3ZlZDogZnVuY3Rp b24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgcGF0aCA9IC8qKiBAdHlwZSB7c3RyaW5nfSAq LyAoZXZlbnQuZGF0YSk7CisgICAgICAgIHZhciBwYXRoID0gLyoqIEB0eXBlIHtBcnJheS48c3Ry aW5nPn0gKi8gKGV2ZW50LmRhdGEpOwogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy51 aVNvdXJjZUNvZGUocGF0aCk7CiAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlKQogICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBkZWxldGUgdGhpcy5fdWlTb3VyY2VDb2Rlc1t1aVNvdXJjZUNv ZGUucGF0aCgpXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VD b2RlLnBhdGgoKS5qb2luKCIvIildOwogICAgICAgICB0aGlzLl93b3Jrc3BhY2UuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMu VUlTb3VyY2VDb2RlUmVtb3ZlZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCkBAIC0yMTUsMTIg KzIxNSwxMiBAQCBXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBhcmFtIHtBcnJh eS48c3RyaW5nPn0gcGF0aAogICAgICAqIEByZXR1cm4gez9XZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlfQogICAgICAqLwogICAgIHVpU291cmNlQ29kZTogZnVuY3Rpb24ocGF0aCkKICAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl91aVNvdXJjZUNvZGVzW3BhdGhdIHx8IG51bGw7CisgICAgICAg IHJldHVybiB0aGlzLl91aVNvdXJjZUNvZGVzW3BhdGguam9pbigiLyIpXSB8fCBudWxsOwogICAg IH0sCiAKICAgICAvKioKQEAgLTIzOCwxOCArMjM4LDYgQEAgV2ViSW5zcGVjdG9yLlByb2plY3Qu cHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30g dXJpCi0gICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9Ci0gICAgICov Ci0gICAgdWlTb3VyY2VDb2RlRm9yVVJJOiBmdW5jdGlvbih1cmkpCi0gICAgewotICAgICAgICB2 YXIgcGF0aCA9IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucGF0aCh0aGlzLmlkKCksIHVyaSk7 Ci0gICAgICAgIGlmICh0eXBlb2YgcGF0aCAhPT0gInN0cmluZyIpCi0gICAgICAgICAgICByZXR1 cm4gbnVsbDsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZXNbcGF0aF07Ci0gICAg fSwKLQotICAgIC8qKgogICAgICAqIEByZXR1cm4ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlPn0KICAgICAgKi8KICAgICB1aVNvdXJjZUNvZGVzOiBmdW5jdGlvbigpCkBAIC0zMjYs NyArMzE0LDcgQEAgV2ViSW5zcGVjdG9yLldvcmtzcGFjZS5FdmVudHMgPSB7CiBXZWJJbnNwZWN0 b3IuV29ya3NwYWNlLnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmlu Z30gcHJvamVjdElkCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0g e0FycmF5LjxzdHJpbmc+fSBwYXRoCiAgICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGV9CiAgICAgICovCiAgICAgdWlTb3VyY2VDb2RlOiBmdW5jdGlvbihwcm9qZWN0SWQs IHBhdGgpCkBAIC0zNTIsMjEgKzM0MCw2IEBAIFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UucHJvdG90 eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gdXJpCi0g ICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9Ci0gICAgICovCi0gICAg dWlTb3VyY2VDb2RlRm9yVVJJOiBmdW5jdGlvbih1cmkpCi0gICAgewotICAgICAgICBmb3IgKHZh ciBwcm9qZWN0SWQgaW4gdGhpcy5fcHJvamVjdHMpIHsKLSAgICAgICAgICAgIHZhciBwcm9qZWN0 ID0gdGhpcy5fcHJvamVjdHNbcHJvamVjdElkXTsKLSAgICAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSBwcm9qZWN0LnVpU291cmNlQ29kZUZvclVSSSh1cmkpOwotICAgICAgICAgICAgaWYgKHVp U291cmNlQ29kZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdWlTb3VyY2VDb2RlOwotICAgICAg ICB9Ci0gICAgICAgIHJldHVybiBudWxsOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFy YW0ge3N0cmluZ30gdHlwZQogICAgICAqIEByZXR1cm4ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlPn0KICAgICAgKi8KQEAgLTQ4Nyw3ICs0NjAsNyBAQCBXZWJJbnNwZWN0b3IuV29y a3NwYWNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHBhdGhQcmVmaXggPSBlbnRyeS5wYXRo UHJlZml4LnN1YnN0cihmaWxlU3lzdGVtUGF0aC5sZW5ndGggKyAxKTsKICAgICAgICAgdmFyIHBh dGggPSBwYXRoUHJlZml4ICsgdXJsLnN1YnN0cihlbnRyeS51cmxQcmVmaXgubGVuZ3RoKTsKICAg ICAgICAgdmFyIHByb2plY3QgPSB0aGlzLnByb2plY3QocHJvamVjdElkKTsKLSAgICAgICAgcmV0 dXJuIHByb2plY3QgPyBwcm9qZWN0LnVpU291cmNlQ29kZShwYXRoKSA6IG51bGw7CisgICAgICAg IHJldHVybiBwcm9qZWN0ID8gcHJvamVjdC51aVNvdXJjZUNvZGUocGF0aC5zcGxpdCgiLyIpKSA6 IG51bGw7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI5ODQ2N2E5ZGVkOGM3MDkxMjI2NDIx NDRlODRmY2ViYTkyNjkxYTkuLmJlMzJiNzU1MjcwMDUxOTE1ODZjYzJjZDE1OWE3OWQ0N2IzMDU0 MDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsNSArMSwxNCBAQAogMjAxMy0wMi0xOSAgVnNldm9sb2QgVmxhc292ICA8 dnNldmlrQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIFVJU291 cmNlQ29kZS5wYXRoKCkgYW4gYXJyYXkgb2YgcGF0aCBzZWdtZW50cy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDIyOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3dvcmtzcGFjZS1t YXBwaW5nLmh0bWw6CisKKzIwMTMtMDItMTkgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJv bWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSB3b3Jrc3BhY2Ugc3BlY2lm aWMgY29kZSBmcm9tIEZpbGVNYXBwaW5nIHRvIHdvcmtzcGFjZS4KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDIxOQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmcuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci93b3Jrc3BhY2UtbWFwcGluZy5odG1sCmluZGV4IDg3NWU3MzEwMmIyNTgzMGNkYjJi YTBhZDgzZWI1OGM0YTI5ZjZiODcuLjM0ODM3ODkzYjI5ZjFjOGQxYWNiZDJiYzAxMzcxMDQ2NzUw ODYwYzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3Jrc3BhY2UtbWFwcGlu Zy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3Jrc3BhY2UtbWFwcGluZy5odG1s CkBAIC0zMCw3ICszMCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB9LAogCiAgICAgICAg IGFkZFVJU291cmNlQ29kZTogZnVuY3Rpb24ocGF0aCkgewotICAgICAgICAgICAgdmFyIGZpbGVE ZXNjcmlwdG9yID0gbmV3IFdlYkluc3BlY3Rvci5GaWxlRGVzY3JpcHRvcihwYXRoLCBwYXRoLCBw YXRoLCBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQsIHRydWUsIGZhbHNlKTsKKyAg ICAgICAgICAgIHZhciBmaWxlRGVzY3JpcHRvciA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZURlc2Ny aXB0b3IocGF0aC5zcGxpdCgiLyIpLCBwYXRoLCBwYXRoLCBXZWJJbnNwZWN0b3IucmVzb3VyY2VU eXBlcy5TY3JpcHQsIHRydWUsIGZhbHNlKTsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9qZWN0RGVsZWdhdGUuRXZlbnRzLkZpbGVBZGRl ZCwgZmlsZURlc2NyaXB0b3IpOwogICAgICAgICB9LAogCg==