111583 2013-03-06 08:17:55 -0800 Web Inspector: Support setting up file system mappings from scripts panel context menu. 2013-03-07 07:37:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov buildbot keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs yurys oldest_to_newest 848879 0 vsevik 2013-03-06 08:17:55 -0800 Patch to follow. 848881 1 191756 vsevik 2013-03-06 08:20:49 -0800 Created attachment 191756 Patch 849893 2 191756 buildbot 2013-03-07 02:09:23 -0800 Comment on attachment 191756 Patch Attachment 191756 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17010175 New failing tests: inspector/debugger/debugger-expand-scope.html 850078 3 vsevik 2013-03-07 07:37:19 -0800 Committed r145076: <http://trac.webkit.org/changeset/145076> 191756 2013-03-06 08:20:49 -0800 2013-03-07 02:09:23 -0800 Patch bug-111583-20130306201654.patch text/plain 22939 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVhZTZhNTU5Nzc0MGUw ZTJjZjZiZGM2YzUyNjY4NGI4NGE3ZGFiNy4uZDIwM2E1NTk3M2U0MGI5YjRiMWYwMWQ4ZTViNzRh NmZhOTMyZDFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYxIEBACiAyMDEzLTAzLTA2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFN1cHBvcnQgc2V0dGluZyB1cCBmaWxlIHN5c3RlbSBtYXBwaW5ncyBmcm9tIHNjcmlwdHMg cGFuZWwgY29udGV4dCBtZW51LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTExNTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkZWQgY29udGV4dCBtZW51IGl0ZW1zIHRvIHNldCB1cCBuZXR3b3JrIC0g ZmlsZSBzeXN0ZW0gbWFwcGluZ3MgZnJvbSBzb3VyY2VzIHBhbmVsLgorCisgICAgICAgICogRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvRmlsZVN5c3RlbU1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5 c3RlbU1hcHBpbmdJbXBsLnByb3RvdHlwZS5maWxlU3lzdGVtUGF0aCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Xb3Jrc3BhY2VQcm92aWRlci5wcm90b3R5cGUuX2ZpbGVT eXN0ZW1SZW1vdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNl UHJvdmlkZXIucHJvdG90eXBlLmZpbGVTeXN0ZW1QYXRoKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlLm9uRW50ZXIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5wcm90b3R5 cGUuc2V0UXVlcnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZURp YWxvZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRGlhbG9nLnBy b3RvdHlwZS51aVNvdXJjZUNvZGVTZWxlY3RlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Vs ZWN0VUlTb3VyY2VDb2RlRGlhbG9nLnByb3RvdHlwZS5maWx0ZXJQcm9qZWN0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TZWxlY3RVSVNvdXJjZUNvZGVEaWFsb2cucHJvdG90eXBlLmZpbHRlclVJ U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRGlh bG9nLnByb3RvdHlwZS5zZWxlY3RJdGVtKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWxlY3RV SVNvdXJjZUNvZGVEaWFsb2cucHJvdG90eXBlLl91aVNvdXJjZUNvZGVBZGRlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlLnVpU291cmNlQ29kZVNlbGVjdGVkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlLmZpbHRlclBy b2plY3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZUZvclByb2pl Y3RUeXBlRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWxlY3RVSVNvdXJjZUNvZGVG b3JQcm9qZWN0VHlwZURpYWxvZy5wcm90b3R5cGUudWlTb3VyY2VDb2RlU2VsZWN0ZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZUZvclByb2plY3RUeXBlRGlhbG9n LnByb3RvdHlwZS5maWx0ZXJQcm9qZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWxlY3RV SVNvdXJjZUNvZGVGb3JQcm9qZWN0VHlwZURpYWxvZy5zaG93KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLl9tYXBGaWxlU3lzdGVtVG9OZXR3b3JrLm1hcEZpbGVTeXN0ZW1U b05ldHdvcmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu X21hcEZpbGVTeXN0ZW1Ub05ldHdvcmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUuX3JlbW92ZU5ldHdvcmtNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9tYXBOZXR3b3JrVG9GaWxlU3lzdGVtLm1hcE5l dHdvcmtUb0ZpbGVTeXN0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuX21hcE5ldHdvcmtUb0ZpbGVTeXN0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl9hcHBlbmRVSVNvdXJjZUNvZGVNYXBwaW5nSXRlbXMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2FwcGVuZFVJU291cmNlQ29k ZUl0ZW1zKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtzcGFjZVNldHRpbmdzVGFiKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VTZXR0aW5nc1RhYi5wcm90b3R5cGUud2FzU2hvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtzcGFjZVNldHRpbmdzVGFiLnByb3RvdHlwZS5fcmVz ZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVmlld3BvcnRDb250cm9sLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlZpZXdwb3J0Q29udHJvbC5wcm90b3R5cGUucmVmcmVzaCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuV29ya3NwYWNlLnByb3RvdHlwZS5hZGRNYXBwaW5nKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Xb3Jrc3BhY2UucHJvdG90eXBlLnJlbW92ZU1hcHBpbmcpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5z dWdnZXN0UmVsb2FkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZWxvYWQpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LnN1Z2dlc3RSZWxvYWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnJlbG9hZCk6CisKKzIwMTMt MDMtMDYgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAg VW5yZXZpZXdlZCBmb2xsb3cgdXAgdG8gcjE0NDkyODogZnJvbnQtZW5kIGNsb3N1cmUgY29tcGls YXRpb24gZml4ZXMuCiAKICAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRl bVNlbGVjdGlvbkRpYWxvZy5qczoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBiMGYyYTIxNjI5NGYxZWUyZjBjZjM1NWNkYjhjOTI3 NjgzM2Q1ZWNlLi43YmVjMjJkMWUxZGU5N2QzYjBkNDZlN2NjMGVmMjNiZjhlNmM1NDRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK KysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC04NzQsMyArODc0LDQgQEAgbG9jYWxpemVkU3RyaW5nc1siRGVzdHJveSBXZWJTb2NrZXQiXSA9 ICJEZXN0cm95IFdlYlNvY2tldCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTcGxpdCBwYW5lbHMgdmVy dGljYWxseSB3aGVuIGRvY2tlZCB0byByaWdodCJdID0gIlNwbGl0IHBhbmVscyB2ZXJ0aWNhbGx5 IHdoZW4gZG9ja2VkIHRvIHJpZ2h0IjsKIGxvY2FsaXplZFN0cmluZ3NbIihubyBkb21haW4pIl0g PSAiKG5vIGRvbWFpbikiOwogbG9jYWxpemVkU3RyaW5nc1siVGhpcyBmaWxlIHdhcyBjaGFuZ2Vk IGV4dGVybmFsbHkuIFdvdWxkIHlvdSBsaWtlIHRvIHJlbG9hZCBpdD8iXSA9ICJUaGlzIGZpbGUg d2FzIGNoYW5nZWQgZXh0ZXJuYWxseS4gV291bGQgeW91IGxpa2UgdG8gcmVsb2FkIGl0PyI7Cits b2NhbGl6ZWRTdHJpbmdzWyJJdCBpcyByZWNvbW1lbmRlZCB0byByZXN0YXJ0IGluc3BlY3RvciBh ZnRlciBtYWtpbmcgdGhlc2UgY2hhbmdlcy4gV291bGQgeW91IGxpa2UgdG8gcmVzdGFydCBpdD8i XSA9ICJJdCBpcyByZWNvbW1lbmRlZCB0byByZXN0YXJ0IGluc3BlY3RvciBhZnRlciBtYWtpbmcg dGhlc2UgY2hhbmdlcy4gV291bGQgeW91IGxpa2UgdG8gcmVzdGFydCBpdD8iOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTWFwcGluZy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1hcHBpbmcu anMKaW5kZXggZTlmOTZmOTU1MjEwNTVkNWUwY2IxMzJlNWFjMzE1ZjA4OWIxZmZjYi4uMGNjYzI0 NDYxZDQ1ZWYwODEwYWNmMmE4OWYyMTU3ZTAyMzI4YmUwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTWFwcGluZy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1NYXBwaW5nLmpzCkBAIC0x MDUsNiArMTA1LDE1IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTWFwcGluZ0ltcGwucHJvdG90 eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gZmlsZVN5 c3RlbUlkCisgICAgICogQHJldHVybiB7P3N0cmluZ30KKyAgICAgKi8KKyAgICBmaWxlU3lzdGVt UGF0aDogZnVuY3Rpb24oZmlsZVN5c3RlbUlkKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu X2ZpbGVTeXN0ZW1QYXRoc1tmaWxlU3lzdGVtSWRdOworICAgIH0sCisKKyAgICAvKioKICAgICAg KiBAcGFyYW0ge3N0cmluZ30gZmlsZVN5c3RlbVBhdGgKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd9 CiAgICAgICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMKaW5kZXggOGEzOTUwZWJiMmE5 NmM4Y2U3Y2Q0ZmVmMjE0MDg4N2MxOTMwMjRiZi4uYzE1ZmNkM2EyZjdlMzdiY2YzOTRhMGQ4NGIz MjI4ZjUxOGUxZDQ2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcwpAQCAtMjY2LDYg KzI2NiwxNSBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVdvcmtzcGFjZVByb3ZpZGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdmFyIGZpbGVTeXN0ZW0gPSAvKiogQHR5cGUge1dlYkluc3BlY3Rv ci5Jc29sYXRlZEZpbGVTeXN0ZW19ICovIChldmVudC5kYXRhKTsKICAgICAgICAgaWYgKGZpbGVT eXN0ZW0uaWQoKSkKICAgICAgICAgICAgIHRoaXMuX3dvcmtzcGFjZS5yZW1vdmVQcm9qZWN0KGZp bGVTeXN0ZW0uaWQoKSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICovCisgICAgZmlsZVN5c3Rl bVBhdGg6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHZhciBmaWxlU3lz dGVtSWQgPSB1aVNvdXJjZUNvZGUucHJvamVjdCgpLmlkKCk7CisgICAgICAgIHJldHVybiB0aGlz Ll9pc29sYXRlZEZpbGVTeXN0ZW1NYW5hZ2VyLm1hcHBpbmcoKS5maWxlU3lzdGVtUGF0aChmaWxl U3lzdGVtSWQpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcwpp bmRleCBkNzJiYWM3NTRlZmY0Yjg1MjA5MmVmZTljNGZjMzY4YWY2YzYyY2IzLi45NGRmY2FjZjMz OTg3OGNhZmJmNjJlOWE2MGQ3MmZiMjI1NWQ0Nzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlv bkRpYWxvZy5qcwpAQCAtMTEyLDYgKzExMiw4IEBAIFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1T ZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlID0gewogCiAgICAgb25FbnRlcjogZnVuY3Rpb24oKQog ICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9kZWxlZ2F0ZS5pdGVtc0NvdW50KCkpCisgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNlbGVjdEl0ZW0odGhpcy5fZmls dGVyZWRJdGVtc1t0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZF0sIHRoaXMuX3Byb21wdEVs ZW1lbnQudmFsdWUudHJpbSgpKTsKICAgICB9LAogCkBAIC0yMTcsNiArMjE5LDE1IEBAIFdlYklu c3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlID0gewogICAgICAg ICByZXR1cm4gbmV3IFJlZ0V4cChyZWdleFN0cmluZywgY2FtZWxDYXNlID8gIiIgOiAiaSIpOwog ICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gcXVlcnkKKyAgICAgKi8K KyAgICBzZXRRdWVyeTogZnVuY3Rpb24ocXVlcnkpCisgICAgeworICAgICAgICB0aGlzLl9wcm9t cHRFbGVtZW50LnZhbHVlID0gcXVlcnk7CisgICAgICAgIHRoaXMuX3NjaGVkdWxlRmlsdGVyKCk7 CisgICAgfSwKKwogICAgIF9maWx0ZXJJdGVtczogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAg ZGVsZXRlIHRoaXMuX2ZpbHRlclRpbWVyOwpAQCAtNTc4LDIyICs1ODksNDMgQEAgV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKIC8qKgogICogQGNvbnN0 cnVjdG9yCiAgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlNlbGVjdGlvbkRpYWxvZ0NvbnRl bnRQcm92aWRlcn0KLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0gcGFuZWwK ICAqLwotV2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZyA9IGZ1bmN0aW9uKHBhbmVsKQor V2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZURpYWxvZyA9IGZ1bmN0aW9uKCkKIHsKLSAg ICBXZWJJbnNwZWN0b3IuU2VsZWN0aW9uRGlhbG9nQ29udGVudFByb3ZpZGVyLmNhbGwodGhpcyk7 Ci0gICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsKLQotICAgIHZhciBwcm9qZWN0cyA9IFdlYkluc3Bl Y3Rvci53b3Jrc3BhY2UucHJvamVjdHMoKTsKKyAgICB2YXIgcHJvamVjdHMgPSBXZWJJbnNwZWN0 b3Iud29ya3NwYWNlLnByb2plY3RzKCkuZmlsdGVyKHRoaXMuZmlsdGVyUHJvamVjdC5iaW5kKHRo aXMpKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGVzID0gW107CiAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCBwcm9qZWN0cy5sZW5ndGg7ICsraSkKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlcyA9 IHRoaXMuX3VpU291cmNlQ29kZXMuY29uY2F0KHByb2plY3RzW2ldLnVpU291cmNlQ29kZXMoKS5m aWx0ZXIodGhpcy5fZmlsdGVyVUlTb3VyY2VDb2RlLmJpbmQodGhpcykpKTsKLQorICAgICAgICB0 aGlzLl91aVNvdXJjZUNvZGVzID0gdGhpcy5fdWlTb3VyY2VDb2Rlcy5jb25jYXQocHJvamVjdHNb aV0udWlTb3VyY2VDb2RlcygpLmZpbHRlcih0aGlzLmZpbHRlclVJU291cmNlQ29kZS5iaW5kKHRo aXMpKSk7CiAgICAgV2ViSW5zcGVjdG9yLndvcmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHRo aXMuX3VpU291cmNlQ29kZUFkZGVkLCB0aGlzKTsKIH0KIAotV2ViSW5zcGVjdG9yLk9wZW5SZXNv dXJjZURpYWxvZy5wcm90b3R5cGUgPSB7CitXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2Rl RGlhbG9nLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5l TnVtYmVyCisgICAgICovCisgICAgdWlTb3VyY2VDb2RlU2VsZWN0ZWQ6IGZ1bmN0aW9uKHVpU291 cmNlQ29kZSwgbGluZU51bWJlcikKKyAgICB7CisgICAgICAgIC8vIE92ZXJyaWRkZW4gYnkgc3Vi Y2xhc3NlcworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Q cm9qZWN0fSBwcm9qZWN0CisgICAgICovCisgICAgZmlsdGVyUHJvamVjdDogZnVuY3Rpb24ocHJv amVjdCkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAvLyBPdmVycmlkZGVu IGJ5IHN1YmNsYXNzZXMKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKi8KKyAgICBmaWx0ZXJVSVNv dXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB1 aVNvdXJjZUNvZGUubmFtZSgpOworICAgIH0sCisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge251 bWJlcn0gaXRlbUluZGV4CiAgICAgICogQHJldHVybiB7c3RyaW5nfQpAQCAtNjYwLDcgKzY5Miw3 IEBAIFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlID0gewogICAgIHsK ICAgICAgICAgdmFyIGxpbmVOdW1iZXJNYXRjaCA9IHByb21wdFZhbHVlLm1hdGNoKC9bXjpdK1w6 KFtcZF0qKSQvKTsKICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBsaW5lTnVtYmVyTWF0Y2ggPyBN YXRoLm1heChwYXJzZUludChsaW5lTnVtYmVyTWF0Y2hbMV0sIDEwKSAtIDEsIDApIDogMDsKLSAg ICAgICAgdGhpcy5fcGFuZWwuc2hvd1VJU291cmNlQ29kZSh0aGlzLl91aVNvdXJjZUNvZGVzW2l0 ZW1JbmRleF0sIGxpbmVOdW1iZXIpOworICAgICAgICB0aGlzLnVpU291cmNlQ29kZVNlbGVjdGVk KHRoaXMuX3VpU291cmNlQ29kZXNbaXRlbUluZGV4XSwgbGluZU51bWJlcik7CiAgICAgfSwKIAog ICAgIC8qKgpAQCAtNjc4LDIwICs3MTAsMTIgQEAgV2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURp YWxvZy5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCi0gICAgICovCi0gICAgX2ZpbHRl clVJU291cmNlQ29kZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQotICAgIHsKLSAgICAgICAgcmV0 dXJuICF1aVNvdXJjZUNvZGUucHJvamVjdCgpLmlzU2VydmljZVByb2plY3QoKSAmJiB1aVNvdXJj ZUNvZGUubmFtZSgpOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5FdmVudH0gZXZlbnQKICAgICAgKi8KICAgICBfdWlTb3VyY2VDb2RlQWRkZWQ6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7 V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gKi8gKGV2ZW50LmRhdGEpOwotICAgICAgICBpZiAo IXRoaXMuX2ZpbHRlclVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpKQorICAgICAgICBpZiAoIXRo aXMuZmlsdGVyVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSkpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMucHVzaCh1aVNvdXJjZUNvZGUpCiAgICAgICAg IHRoaXMuX2l0ZW1zTG9hZGVkKDEsIDEpOwpAQCAtNzA0LDYgKzcyOCwzOSBAQCBXZWJJbnNwZWN0 b3IuT3BlblJlc291cmNlRGlhbG9nLnByb3RvdHlwZSA9IHsKIH0KIAogLyoqCisgKiBAY29uc3Ry dWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRGlhbG9n fQorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsfSBwYW5lbAorICovCitXZWJJ bnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9nID0gZnVuY3Rpb24ocGFuZWwpCit7CisgICAgV2Vi SW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZURpYWxvZy5jYWxsKHRoaXMpOworICAgIHRoaXMu X3BhbmVsID0gcGFuZWw7Cit9CisKK1dlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cucHJv dG90eXBlID0geworCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gbGluZU51bWJlcgor ICAgICAqLworICAgIHVpU291cmNlQ29kZVNlbGVjdGVkOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUs IGxpbmVOdW1iZXIpCisgICAgeworICAgICAgICB0aGlzLl9wYW5lbC5zaG93VUlTb3VyY2VDb2Rl KHVpU291cmNlQ29kZSwgbGluZU51bWJlcik7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlByb2plY3R9IHByb2plY3QKKyAgICAgKi8KKyAgICBmaWx0ZXJQ cm9qZWN0OiBmdW5jdGlvbihwcm9qZWN0KQorICAgIHsKKyAgICAgICAgcmV0dXJuICFwcm9qZWN0 LmlzU2VydmljZVByb2plY3QoKTsKKyAgICB9LAorCisgICAgX19wcm90b19fOiBXZWJJbnNwZWN0 b3IuU2VsZWN0VUlTb3VyY2VDb2RlRGlhbG9nLnByb3RvdHlwZQorfQorCisvKioKICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0gcGFuZWwKICAqIEBwYXJhbSB7RWxlbWVudH0g cmVsYXRpdmVUb0VsZW1lbnQKICAqLwpAQCAtNzE2LDMgKzc3Myw1MyBAQCBXZWJJbnNwZWN0b3Iu T3BlblJlc291cmNlRGlhbG9nLnNob3cgPSBmdW5jdGlvbihwYW5lbCwgcmVsYXRpdmVUb0VsZW1l bnQpCiAgICAgZmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnJlbmRlckFzVHdvUm93cygpOwog ICAgIFdlYkluc3BlY3Rvci5EaWFsb2cuc2hvdyhyZWxhdGl2ZVRvRWxlbWVudCwgZmlsdGVyZWRJ dGVtU2VsZWN0aW9uRGlhbG9nKTsKIH0KKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRl bmRzIHtXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRGlhbG9nfQorICogQHBhcmFtIHtz dHJpbmd9IHR5cGUKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZSl9IGNhbGxiYWNrCisgKi8KK1dlYkluc3BlY3Rvci5TZWxlY3RVSVNvdXJjZUNvZGVGb3JQcm9q ZWN0VHlwZURpYWxvZyA9IGZ1bmN0aW9uKHR5cGUsIGNhbGxiYWNrKQoreworICAgIHRoaXMuX3R5 cGUgPSB0eXBlOworICAgIFdlYkluc3BlY3Rvci5TZWxlY3RVSVNvdXJjZUNvZGVEaWFsb2cuY2Fs bCh0aGlzKTsKKyAgICB0aGlzLl9jYWxsYmFjayA9IGNhbGxiYWNrOworfQorCitXZWJJbnNwZWN0 b3IuU2VsZWN0VUlTb3VyY2VDb2RlRm9yUHJvamVjdFR5cGVEaWFsb2cucHJvdG90eXBlID0gewor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3Vy Y2VDb2RlCisgICAgICogQHBhcmFtIHtudW1iZXJ9IGxpbmVOdW1iZXIKKyAgICAgKi8KKyAgICB1 aVNvdXJjZUNvZGVTZWxlY3RlZDogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKQor ICAgIHsKKyAgICAgICAgdGhpcy5fY2FsbGJhY2sodWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisg ICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUHJvamVjdH0gcHJvamVjdAorICAg ICAqLworICAgIGZpbHRlclByb2plY3Q6IGZ1bmN0aW9uKHByb2plY3QpCisgICAgeworICAgICAg ICByZXR1cm4gcHJvamVjdC50eXBlKCkgPT09IHRoaXMuX3R5cGU7CisgICAgfSwKKworICAgIF9f cHJvdG9fXzogV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZURpYWxvZy5wcm90b3R5cGUK K30KKworLyoqCisgKiBAcGFyYW0ge3N0cmluZ30gdHlwZQorICogQHBhcmFtIHtmdW5jdGlvbihX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKX0gY2FsbGJhY2sKKyAqIEBwYXJhbSB7RWxlbWVudH0g cmVsYXRpdmVUb0VsZW1lbnQKKyAqLworV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZUZv clByb2plY3RUeXBlRGlhbG9nLnNob3cgPSBmdW5jdGlvbihuYW1lLCB0eXBlLCBjYWxsYmFjaywg cmVsYXRpdmVUb0VsZW1lbnQpCit7CisgICAgaWYgKFdlYkluc3BlY3Rvci5EaWFsb2cuY3VycmVu dEluc3RhbmNlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIHZhciBmaWx0ZXJlZEl0ZW1TZWxl Y3Rpb25EaWFsb2cgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxv ZyhuZXcgV2ViSW5zcGVjdG9yLlNlbGVjdFVJU291cmNlQ29kZUZvclByb2plY3RUeXBlRGlhbG9n KHR5cGUsIGNhbGxiYWNrKSk7CisgICAgZmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnNldFF1 ZXJ5KG5hbWUpOworICAgIGZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5yZW5kZXJBc1R3b1Jv d3MoKTsKKyAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLnNob3cocmVsYXRpdmVUb0VsZW1lbnQsIGZp bHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZyk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGFkNGU2ZjYzMGE4YzZiMTc1 ODZiMDRlNzg3NzZmN2QwNTM3M2M1ZTUuLjIyMzMxMGRiNmYxOTFjN2Q1Mjg0MzI1ZDAxOGJlNDQy MmY0YTYwNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCkBAIC0xMTA3LDYgKzExMDcsNzcgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKiAKKyAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAgIF9t YXBGaWxlU3lzdGVtVG9OZXR3b3JrOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgeworICAg ICAgICBXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRm9yUHJvamVjdFR5cGVEaWFsb2cu c2hvdyh1aVNvdXJjZUNvZGUubmFtZSgpLCBXZWJJbnNwZWN0b3IucHJvamVjdFR5cGVzLk5ldHdv cmssIG1hcEZpbGVTeXN0ZW1Ub05ldHdvcmsuYmluZCh0aGlzKSwgdGhpcy5lZGl0b3JWaWV3Lm1h aW5FbGVtZW50KSAgICAgICAgICAgICAgICAKKworICAgICAgICAvKiogCisgICAgICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gbmV0d29ya1VJU291cmNlQ29kZQorICAg ICAgICAgKi8KKyAgICAgICAgZnVuY3Rpb24gbWFwRmlsZVN5c3RlbVRvTmV0d29yayhuZXR3b3Jr VUlTb3VyY2VDb2RlKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl93b3Jrc3BhY2UuYWRk TWFwcGluZyhuZXR3b3JrVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB9Cisg ICAgfSwKKworICAgIC8qKiAKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAgIF9yZW1vdmVOZXR3b3JrTWFwcGluZzogZnVu Y3Rpb24odWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgaWYgKGNvbmZpcm0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gcmVtb3ZlIG5ldHdvcmsgbWFw cGluZz8iKSkpCisgICAgICAgICAgICB0aGlzLl93b3Jrc3BhY2UucmVtb3ZlTWFwcGluZyh1aVNv dXJjZUNvZGUpOworICAgIH0sCisKKyAgICAvKiogCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlfSBuZXR3b3JrVUlTb3VyY2VDb2RlCisgICAgICovCisgICAgX21hcE5l dHdvcmtUb0ZpbGVTeXN0ZW06IGZ1bmN0aW9uKG5ldHdvcmtVSVNvdXJjZUNvZGUpCisgICAgewor ICAgICAgICBXZWJJbnNwZWN0b3IuU2VsZWN0VUlTb3VyY2VDb2RlRm9yUHJvamVjdFR5cGVEaWFs b2cuc2hvdyhuZXR3b3JrVUlTb3VyY2VDb2RlLm5hbWUoKSwgV2ViSW5zcGVjdG9yLnByb2plY3RU eXBlcy5GaWxlU3lzdGVtLCBtYXBOZXR3b3JrVG9GaWxlU3lzdGVtLmJpbmQodGhpcyksIHRoaXMu ZWRpdG9yVmlldy5tYWluRWxlbWVudCkgICAgICAgICAgICAgICAgCisKKyAgICAgICAgLyoqIAor ICAgICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29k ZQorICAgICAgICAgKi8KKyAgICAgICAgZnVuY3Rpb24gbWFwTmV0d29ya1RvRmlsZVN5c3RlbSh1 aVNvdXJjZUNvZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRN YXBwaW5nKG5ldHdvcmtVSVNvdXJjZUNvZGUsIHVpU291cmNlQ29kZSk7CisgICAgICAgIH0KKyAg ICB9LAorCisgICAgLyoqIAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51 fSBjb250ZXh0TWVudQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0g dWlTb3VyY2VDb2RlCisgICAgICovCisgICAgX2FwcGVuZFVJU291cmNlQ29kZU1hcHBpbmdJdGVt czogZnVuY3Rpb24oY29udGV4dE1lbnUsIHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIGlm ICh1aVNvdXJjZUNvZGUucHJvamVjdCgpLnR5cGUoKSA9PT0gV2ViSW5zcGVjdG9yLnByb2plY3RU eXBlcy5GaWxlU3lzdGVtKSB7CisgICAgICAgICAgICB2YXIgaGFzTWFwcGluZ3MgPSAhIXVpU291 cmNlQ29kZS51cmw7CisgICAgICAgICAgICBpZiAoIWhhc01hcHBpbmdzKQorICAgICAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNYXAgdG8g bmV0d29yayByZXNvdXJjZS4uLiIpLCB0aGlzLl9tYXBGaWxlU3lzdGVtVG9OZXR3b3JrLmJpbmQo dGhpcywgdWlTb3VyY2VDb2RlKSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92ZSBuZXR3 b3JrIG1hcHBpbmciKSwgdGhpcy5fcmVtb3ZlTmV0d29ya01hcHBpbmcuYmluZCh0aGlzLCB1aVNv dXJjZUNvZGUpKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUucHJvamVj dCgpLnR5cGUoKSA9PT0gV2ViSW5zcGVjdG9yLnByb2plY3RUeXBlcy5OZXR3b3JrKSB7CisgICAg ICAgICAgICAvKiogCisgICAgICAgICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qcm9qZWN0 fSBwcm9qZWN0CisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgIGZ1bmN0aW9uIGZpbHRlclBy b2plY3QocHJvamVjdCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJv amVjdC50eXBlKCkgPT09IFdlYkluc3BlY3Rvci5wcm9qZWN0VHlwZXMuRmlsZVN5c3RlbTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCF0aGlzLl93b3Jrc3BhY2UucHJvamVjdHMo KS5maWx0ZXIoZmlsdGVyUHJvamVjdCkubGVuZ3RoKQorICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIGlmICh0aGlzLl93b3Jrc3BhY2UudWlTb3VyY2VDb2RlRm9yVVJMKHVpU291 cmNlQ29kZS51cmwpID09PSB1aVNvdXJjZUNvZGUpCisgICAgICAgICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1hcCB0byBmaWxlIHN5c3RlbSBy ZXNvdXJjZS4uLiIpLCB0aGlzLl9tYXBOZXR3b3JrVG9GaWxlU3lzdGVtLmJpbmQodGhpcywgdWlT b3VyY2VDb2RlKSk7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgLyoqIAogICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51fSBjb250ZXh0TWVudQogICAgICAqIEBwYXJhbSB7 T2JqZWN0fSB0YXJnZXQKICAgICAgKi8KQEAgLTExMTcsNiArMTE4OCwxMCBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgdWlTb3VyY2VDb2Rl ID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyAodGFyZ2V0KTsKICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2Fs IG1vZGlmaWNhdGlvbnMuLi4iKSwgdGhpcy5fc2hvd0xvY2FsSGlzdG9yeS5iaW5kKHRoaXMsIHVp U291cmNlQ29kZSkpOworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNvbGF0ZWRGaWxlU3lz dGVtTWFuYWdlci5zdXBwb3J0c0ZpbGVTeXN0ZW1zKCkgJiYgV2ViSW5zcGVjdG9yLmV4cGVyaW1l bnRzU2V0dGluZ3MuZmlsZVN5c3RlbVByb2plY3QuaXNFbmFibGVkKCkpCisgICAgICAgICAgICB0 aGlzLl9hcHBlbmRVSVNvdXJjZUNvZGVNYXBwaW5nSXRlbXMoY29udGV4dE1lbnUsIHVpU291cmNl Q29kZSk7CisKICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9y VVJMKHVpU291cmNlQ29kZS51cmwpOwogICAgICAgICBpZiAocmVzb3VyY2UgJiYgcmVzb3VyY2Uu cmVxdWVzdCkKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyhy ZXNvdXJjZS5yZXF1ZXN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IDVjZTVmMGE1YjQ0OTk1MmY4ZTYwYTRmMDRi NzNmNDEzNzkxZjYwNDguLmRhNjMwYWE3MWE3OGI3Mjc1OWRhNWUwZTViMzE0NTM4OWQ0ZmYzOGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NT Y3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5n c1NjcmVlbi5qcwpAQCAtNDYwLDExICs0NjAsMjMgQEAgV2ViSW5zcGVjdG9yLk92ZXJyaWRlc1Nl dHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKIFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VTZXR0aW5nc1Rh YiA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWIuY2FsbCh0aGlz LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtzcGFjZSIpLCAid29ya3NwYWNlLXRhYi1jb250 ZW50Iik7Ci0gICAgdGhpcy5fY3JlYXRlRmlsZVN5c3RlbXNFZGl0b3IoKTsKLSAgICB0aGlzLl9j cmVhdGVGaWxlTWFwcGluZ0VkaXRvcigpOworICAgIHRoaXMuX3Jlc2V0KCk7CiB9CiAKIFdlYklu c3BlY3Rvci5Xb3Jrc3BhY2VTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CisgICAgd2FzU2hvd246 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5TZXR0aW5nc1RhYi5wcm90 b3R5cGUud2FzU2hvd24uY2FsbCh0aGlzKTsKKyAgICAgICAgdGhpcy5fcmVzZXQoKTsKKyAgICB9 LAorCisgICAgX3Jlc2V0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLmNvbnRhaW5l ckVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fY3JlYXRlRmlsZVN5c3Rl bXNFZGl0b3IoKTsKKyAgICAgICAgdGhpcy5fY3JlYXRlRmlsZU1hcHBpbmdFZGl0b3IoKTsKKyAg ICB9LAorCiAgICAgX2NyZWF0ZUZpbGVTeXN0ZW1zRWRpdG9yOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB2YXIgcCA9IHRoaXMuX2FwcGVuZFNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJGaWxlIHN5c3RlbXMiKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1ZpZXdwb3J0Q29udHJvbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVmlld3BvcnRDb250cm9sLmpzCmluZGV4IDY0MTFlNTI5YzcwMWJmMDIyYzJjOTMy ZWE5OTkyNmJmZjlkNWZkNDguLmEyYjJmZmM0Yzc4OTVjNDQwMzA0ODU0ODVkYjBlOTA3OGZkNGJl Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlld3Bv cnRDb250cm9sLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmll d3BvcnRDb250cm9sLmpzCkBAIC04Miw2ICs4Miw4IEBAIFdlYkluc3BlY3Rvci5WaWV3cG9ydENv bnRyb2wucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOyAgLy8gRG8gbm90aGluZyBm b3IgaW52aXNpYmxlIGNvbnRyb2xzLgogCiAgICAgICAgIHZhciBpdGVtQ291bnQgPSB0aGlzLl9w cm92aWRlci5pdGVtQ291bnQoKTsKKyAgICAgICAgaWYgKCFpdGVtQ291bnQpCisgICAgICAgICAg ICByZXR1cm47CiAKICAgICAgICAgaWYgKCF0aGlzLl9yb3dIZWlnaHQpIHsKICAgICAgICAgICAg IHZhciBmaXJzdEVsZW1lbnQgPSB0aGlzLl9wcm92aWRlci5pdGVtRWxlbWVudCgwKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKaW5kZXggNjMz ZDA5NTc3YWNhYWVkODNiOWRhYjY3NjExMjMyOGI5NDNmNmNhNi4uMjhhOGE1ODJmYjM2MmM5ZTM3 ZTU5NjgxYWI3MjAzNWYwMWE0NGY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKQEAgLTQ3OCw2ICs0NzgsNDUgQEAgV2ViSW5zcGVjdG9y LldvcmtzcGFjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBlbnRyeS51cmxQcmVmaXgg KyBwYXRoLnN1YnN0cmluZyhlbnRyeS5wYXRoUHJlZml4Lmxlbmd0aCk7CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gbmV0d29ya1VJ U291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlT b3VyY2VDb2RlCisgICAgICovCisgICAgYWRkTWFwcGluZzogZnVuY3Rpb24obmV0d29ya1VJU291 cmNlQ29kZSwgdWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgdmFyIHVybCA9IG5ldHdvcmtV SVNvdXJjZUNvZGUudXJsOworICAgICAgICB2YXIgcGF0aCA9IHVpU291cmNlQ29kZS5wYXRoKCk7 CisgICAgICAgIHZhciBzdWZmaXggPSAiIjsKKyAgICAgICAgZm9yICh2YXIgaSA9IHBhdGgubGVu Z3RoIC0gMTsgaSA+PSAwOyAtLWkpIHsKKyAgICAgICAgICAgIHZhciBuZXh0U3VmZml4ID0gIi8i ICsgcGF0aFtpXSArIHN1ZmZpeDsKKyAgICAgICAgICAgIGlmICghdXJsLmVuZHNXaXRoKG5leHRT dWZmaXgpKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgc3VmZml4ID0gbmV4 dFN1ZmZpeDsKKyAgICAgICAgfQorICAgICAgICB2YXIgZmlsZVN5c3RlbVBhdGggPSBXZWJJbnNw ZWN0b3IuZmlsZVN5c3RlbVdvcmtzcGFjZVByb3ZpZGVyLmZpbGVTeXN0ZW1QYXRoKHVpU291cmNl Q29kZSk7CisgICAgICAgIHZhciBmaWxlUGF0aCA9ICIvIiArIHBhdGguam9pbigiLyIpOworICAg ICAgICB2YXIgcGF0aFByZWZpeCA9IGZpbGVTeXN0ZW1QYXRoICsgZmlsZVBhdGguc3Vic3RyKDAs IGZpbGVQYXRoLmxlbmd0aCAtIHN1ZmZpeC5sZW5ndGgpICsgIi8iOworICAgICAgICB2YXIgdXJs UHJlZml4ID0gdXJsLnN1YnN0cigwLCB1cmwubGVuZ3RoIC0gc3VmZml4Lmxlbmd0aCkgKyAiLyI7 CisKKyAgICAgICAgdmFyIGVudHJpZXMgPSB0aGlzLl9maWxlTWFwcGluZy5tYXBwaW5nRW50cmll cygpOworICAgICAgICB2YXIgZW50cnkgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVNYXBwaW5nLkVu dHJ5KHVybFByZWZpeCwgcGF0aFByZWZpeCk7CisgICAgICAgIGVudHJpZXMucHVzaChlbnRyeSk7 CisgICAgICAgIHRoaXMuX2ZpbGVNYXBwaW5nLnNldE1hcHBpbmdFbnRyaWVzKGVudHJpZXMpOwor ICAgICAgICBXZWJJbnNwZWN0b3Iuc3VnZ2VzdFJlbG9hZCgpOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQor ICAgICAqLworICAgIHJlbW92ZU1hcHBpbmc6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7 CisgICAgICAgIHZhciBlbnRyeSA9IHRoaXMuX2ZpbGVNYXBwaW5nLm1hcHBpbmdFbnRyeUZvclVS TCh1aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgdmFyIGVudHJpZXMgPSB0aGlzLl9maWxlTWFw cGluZy5tYXBwaW5nRW50cmllcygpOworICAgICAgICBlbnRyaWVzLnJlbW92ZShlbnRyeSk7Cisg ICAgICAgIHRoaXMuX2ZpbGVNYXBwaW5nLnNldE1hcHBpbmdFbnRyaWVzKGVudHJpZXMpOworICAg ICAgICBXZWJJbnNwZWN0b3Iuc3VnZ2VzdFJlbG9hZCgpOworICAgIH0sCisKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcwppbmRleCAwNWIwMjQyNzc1OTgwYTA5MWIw ODdjODFlN2RmZmZmOWNmNTIwZmUzLi5jMTAwZDI0NzkwZmU2ODY2YWQ5NDY4NDI4MzYxODk4ODgy MTExYzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4 dGVybnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5z LmpzCkBAIC0zMzIsNSArMzMyLDggQEAgV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUZXh0RWRpdG9y ID0gZnVuY3Rpb24odXJsLCBkZWxlZ2F0ZSkgeyB9CiAvKiogQGNvbnN0cnVjdG9yICovCiBXZWJJ bnNwZWN0b3IuQWNlVGV4dEVkaXRvciA9IGZ1bmN0aW9uKHVybCwgZGVsZWdhdGUpIHsgfQogCitX ZWJJbnNwZWN0b3Iuc3VnZ2VzdFJlbG9hZCA9IGZ1bmN0aW9uKCkgeyB9CitXZWJJbnNwZWN0b3Iu cmVsb2FkID0gZnVuY3Rpb24oKSB7IH0KKwogLyoqIEB0eXBlIHtib29sZWFufSAqLwogd2luZG93 LmRpc3BhdGNoU3RhbmRhbG9uZVRlc3RSdW5uZXJNZXNzYWdlczsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZTJjMGNjYTJkZTYwMDA0 YWYwYTA0ZGYzMWUzODUwMGVjOTdjNzhmNS4uM2Y3YzBkOWMyYzRjODRmYzlhODlkYTAwOTczOGRl MDc4Y2EwMGExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKQEAgLTMxNSw2ICszMTUsMjggQEAgV2ViSW5zcGVjdG9yLkV2ZW50cyA9IHsK ICAgICB9CiB9KSgpO30KIAorV2ViSW5zcGVjdG9yLnN1Z2dlc3RSZWxvYWQgPSBmdW5jdGlvbigp Cit7CisgICAgaWYgKHdpbmRvdy5jb25maXJtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiSXQgaXMg cmVjb21tZW5kZWQgdG8gcmVzdGFydCBpbnNwZWN0b3IgYWZ0ZXIgbWFraW5nIHRoZXNlIGNoYW5n ZXMuIFdvdWxkIHlvdSBsaWtlIHRvIHJlc3RhcnQgaXQ/IikpKQorICAgICAgICB0aGlzLnJlbG9h ZCgpOworfQorCitXZWJJbnNwZWN0b3IucmVsb2FkID0gZnVuY3Rpb24oKQoreworICAgIHZhciBx dWVyeVBhcmFtcyA9IHdpbmRvdy5sb2NhdGlvbi5zZWFyY2g7CisgICAgdmFyIHVybCA9IHdpbmRv dy5sb2NhdGlvbi5ocmVmOworICAgIHVybCA9IHVybC5zdWJzdHJpbmcoMCwgdXJsLmxlbmd0aCAt IHF1ZXJ5UGFyYW1zLmxlbmd0aCk7CisgICAgdmFyIHF1ZXJ5UGFyYW1zT2JqZWN0ID0ge307Cisg ICAgZm9yICh2YXIgbmFtZSBpbiBXZWJJbnNwZWN0b3IucXVlcnlQYXJhbXNPYmplY3QpCisgICAg ICAgIHF1ZXJ5UGFyYW1zT2JqZWN0W25hbWVdID0gV2ViSW5zcGVjdG9yLnF1ZXJ5UGFyYW1zT2Jq ZWN0W25hbWVdOworICAgIGlmICh0aGlzLmRvY2tDb250cm9sbGVyKQorICAgICAgICBxdWVyeVBh cmFtc09iamVjdFsiZG9ja1NpZGUiXSA9IHRoaXMuZG9ja0NvbnRyb2xsZXIuZG9ja1NpZGUoKTsK KyAgICB2YXIgbmFtZXMgPSBPYmplY3Qua2V5cyhxdWVyeVBhcmFtc09iamVjdCk7CisgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBuYW1lcy5sZW5ndGg7ICsraSkKKyAgICAgICAgdXJsICs9IChpID8g IiYiIDogIj8iKSArIG5hbWVzW2ldICsgIj0iICsgcXVlcnlQYXJhbXNPYmplY3RbbmFtZXNbaV1d OworICAgIGRvY3VtZW50LmxvY2F0aW9uID0gdXJsOworfQorCiBXZWJJbnNwZWN0b3IubG9hZGVk ID0gZnVuY3Rpb24oKQogewogICAgIEluc3BlY3RvckJhY2tlbmQubG9hZEZyb21KU09OSWZOZWVk ZWQoIi4uL0luc3BlY3Rvci5qc29uIik7Cg==