86601 2012-05-16 02:34:59 -0700 Web Inspector: get rid of UISourceCodeListChanged event. 2012-05-16 05:21:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 625191 0 pfeldman 2012-05-16 02:34:59 -0700 There was unnecessary conversion between this event and UISourceCodeAdded/Removed/Replaced. 625264 1 142220 pfeldman 2012-05-16 04:33:52 -0700 Created attachment 142220 Patch 625292 2 142220 vsevik 2012-05-16 05:20:17 -0700 Comment on attachment 142220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142220&action=review > Source/WebCore/inspector/front-end/NavigatorView.js:-147 > - if (!added) This two lines are still needed here. > Source/WebCore/inspector/front-end/ResourceScriptMapping.js:167 > + var scriptIds = []; Please remove this unused array here and in the method above. > LayoutTests/inspector/debugger/scripts-panel-expected.txt:33 > + source.js A script in Content scripts tab looks weird. 625293 3 pfeldman 2012-05-16 05:21:45 -0700 Committed r117267: <http://trac.webkit.org/changeset/117267> 142220 2012-05-16 04:33:52 -0700 2012-05-16 05:20:17 -0700 Patch bug-86601-20120516153350.patch text/plain 31017 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU4NmJhYTI5MDcyYjcy ZDJlYTYwYzczMWY5OWI1YzY0YTg1OThlNC4uNzVhYmU0ZWNiYzZmMGQ1ODYyODRlZWNkZjY4MGU4 YmIxMTJhMTg4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDEyLTA1LTE2ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGdldCByaWQgb2YgVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQgZXZlbnQuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjYwMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdhcyB1bm5lY2Vzc2Fy eSBjb252ZXJzaW9uIGJldHdlZW4gdGhpcyBldmVudCBhbmQgVUlTb3VyY2VDb2RlQWRkZWQvUmVt b3ZlZC9SZXBsYWNlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFw cGluZy5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJTY3JpcHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2Ny aXB0TWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5faGFuZGxlVUlTb3VyY2VDb2RlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2hhbmRsZVVJU291cmNlQ29kZVJl cGxhY2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNjcmlwdE1hcHBpbmcucHJv dG90eXBlLl9oYW5kbGVVSVNvdXJjZUNvZGVSZW1vdmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5hZGRTY3JpcHQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2hhbmRsZVVJU291cmNlQ29kZUNo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90 b3R5cGUuX3VpU291cmNlQ29kZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlLl91aVNvdXJjZUNvZGVSZXBsYWNlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fdWlTb3VyY2VD b2RlUmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRN YXBwaW5nLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1v ZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5 cGUuX2FkZFNjcmlwdFNuaXBwZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBw ZXRNb2RlbC5wcm90b3R5cGUuX2NyZWF0ZVVJU291cmNlQ29kZUZvclNjcmlwdCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZS5fcmVzZXQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fZmlyZVVJ U291cmNlQ29kZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0U2NyaXB0TWFw cGluZy5wcm90b3R5cGUuX2ZpcmVVSVNvdXJjZUNvZGVSZW1vdmVkKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUucmVwbGFjZVVJU291cmNlQ29kZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fdWlTb3VyY2VDb2RlUmVwbGFjZWQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzOgor CisyMDEyLTA1LTE2ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbmFtZSBEZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsIHRv IERlYnVnZ2VyU2NyaXB0TWFwcGluZywgbWFrZSBpdCBwcml2YXRlIHRvIFNjcmlwdHNQYW5lbC4K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NTk0CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21w aWxlclNjcmlwdE1hcHBpbmcuanMKaW5kZXggMmQwMTRjNTVkMzEyNmM1NTNhNWE2OGM1M2YyZDc2 NDM1NGE0NzIwMC4uMDIxNzVkYjQ3YjNiNmM4ODFkYzFhMjQ1Y2E5YThmOTc1NDIwYzA4NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlw dE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21w aWxlclNjcmlwdE1hcHBpbmcuanMKQEAgLTEyNiw5ICsxMjYsMTAgQEAgV2ViSW5zcGVjdG9yLkNv bXBpbGVyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fc291cmNl TWFwRm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9IHNvdXJjZU1hcDsKICAgICAgICAgdGhp cy5fc2NyaXB0Rm9yU291cmNlTWFwLnB1dChzb3VyY2VNYXAsIHNjcmlwdCk7Ci0gICAgICAgIHZh ciBkYXRhID0geyByZW1vdmVkSXRlbXM6IFtdLCBhZGRlZEl0ZW1zOiB1aVNvdXJjZUNvZGVMaXN0 IH07Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5T Y3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CiAgICAg ICAgIHNjcmlwdC5zZXRTb3VyY2VNYXBwaW5nKHRoaXMpOworCisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdWlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50 cy5VSVNvdXJjZUNvZGVBZGRlZCwgdWlTb3VyY2VDb2RlTGlzdFtpXSk7CiAgICAgfSwKIAogICAg IC8qKgpAQCAtMTU5LDggKzE2MCw5IEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBp bmcucHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAg IHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IHRoaXMudWlTb3VyY2VDb2RlTGlzdCgpLCBhZGRl ZEl0ZW1zOiBbXSB9OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJ bnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIGRh dGEpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHRoaXMudWlTb3VyY2VDb2RlTGlzdCgp OworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kp CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu U2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlUmVtb3ZlZCwgdWlTb3VyY2VDb2Rlc1tp XSk7CiAKICAgICAgICAgdGhpcy5fc291cmNlTWFwQnlVUkwgPSB7fTsKICAgICAgICAgdGhpcy5f c291cmNlTWFwRm9yU2NyaXB0SWQgPSB7fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuanMKaW5kZXggNWQy MGE4ZTNiOWFlNWI1YTg3NzgyNmViMjQwMDhjZTZhMThhNGExNi4uNjhiZmU2YzhjNzBiMDkyNDJl OTkxOWJlOGNhNDc3NWE3NDBkM2RlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuanMKQEAgLTQzLDIx ICs0MywxNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5nID0gZnVuY3Rpb24o KQogICAgIHRoaXMuX21hcHBpbmdzLnB1c2godGhpcy5fY29tcGlsZXJNYXBwaW5nKTsKICAgICB0 aGlzLl9zbmlwcGV0TWFwcGluZyA9IFdlYkluc3BlY3Rvci5zY3JpcHRTbmlwcGV0TW9kZWwuc2Ny aXB0TWFwcGluZzsKICAgICB0aGlzLl9tYXBwaW5ncy5wdXNoKHRoaXMuX3NuaXBwZXRNYXBwaW5n KTsKLSAgCi0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9tYXBwaW5ncy5sZW5ndGg7ICsr aSkKLSAgICAgICAgdGhpcy5fbWFwcGluZ3NbaV0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRoaXMuX2hh bmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzKTsKKyAgICBmb3IgKHZhciBpID0gMDsg aSA8IHRoaXMuX21hcHBpbmdzLmxlbmd0aDsgKytpKSB7CisgICAgICAgIHRoaXMuX21hcHBpbmdz W2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJ U291cmNlQ29kZUFkZGVkLCB0aGlzLl9oYW5kbGVVSVNvdXJjZUNvZGVBZGRlZCwgdGhpcyk7Cisg ICAgICAgIHRoaXMuX21hcHBpbmdzW2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNj cmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzLl9oYW5kbGVVSVNv dXJjZUNvZGVSZXBsYWNlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX21hcHBpbmdzW2ldLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29k ZVJlbW92ZWQsIHRoaXMuX2hhbmRsZVVJU291cmNlQ29kZVJlbW92ZWQsIHRoaXMpOworICAgIH0K IAogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLlBhcnNlZFNjcmlwdFNvdXJjZSwgdGhpcy5fcGFy c2VkU2NyaXB0U291cmNlLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5GYWlsZWRU b1BhcnNlU2NyaXB0U291cmNlLCB0aGlzLl9wYXJzZWRTY3JpcHRTb3VyY2UsIHRoaXMpOwogICAg IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHRoaXMuX2RlYnVnZ2Vy UmVzZXQsIHRoaXMpOwogfQogCi1XZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5nLkV2 ZW50cyA9IHsKLSAgICBVSVNvdXJjZUNvZGVBZGRlZDogInNvdXJjZS1maWxlLWFkZGVkIiwKLSAg ICBVSVNvdXJjZUNvZGVSZXBsYWNlZDogInNvdXJjZS1maWxlLXJlcGxhY2VkIiwKLSAgICBVSVNv dXJjZUNvZGVSZW1vdmVkOiAic291cmNlLWZpbGUtcmVtb3ZlZCIKLX0KLQogV2ViSW5zcGVjdG9y LkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CkBAIC04NiwyMSArODIsMjUgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CiAgICAgICovCi0gICAgX2hhbmRs ZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICBfaGFuZGxlVUlT b3VyY2VDb2RlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHJlbW92 ZWRJdGVtcyA9IC8qKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAq LyBldmVudC5kYXRhWyJyZW1vdmVkSXRlbXMiXTsKLSAgICAgICAgdmFyIGFkZGVkSXRlbXMgPSAv KiogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8gZXZlbnQuZGF0 YVsiYWRkZWRJdGVtcyJdOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIGV2ZW50 LmRhdGEpOworICAgIH0sCiAKLSAgICAgICAgaWYgKCFyZW1vdmVkSXRlbXMubGVuZ3RoKSB7Ci0g ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFkZGVkSXRlbXMubGVuZ3RoOyArK2kpCi0g ICAgICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIGFkZGVkSXRl bXNbaV0pOwotICAgICAgICB9IGVsc2UgaWYgKCFhZGRlZEl0ZW1zLmxlbmd0aCkgewotICAgICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhZGRlZEl0ZW1zLmxlbmd0aDsgKytpKQotICAgICAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQsIHJlbW92ZWRJdGVt c1tpXSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgZXZlbnREYXRhID0geyB1 aVNvdXJjZUNvZGVMaXN0OiBhZGRlZEl0ZW1zLCBvbGRVSVNvdXJjZUNvZGVMaXN0OiByZW1vdmVk SXRlbXMgfTsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2Vk LCBldmVudERhdGEpOwotICAgICAgICB9CisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRsZVVJU291cmNlQ29kZVJlcGxh Y2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVS ZXBsYWNlZCwgZXZlbnQuZGF0YSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5kbGVVSVNvdXJjZUNv ZGVSZW1vdmVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJj ZUNvZGVSZW1vdmVkLCBldmVudC5kYXRhKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKaW5kZXgg YzBmMmYxYzJjMmViYmJmZTgyOTU1YjQ5ZGU0NzJmNjNlZDZjNmJkMy4uOTljOWQzNGY2ODhhZjBl NzlmMGU2ODU4ZjIxZTg2NDliYTYzZTI0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcwpAQCAtMTI2LDMyICsxMjYsMjUgQEAg V2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAv KioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gb2xk VUlTb3VyY2VDb2RlTGlzdAotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGU+fSB1aVNvdXJjZUNvZGVMaXN0CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlfSBvbGRVSVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqLwotICAgIHJlcGxhY2VVSVNvdXJj ZUNvZGVzOiBmdW5jdGlvbihvbGRVSVNvdXJjZUNvZGVMaXN0LCB1aVNvdXJjZUNvZGVMaXN0KQor ICAgIHJlcGxhY2VVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKG9sZFVJU291cmNlQ29kZSwgdWlTb3Vy Y2VDb2RlKQogICAgIHsKICAgICAgICAgdmFyIGFkZGVkID0gZmFsc2U7CiAgICAgICAgIHZhciBz ZWxlY3RlZCA9IGZhbHNlOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG9sZFVJU291cmNl Q29kZUxpc3QubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBv bGRVSVNvdXJjZUNvZGVMaXN0W2ldOwotICAgICAgICAgICAgaWYgKCF0aGlzLl9zY3JpcHRUcmVl RWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgaWYgKHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3Vy Y2VDb2RlLmdldChvbGRVSVNvdXJjZUNvZGUpKSB7CiAgICAgICAgICAgICBhZGRlZCA9IHRydWU7 CiAKLSAgICAgICAgICAgIGlmICh0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNvZGUgPT09IHVp U291cmNlQ29kZSkKKyAgICAgICAgICAgIGlmICh0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNv ZGUgPT09IG9sZFVJU291cmNlQ29kZSkKICAgICAgICAgICAgICAgICBzZWxlY3RlZCA9IHRydWU7 Ci0gICAgICAgICAgICB0aGlzLl9yZW1vdmVVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAg ICAgICAgICAgIHRoaXMuX3JlbW92ZVVJU291cmNlQ29kZShvbGRVSVNvdXJjZUNvZGUpOwogICAg ICAgICB9Ci0gICAgICAgIAotICAgICAgICBpZiAoIWFkZGVkKQotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICAgICAgCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2Rl TGlzdC5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuYWRkVUlTb3VyY2VDb2RlKHVpU291 cmNlQ29kZUxpc3RbaV0pOworCisgICAgICAgIHRoaXMuYWRkVUlTb3VyY2VDb2RlKHVpU291cmNl Q29kZSk7CiAKICAgICAgICAgaWYgKHNlbGVjdGVkKQotICAgICAgICAgICAgdGhpcy5yZXZlYWxV SVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlTGlzdFswXSk7CisgICAgICAgICAgICB0aGlzLnJldmVh bFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBw aW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlw dE1hcHBpbmcuanMKaW5kZXggZGMzMDAyNGE0OTIyYTYwMWNkNTdlN2ViNDJkYzBmZTc0MGI2N2M4 MC4uMWIyY2M5YWE4MzY3YTllNGFjZDc2NGUyZGYwNGI5MzVlZWMxZmUyNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlw dE1hcHBpbmcuanMKQEAgLTExOSw3ICsxMTksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3Jp cHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVG b3JEb2N1bWVudFVSTFtzY3JpcHQuc291cmNlVVJMXSA9IHJhd1NvdXJjZUNvZGU7CiAKICAgICAg ICAgaWYgKHJhd1NvdXJjZUNvZGUudWlTb3VyY2VDb2RlKCkpCi0gICAgICAgICAgICB0aGlzLl91 aVNvdXJjZUNvZGVDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIG51bGwsIHJhd1NvdXJjZUNvZGUudWlT b3VyY2VDb2RlKCkpOworICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlQWRkZWQocmF3U291 cmNlQ29kZSwgcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGUoKSk7CiAgICAgICAgIHJhd1NvdXJj ZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMu VUlTb3VyY2VDb2RlQ2hhbmdlZCwgdGhpcy5faGFuZGxlVUlTb3VyY2VDb2RlQ2hhbmdlZCwgdGhp cyk7CiAgICAgfSwKIApAQCAtMTMxLDMxICsxMzEsNTYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl U2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0g LyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gKi8gZXZlbnQudGFyZ2V0Owog ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSAqLyBldmVudC5kYXRhLnVpU291cmNlQ29kZTsKICAgICAgICAgdmFyIG9sZFVJU291 cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gKi8gZXZlbnQu ZGF0YS5vbGRVSVNvdXJjZUNvZGU7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUNoYW5nZWQo cmF3U291cmNlQ29kZSwgb2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpOworICAgICAgICBp ZiAoIW9sZFVJU291cmNlQ29kZSkKKyAgICAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUFkZGVk KHJhd1NvdXJjZUNvZGUsIHVpU291cmNlQ29kZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHRoaXMuX3VpU291cmNlQ29kZVJlcGxhY2VkKHJhd1NvdXJjZUNvZGUsIG9sZFVJU291cmNlQ29k ZSwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQotICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZX0gcmVtb3ZlZEl0ZW0KLSAgICAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGV9IGFkZGVkSXRlbQorICAgICAqIEBwYXJhbiB7V2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAgICovCi0gICAgX3VpU291cmNlQ29k ZUNoYW5nZWQ6IGZ1bmN0aW9uKHJhd1NvdXJjZUNvZGUsIHJlbW92ZWRJdGVtLCBhZGRlZEl0ZW0p CisgICAgX3VpU291cmNlQ29kZUFkZGVkOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlLCB1aVNvdXJj ZUNvZGUpCiAgICAgewotICAgICAgICBpZiAocmVtb3ZlZEl0ZW0pCi0gICAgICAgICAgICB0aGlz Ll9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnJlbW92ZShyZW1vdmVkSXRlbSk7Ci0gICAg ICAgIGlmIChhZGRlZEl0ZW0pCi0gICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlT b3VyY2VDb2RlLnB1dChhZGRlZEl0ZW0sIHJhd1NvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9y YXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnB1dCh1aVNvdXJjZUNvZGUsIHJhd1NvdXJjZUNv ZGUpOwogCiAgICAgICAgIHZhciBzY3JpcHRJZHMgPSBbXTsKICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCByYXdTb3VyY2VDb2RlLl9zY3JpcHRzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAg ICBzY3JpcHRJZHMucHVzaChyYXdTb3VyY2VDb2RlLl9zY3JpcHRzW2ldLnNjcmlwdElkKTsKICAg ICAgICAgICAgIHJhd1NvdXJjZUNvZGUuX3NjcmlwdHNbaV0uc2V0U291cmNlTWFwcGluZyh0aGlz KTsKICAgICAgICAgfQotICAgICAgICB2YXIgcmVtb3ZlZEl0ZW1zID0gcmVtb3ZlZEl0ZW0gPyBb cmVtb3ZlZEl0ZW1dIDogW107Ci0gICAgICAgIHZhciBhZGRlZEl0ZW1zID0gYWRkZWRJdGVtID8g W2FkZGVkSXRlbV0gOiBbXTsKIAotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBy ZW1vdmVkSXRlbXMsIGFkZGVkSXRlbXM6IGFkZGVkSXRlbXMgfTsKLSAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJ U291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29k ZUFkZGVkLCB1aVNvdXJjZUNvZGUpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdTb3VyY2VDb2RlCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSBvbGRVSVNvdXJjZUNvZGUKKyAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAg IF91aVNvdXJjZUNvZGVSZXBsYWNlZDogZnVuY3Rpb24ocmF3U291cmNlQ29kZSwgb2xkVUlTb3Vy Y2VDb2RlLCB1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2Rl Rm9yVUlTb3VyY2VDb2RlLnJlbW92ZShvbGRVSVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9y YXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnB1dCh1aVNvdXJjZUNvZGUsIHJhd1NvdXJjZUNv ZGUpOworCisgICAgICAgIHZhciBzY3JpcHRJZHMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCByYXdTb3VyY2VDb2RlLl9zY3JpcHRzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAg ICBzY3JpcHRJZHMucHVzaChyYXdTb3VyY2VDb2RlLl9zY3JpcHRzW2ldLnNjcmlwdElkKTsKKyAg ICAgICAgICAgIHJhd1NvdXJjZUNvZGUuX3NjcmlwdHNbaV0uc2V0U291cmNlTWFwcGluZyh0aGlz KTsKKyAgICAgICAgfQorICAgICAgICB2YXIgZGF0YSA9IHsgb2xkVUlTb3VyY2VDb2RlOiB1aVNv dXJjZUNvZGUsIHVpU291cmNlQ29kZTogdWlTb3VyY2VDb2RlIH07CisgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5V SVNvdXJjZUNvZGVSZXBsYWNlZCwgZGF0YSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGV9IHJhd1NvdXJjZUNvZGUKKyAgICAgKiBA cGFyYW4ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqLwor ICAgIF91aVNvdXJjZUNvZGVSZW1vdmVkOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlLCB1aVNvdXJj ZUNvZGUpCisgICAgeworICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2Rl LnJlbW92ZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlUmVtb3Zl ZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xNzMsNyArMTk4LDcgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jhd1NvdXJjZUNvZGVzLmxlbmd0aDsg KytpKSB7CiAgICAgICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNv ZGVzW2ldOwotICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlQ2hhbmdlZChyYXdTb3VyY2VD b2RlLCByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSgpLCBudWxsKTsKKyAgICAgICAgICAgIHRo aXMuX3VpU291cmNlQ29kZVJlbW92ZWQocmF3U291cmNlQ29kZSwgcmF3U291cmNlQ29kZS51aVNv dXJjZUNvZGUoKSk7CiAgICAgICAgICAgICByYXdTb3VyY2VDb2RlLnJlbW92ZUFsbExpc3RlbmVy cygpOwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVzID0gW107CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1hcHBpbmcu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1hcHBpbmcuanMK aW5kZXggZWZjZmFiMGZkNDMzYWUxZTk1ZDkxNzkzNWVhZDJhNzE3ZTFiMmZlOC4uMzI4MDY5M2Ew ZDYzMWQxMTBiOTExZjk1NTY4NWIyYWJjZDljNGNhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRNYXBwaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0TWFwcGluZy5qcwpAQCAtOTcsNyArOTcsOSBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVj dG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzID0gewotICAgIFVJU291cmNlQ29kZUxpc3RDaGFuZ2Vk OiAidWktc291cmNlLWNvZGUtbGlzdC1jaGFuZ2VkIgorICAgIFVJU291cmNlQ29kZUFkZGVkOiAi VUlTb3VyY2VDb2RlQWRkZWQiLAorICAgIFVJU291cmNlQ29kZVJlcGxhY2VkOiAiVUlTb3VyY2VD b2RlUmVwbGFjZWQiLAorICAgIFVJU291cmNlQ29kZVJlbW92ZWQ6ICJVSVNvdXJjZUNvZGVSZW1v dmVkIgogfQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFNuaXBwZXRN b2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBl dE1vZGVsLmpzCmluZGV4IDI5NGY3OGVjYWYwZjA3Njg4NTMxMjM2Y2QwMGQwZWQ1ZDgzYWI0NjMu LjkzMDg3YmZmOTUxMWU2ZmZjZTlkMjdiMjcxOWNjYzE4YmZlMzQwY2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVs LmpzCkBAIC04MSw3ICs4MSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJv dG90eXBlID0gewogICAgICAgICB1aVNvdXJjZUNvZGUuaXNFZGl0YWJsZSA9IHRydWU7CiAgICAg ICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclNuaXBwZXQucHV0KHNuaXBwZXQsIHVpU291cmNlQ29k ZSk7CiAgICAgICAgIHRoaXMuX3NuaXBwZXRGb3JVSVNvdXJjZUNvZGUucHV0KHVpU291cmNlQ29k ZSwgc25pcHBldCk7Ci0gICAgICAgIHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLl91aVNvdXJj ZUNvZGVzQWRkZWQoW3VpU291cmNlQ29kZV0pOworICAgICAgICB0aGlzLl9zbmlwcGV0U2NyaXB0 TWFwcGluZy5fZmlyZVVJU291cmNlQ29kZUFkZGVkKHVpU291cmNlQ29kZSk7CiAgICAgICAgIHJl dHVybiB1aVNvdXJjZUNvZGU7CiAgICAgfSwKIApAQCAtOTUsNyArOTUsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcmVsZWFz ZVNuaXBwZXRTY3JpcHQodWlTb3VyY2VDb2RlKTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2Rl Rm9yU25pcHBldC5yZW1vdmUoc25pcHBldCk7CiAgICAgICAgIHRoaXMuX3NuaXBwZXRGb3JVSVNv dXJjZUNvZGUucmVtb3ZlKHVpU291cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3NuaXBwZXRTY3Jp cHRNYXBwaW5nLl91aVNvdXJjZUNvZGVzUmVtb3ZlZChbdWlTb3VyY2VDb2RlXSk7CisgICAgICAg IHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLl9maXJlVUlTb3VyY2VDb2RlUmVtb3ZlZCh1aVNv dXJjZUNvZGUpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTIxOSw3ICsyMTksNyBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdWlTb3VyY2VD b2RlLmlzU25pcHBldEV2YWx1YXRpb24gPSB0cnVlOwogICAgICAgICB0aGlzLl91aVNvdXJjZUNv ZGVGb3JTY3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gdWlTb3VyY2VDb2RlOwogICAgICAgICB0 aGlzLl9zY3JpcHRGb3JVSVNvdXJjZUNvZGUucHV0KHVpU291cmNlQ29kZSwgc2NyaXB0KTsKLSAg ICAgICAgdGhpcy5fc25pcHBldFNjcmlwdE1hcHBpbmcuX3VpU291cmNlQ29kZXNBZGRlZChbdWlT b3VyY2VDb2RlXSk7CisgICAgICAgIHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLl9maXJlVUlT b3VyY2VDb2RlQWRkZWQodWlTb3VyY2VDb2RlKTsKICAgICAgICAgc2NyaXB0LnNldFNvdXJjZU1h cHBpbmcodGhpcy5fc25pcHBldFNjcmlwdE1hcHBpbmcpOwogICAgIH0sCiAKQEAgLTI4NCw3ICsy ODQsOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdmFyIHJlbW92ZWRVSVNvdXJjZUNvZGVzID0gdGhpcy5fcmVsZWFzZWRVSVNvdXJjZUNv ZGVzKCk7CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkID0ge307CiAgICAg ICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKLSAgICAgICAgdGhp cy5fc25pcHBldFNjcmlwdE1hcHBpbmcuX3VpU291cmNlQ29kZXNSZW1vdmVkKHJlbW92ZWRVSVNv dXJjZUNvZGVzKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkVUlTb3VyY2VD b2Rlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5n Ll9maXJlVUlTb3VyY2VDb2RlUmVtb3ZlZChyZW1vdmVkVUlTb3VyY2VDb2Rlc1tpXSk7CiAgICAg fQogfQogCkBAIC0zNDcsMjEgKzM0OCwxOSBAQCBXZWJJbnNwZWN0b3IuU25pcHBldFNjcmlwdE1h cHBpbmcucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0Fy cmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gdWlTb3VyY2VDb2RlcworICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAgICovCi0g ICAgX3VpU291cmNlQ29kZXNBZGRlZDogZnVuY3Rpb24odWlTb3VyY2VDb2RlcykKKyAgICBfZmly ZVVJU291cmNlQ29kZUFkZGVkOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAg ICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogdWlTb3VyY2VDb2Rl cyB9OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu U2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIGRhdGEpOworICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFw cGluZy5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAog ICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+ fSB1aVNvdXJjZUNvZGVzCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKICAgICAgKi8KLSAgICBfdWlTb3VyY2VDb2Rlc1JlbW92ZWQ6IGZ1bmN0 aW9uKHVpU291cmNlQ29kZXMpCisgICAgX2ZpcmVVSVNvdXJjZUNvZGVSZW1vdmVkOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1z OiB1aVNvdXJjZUNvZGVzLCBhZGRlZEl0ZW1zOiBbXSB9OwotICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3Vy Y2VDb2RlTGlzdENoYW5nZWQsIGRhdGEpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlUmVt b3ZlZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmln YXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmln YXRvci5qcwppbmRleCA1MDg5ZTFmMmE0ZmIzNDg4MTY4ZTNjM2MzNDA1MzcyY2Q2ZTRiNzgzLi5i ZDYyMGNlYjk2NDkyZGJhODI3ZTg2MmFlNmI1MmI2ZDBjNDI5NjE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCkBA IC0xMjQsMTQgKzEyNCwxNCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGU+fSBvbGRVSVNvdXJjZUNvZGVMaXN0Ci0gICAgICogQHBhcmFtIHtB cnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59IHVpU291cmNlQ29kZUxpc3QKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IG9sZFVJU291cmNlQ29kZQorICAg ICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAg ICovCi0gICAgcmVwbGFjZVVJU291cmNlQ29kZXM6IGZ1bmN0aW9uKG9sZFVJU291cmNlQ29kZUxp c3QsIHVpU291cmNlQ29kZUxpc3QpCisgICAgcmVwbGFjZVVJU291cmNlQ29kZTogZnVuY3Rpb24o b2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB0aGlzLl9zY3Jp cHRzVmlldy5yZXBsYWNlVUlTb3VyY2VDb2RlcyhvbGRVSVNvdXJjZUNvZGVMaXN0LCB1aVNvdXJj ZUNvZGVMaXN0KTsKLSAgICAgICAgdGhpcy5fY29udGVudFNjcmlwdHNWaWV3LnJlcGxhY2VVSVNv dXJjZUNvZGVzKG9sZFVJU291cmNlQ29kZUxpc3QsIHVpU291cmNlQ29kZUxpc3QpOwotICAgICAg ICB0aGlzLl9zbmlwcGV0c1ZpZXcucmVwbGFjZVVJU291cmNlQ29kZXMob2xkVUlTb3VyY2VDb2Rl TGlzdCwgdWlTb3VyY2VDb2RlTGlzdCk7CisgICAgICAgIHRoaXMuX3NjcmlwdHNWaWV3LnJlcGxh Y2VVSVNvdXJjZUNvZGUob2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB0 aGlzLl9jb250ZW50U2NyaXB0c1ZpZXcucmVwbGFjZVVJU291cmNlQ29kZShvbGRVSVNvdXJjZUNv ZGUsIHVpU291cmNlQ29kZSk7CisgICAgICAgIHRoaXMuX3NuaXBwZXRzVmlldy5yZXBsYWNlVUlT b3VyY2VDb2RlKG9sZFVJU291cmNlQ29kZSwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAg LyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCmluZGV4IDEzODhlMTcxYWQwYzI1YWI2Yjc0ZjY4MDlhOWRjYzdlN2IzMjNmYzkuLjVh ODZhZDQyZjE3YmMzYzJkNzdmNjIxOTNjYmQ5MGFjMjliMTJlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNjksOSAr MTY5LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHNjcmlwdE1hcHBp bmdGb3JUZXN0KQogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQs IHRoaXMuX3Jlc2V0LmJpbmQodGhpcywgZmFsc2UpKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdn ZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50 cy5CcmVha3BvaW50c0FjdGl2ZVN0YXRlQ2hhbmdlZCwgdGhpcy5fYnJlYWtwb2ludHNBY3RpdmVT dGF0ZUNoYW5nZWQsIHRoaXMpOwogCi0gICAgdGhpcy5fc2NyaXB0TWFwcGluZy5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNl Q29kZUFkZGVkLCB0aGlzLl9oYW5kbGVVSVNvdXJjZUNvZGVBZGRlZCwgdGhpcyk7Ci0gICAgdGhp cy5fc2NyaXB0TWFwcGluZy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNj cmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzLl91aVNvdXJjZUNv ZGVSZXBsYWNlZCwgdGhpcyk7Ci0gICAgdGhpcy5fc2NyaXB0TWFwcGluZy5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29k ZVJlbW92ZWQsIHRoaXMuX3VpU291cmNlQ29kZVJlbW92ZWQsIHRoaXMpOworICAgIHRoaXMuX3Nj cmlwdE1hcHBpbmcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5F dmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHRoaXMuX2hhbmRsZVVJU291cmNlQ29kZUFkZGVkLCB0 aGlzKTsKKyAgICB0aGlzLl9zY3JpcHRNYXBwaW5nLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzLl91aVNv dXJjZUNvZGVSZXBsYWNlZCwgdGhpcyk7CisgICAgdGhpcy5fc2NyaXB0TWFwcGluZy5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVS ZW1vdmVkLCB0aGlzLl91aVNvdXJjZUNvZGVSZW1vdmVkLCB0aGlzKTsKIAogICAgIHZhciBlbmFi bGVEZWJ1Z2dlciA9ICFDYXBhYmlsaXRpZXMuZGVidWdnZXJDYXVzZXNSZWNvbXBpbGF0aW9uIHx8 IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dlckVuYWJsZWQuZ2V0KCk7CiAgICAgaWYgKGVu YWJsZURlYnVnZ2VyKQpAQCAtNDk0LDEzICs0OTQsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX3VpU291cmNlQ29kZVJlcGxhY2VkOiBm dW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBvbGRVSVNvdXJjZUNvZGVMaXN0ID0g LyoqIEB0eXBlIHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59ICovIGV2ZW50LmRh dGEub2xkVUlTb3VyY2VDb2RlTGlzdDsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZUxpc3QgPSAv KiogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8gZXZlbnQuZGF0 YS51aVNvdXJjZUNvZGVMaXN0OworICAgICAgICB2YXIgb2xkVUlTb3VyY2VDb2RlID0gLyoqIEB0 eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhLm9sZFVJU291cmNl Q29kZTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZX0gKi8gZXZlbnQuZGF0YS51aVNvdXJjZUNvZGU7CiAKLSAgICAgICAgdGhp cy5fbmF2aWdhdG9yLnJlcGxhY2VVSVNvdXJjZUNvZGVzKG9sZFVJU291cmNlQ29kZUxpc3QsIHVp U291cmNlQ29kZUxpc3QpOwotICAgICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIucmVwbGFjZUZp bGVzKG9sZFVJU291cmNlQ29kZUxpc3QsIHVpU291cmNlQ29kZUxpc3QpOwotICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IG9sZFVJU291cmNlQ29kZUxpc3QubGVuZ3RoOyArK2kpCi0gICAgICAg ICAgICB0aGlzLl9yZW1vdmVTb3VyY2VGcmFtZShvbGRVSVNvdXJjZUNvZGVMaXN0W2ldKTsKKyAg ICAgICAgdGhpcy5fbmF2aWdhdG9yLnJlcGxhY2VVSVNvdXJjZUNvZGUob2xkVUlTb3VyY2VDb2Rl LCB1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIucmVwbGFjZUZp bGUob2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9yZW1vdmVT b3VyY2VGcmFtZShvbGRVSVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICBfY2xlYXJDdXJyZW50 RXhlY3V0aW9uTGluZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwppbmRleCA1N2U2 OTZiYmUzZDVjYTA5ZGU5YTgwYTZmZWQ4ZmMyZTlhYWIwNmYwLi4xMTM3MTMyYWE3NjVmY2I0MjNl YjI5ZmY3NWM3Y2RjOTFkNWJkMTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwpAQCAtMjY2LDkg KzI2Niw5IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0g ewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSBv bGRVSVNvdXJjZUNvZGUKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9 IG5ld1VJU291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZX0gdWlTb3VyY2VDb2RlCiAgICAgICovCi0gICAgX3JlcGxhY2VGaWxlVGFiOiBmdW5jdGlvbihv bGRVSVNvdXJjZUNvZGUsIG5ld1VJU291cmNlQ29kZSkKKyAgICByZXBsYWNlRmlsZTogZnVuY3Rp b24ob2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGUpCiAgICAgewogICAgICAgICB2YXIgdGFi SWQgPSB0aGlzLl90YWJJZHMuZ2V0KG9sZFVJU291cmNlQ29kZSk7CiAgICAgICAgIApAQCAtMjc3 LDM4ICsyNzcsMTUgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIAogICAgICAgICBkZWxldGUgdGhpcy5fZmlsZXNbdGhpcy5fdGFiSWRz LmdldChvbGRVSVNvdXJjZUNvZGUpXQogICAgICAgICB0aGlzLl90YWJJZHMucmVtb3ZlKG9sZFVJ U291cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3RhYklkcy5wdXQobmV3VUlTb3VyY2VDb2RlLCB0 YWJJZCk7Ci0gICAgICAgIHRoaXMuX2ZpbGVzW3RhYklkXSA9IG5ld1VJU291cmNlQ29kZTsKKyAg ICAgICAgdGhpcy5fdGFiSWRzLnB1dCh1aVNvdXJjZUNvZGUsIHRhYklkKTsKKyAgICAgICAgdGhp cy5fZmlsZXNbdGFiSWRdID0gdWlTb3VyY2VDb2RlOwogCi0gICAgICAgIHRoaXMuX3RhYmJlZFBh bmUuY2hhbmdlVGFiVGl0bGUodGFiSWQsIHRoaXMuX3RpdGxlRm9yRmlsZShuZXdVSVNvdXJjZUNv ZGUpKTsKLSAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5jaGFuZ2VUYWJWaWV3KHRhYklkLCB0aGlz Ll9kZWxlZ2F0ZS52aWV3Rm9yRmlsZShuZXdVSVNvdXJjZUNvZGUpKTsKLSAgICAgICAgdGhpcy5f dGFiYmVkUGFuZS5jaGFuZ2VUYWJUb29sdGlwKHRhYklkLCB0aGlzLl90b29sdGlwRm9yRmlsZShu ZXdVSVNvdXJjZUNvZGUpKTsKKyAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5jaGFuZ2VUYWJUaXRs ZSh0YWJJZCwgdGhpcy5fdGl0bGVGb3JGaWxlKHVpU291cmNlQ29kZSkpOworICAgICAgICB0aGlz Ll90YWJiZWRQYW5lLmNoYW5nZVRhYlZpZXcodGFiSWQsIHRoaXMuX2RlbGVnYXRlLnZpZXdGb3JG aWxlKHVpU291cmNlQ29kZSkpOworICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNoYW5nZVRhYlRv b2x0aXAodGFiSWQsIHRoaXMuX3Rvb2x0aXBGb3JGaWxlKHVpU291cmNlQ29kZSkpOwogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlPn0gb2xkVUlTb3VyY2VDb2RlTGlzdAotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGU+fSB1aVNvdXJjZUNvZGVMaXN0Ci0gICAgICovCi0gICAgcmVwbGFj ZUZpbGVzOiBmdW5jdGlvbihvbGRVSVNvdXJjZUNvZGVMaXN0LCB1aVNvdXJjZUNvZGVMaXN0KQot ICAgIHsKLSAgICAgICAgdmFyIG1haW5GaWxlOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IG9sZFVJU291cmNlQ29kZUxpc3QubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciB0YWJJ ZCA9IHRoaXMuX3RhYklkcy5nZXQob2xkVUlTb3VyY2VDb2RlTGlzdFtpXSk7Ci0gICAgICAgICAg ICBpZiAodGFiSWQgJiYgKCFtYWluRmlsZSB8fCB0aGlzLl90YWJiZWRQYW5lLnNlbGVjdGVkVGFi SWQgPT09IHRhYklkKSkgewotICAgICAgICAgICAgICAgIG1haW5GaWxlID0gb2xkVUlTb3VyY2VD b2RlTGlzdFtpXTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0gCi0gICAg ICAgIH0KLSAgICAgICAgCi0gICAgICAgIGlmICghbWFpbkZpbGUpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIAotICAgICAgICB0aGlzLl9yZXBsYWNlRmlsZVRhYihtYWluRmlsZSwgdWlT b3VyY2VDb2RlTGlzdFswXSk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgb2xkVUlTb3Vy Y2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX3JlbW92ZUZpbGVUYWIo b2xkVUlTb3VyY2VDb2RlTGlzdFtpXSk7Ci0gICAgfSwKLSAgICAKLSAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqIEBw YXJhbSB7Ym9vbGVhbn0gaXNEaXJ0eQogICAgICAqLwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI3MTNiYWI4MzI0YmU3NTQw ODRlYjc3OTk0NDEyNmNhODE3MGU1N2EuLmZkY2U5NDZlMjVkYWYxMWJjMmUyN2ViODhlYjkxMzhm NjU5OWZhZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNSBAQAogMjAxMi0wNS0xNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBnZXQg cmlkIG9mIFVJU291cmNlQ29kZUxpc3RDaGFuZ2VkIGV2ZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY2MDEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBp bGVyLXNjcmlwdC1tYXBwaW5nLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3Nj cmlwdHMtcGFuZWwuaHRtbDoKKworMjAxMi0wNS0xNiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW5hbWUgRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbCB0byBEZWJ1Z2dlclNjcmlwdE1hcHBpbmcsIG1ha2UgaXQgcHJpdmF0 ZSB0byBTY3JpcHRzUGFuZWwuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NjU5NAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9jb21waWxlci1zY3JpcHQtbWFwcGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc2NyaXB0LW1hcHBpbmcuaHRtbAppbmRleCBkMjI1Njgy N2YzMmQyMTkyNmJlNmEwMWQ2ZjUxNzI3NjllYWU0OWJkLi40NzhmOTVlMmNmMjA4YWRiNTgzMmUw OTU3NjQ4NDdjZWYxZWRmY2I3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9jb21waWxlci1zY3JpcHQtbWFwcGluZy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBpbGVyLXNjcmlwdC1tYXBwaW5nLmh0bWwKQEAgLTE5Myw3 ICsxOTMsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0 aW5ncy5zb3VyY2VNYXBzRW5hYmxlZC5zZXQodHJ1ZSk7CiAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuZGVidWdnZXJNb2RlbC5fcmVzZXQoKTsKICAgICAgICAgICAgIHZhciBkZWJ1Z2dlclNjcmlw dE1hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZygpOwotICAg ICAgICAgICAgZGVidWdnZXJTY3JpcHRNYXBwaW5nLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHVpU291 cmNlQ29kZUFkZGVkKTsKKyAgICAgICAgICAgIGRlYnVnZ2VyU2NyaXB0TWFwcGluZy5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVB ZGRlZCwgdWlTb3VyY2VDb2RlQWRkZWQpOwogCiAgICAgICAgICAgICB2YXIgc2NyaXB0ID0gSW5z cGVjdG9yVGVzdC5jcmVhdGVTY3JpcHRNb2NrKCJjb21waWxlZC5qcyIsIDAsIDAsIHRydWUsICIi KTsKICAgICAgICAgICAgIHNjcmlwdC5zb3VyY2VNYXBVUkwgPSAiaHR0cDovL2xvY2FsaG9zdDo4 MDAwL2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlLW1hcC5qc29uXyI7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50 eHQKaW5kZXggNTg4YTdiZDBiYTNiMmY0ZTljNWQxYTRhMThhZmZhNDZmNmQ3NzU5Zi4uYTY1OTcx Mzc0MGJmYWM2MzkyYzA2MjRiNmQ3YzFhNWM1NjkzOWQ4YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dApA QCAtMjgsMTQgKzI4LDcgQEAgRHVtcGluZyBTY3JpcHRzTmF2aWdhdG9yICdTY3JpcHRzJyB0YWI6 CiBEdW1waW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgogRHVtcGlu ZyBTY3JpcHRzTmF2aWdhdG9yICdTY3JpcHRzJyB0YWI6CiAgIGZvby5qcwotICBzb3VyY2UxLmpz Ci0gIHNvdXJjZTIuanMKLUR1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnQ29udGVudCBzY3JpcHRz JyB0YWI6Ci1Tb3VyY2UgcmVxdWVzdGVkIGZvciBzb3VyY2UyLmpzCi1Tb3VyY2UgcmVxdWVzdGVk IGZvciBzb3VyY2UxLmpzCi1Tb3VyY2UgcmVxdWVzdGVkIGZvciBjb21waWxlZC5qcwotRHVtcGlu ZyBTY3JpcHRzTmF2aWdhdG9yICdTY3JpcHRzJyB0YWI6Ci0gIGNvbXBpbGVkLmpzCi0gIGZvby5q cworICBzb3VyY2UuanMKIER1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnQ29udGVudCBzY3JpcHRz JyB0YWI6CisgIHNvdXJjZS5qcwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL3NjcmlwdHMtcGFuZWwuaHRtbAppbmRleCA3NzQ5YjZkNTdiMmIzZDQ1Njk2NzcxYTJiNmFm NWU4MmM1YTczZTI5Li45NmFkYzY2MTA2MjNmMWM0NmIyYzAwYWNjYzI1NTQ3MGFjMzUzY2NlIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5o dG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0 bWwKQEAgLTI5LDIxICsyOSwxOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgbW9kZWwuX2Fk ZFVJU291cmNlQ29kZSA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKICAgICAgICAgewogICAgICAg ICAgICAgdWlTb3VyY2VDb2Rlcy5wdXNoKHVpU291cmNlQ29kZSk7Ci0gICAgICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBw aW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKKyAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5n LkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgfQogICAg ICAgICBtb2RlbC5fcmVzZXQgPSBmdW5jdGlvbihwcmVzZXJ2ZWRJdGVtcykKICAgICAgICAgewog ICAgICAgICAgICAgdWlTb3VyY2VDb2RlcyA9IHByZXNlcnZlZEl0ZW1zIHx8IFtdOwogICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkKTsK ICAgICAgICAgfQotICAgICAgICBtb2RlbC5fcmVwbGFjZVVJU291cmNlQ29kZXMgPSBmdW5jdGlv bihvbGRVSVNvdXJjZUNvZGVMaXN0LCBuZXdVSVNvdXJjZUNvZGVMaXN0KQorICAgICAgICBtb2Rl bC5fcmVwbGFjZVVJU291cmNlQ29kZSA9IGZ1bmN0aW9uKG9sZFVJU291cmNlQ29kZSwgdWlTb3Vy Y2VDb2RlKQogICAgICAgICB7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG9sZFVJ U291cmNlQ29kZUxpc3QubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICAgIHVpU291cmNlQ29kZXMu cmVtb3ZlKG9sZFVJU291cmNlQ29kZUxpc3RbaV0pOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBuZXdVSVNvdXJjZUNvZGVMaXN0Lmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICB1 aVNvdXJjZUNvZGVzLnB1c2gobmV3VUlTb3VyY2VDb2RlTGlzdFtpXSk7Ci0gICAgICAgICAgICB2 YXIgZGF0YSA9IHsgb2xkVUlTb3VyY2VDb2RlTGlzdDogb2xkVUlTb3VyY2VDb2RlTGlzdCwgdWlT b3VyY2VDb2RlTGlzdDogbmV3VUlTb3VyY2VDb2RlTGlzdCB9OwotICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGlu Zy5FdmVudHMuVUlTb3VyY2VDb2RlUmVwbGFjZWQsIGRhdGEpOworICAgICAgICAgICAgdWlTb3Vy Y2VDb2Rlcy5yZW1vdmUob2xkVUlTb3VyY2VDb2RlKTsKKyAgICAgICAgICAgIHVpU291cmNlQ29k ZXMucHVzaCh1aVNvdXJjZUNvZGUpOworICAgICAgICAgICAgdmFyIGRhdGEgPSB7IG9sZFVJU291 cmNlQ29kZTogb2xkVUlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGU6IHVpU291cmNlQ29kZSB9Owor ICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNj cmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCBkYXRhKTsKICAgICAgICAg fQogICAgICAgICByZXR1cm4gbW9kZWw7CiAgICAgfQpAQCAtMTI0LDI1ICsxMjIsMTEgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdh dG9yKHBhbmVsLl9uYXZpZ2F0b3IpOwogCiAgICAgICAgICAgICAvLyBQbHVnIGNvbXBpbGVyIHNv dXJjZSBtYXBwaW5nLgotICAgICAgICAgICAgdmFyIHNvdXJjZTFTb3VyY2VDb2RlID0gY3JlYXRl VUlTb3VjZUNvZGUoInNvdXJjZTEuanMiKTsKLSAgICAgICAgICAgIHZhciBzb3VyY2UyU291cmNl Q29kZSA9IGNyZWF0ZVVJU291Y2VDb2RlKCJzb3VyY2UyLmpzIik7Ci0gICAgICAgICAgICBtYXBw aW5nLl9yZXBsYWNlVUlTb3VyY2VDb2RlcyhbY29tcGlsZWRTb3VyY2VDb2RlXSwgW3NvdXJjZTFT b3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0pOworICAgICAgICAgICAgdmFyIHNvdXJjZVNv dXJjZUNvZGUgPSBjcmVhdGVVSVNvdWNlQ29kZSgic291cmNlLmpzIik7CisgICAgICAgICAgICBt YXBwaW5nLl9yZXBsYWNlVUlTb3VyY2VDb2RlKGNvbXBpbGVkU291cmNlQ29kZSwgc291cmNlU291 cmNlQ29kZSk7CiAKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFNjcmlwdHNOYXZpZ2F0 b3IocGFuZWwuX25hdmlnYXRvcik7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnNob3dTY3Jp cHRTb3VyY2VPblNjcmlwdHNQYW5lbChwYW5lbCwgInNvdXJjZTIuanMiLCBzdGVwMik7Ci0KLSAg ICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAyKCkgewotICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3Quc2hvd1NjcmlwdFNvdXJjZU9uU2NyaXB0c1BhbmVsKHBhbmVsLCAic291cmNlMS5qcyIsIHN0 ZXAzKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDMoKSB7Ci0g ICAgICAgICAgICAgICAgLy8gVW5wbHVnIGNvbXBpbGVyIHNvdXJjZSBtYXBwaW5nLgotICAgICAg ICAgICAgICAgIG1hcHBpbmcuX3JlcGxhY2VVSVNvdXJjZUNvZGVzKFtzb3VyY2UxU291cmNlQ29k ZSwgc291cmNlMlNvdXJjZUNvZGVdLCBbY29tcGlsZWRTb3VyY2VDb2RlXSk7Ci0gICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2NyaXB0c05hdmlnYXRvcihwYW5lbC5fbmF2aWdhdG9y KTsKLQotICAgICAgICAgICAgICAgIHBhbmVsLmRldGFjaCgpOwotICAgICAgICAgICAgICAgIG5l eHQoKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgfQogICAg IF0pOwogfTsK