86229 2012-05-11 10:35:09 -0700 Web Inspector: extract PresentationConsoleMessageHelper from DebuggerPresentationModel. 2012-05-13 23:33:12 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 86336 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo ossy pfeldman pmuellr rik timothy yurys oldest_to_newest 621779 0 pfeldman 2012-05-11 10:35:09 -0700 This change also starts tracking messages along with the live location changes. 621794 1 141446 pfeldman 2012-05-11 10:47:26 -0700 Created attachment 141446 Patch 621830 2 pfeldman 2012-05-11 11:30:55 -0700 Committed r116789: <http://trac.webkit.org/changeset/116789> 622403 3 ossy 2012-05-12 12:14:30 -0700 (In reply to comment #2) > Committed r116789: <http://trac.webkit.org/changeset/116789> It made a test fail on Qt: --- /ramdisk/qt-linux-64-release/build/layout-test-results/inspector/debugger/script-formatter-console-expected.txt +++ /ramdisk/qt-linux-64-release/build/layout-test-results/inspector/debugger/script-formatter-console-actual.txt @@ -10,7 +10,7 @@ ["9"] script-formatter-console.html:13 Post-format row message list: -["12"] -["12"] +["11"] +["11"] Debugger was disabled. Could you check it, please? 622685 4 ossy 2012-05-13 23:33:12 -0700 New bug reports file on the new regression: https://bugs.webkit.org/show_bug.cgi?id=86336 141446 2012-05-11 10:47:26 -0700 2012-05-11 11:05:11 -0700 Patch bug-86229-20120511214724.patch text/plain 21398 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMzNjMwMzljNDE4MzQ0 OTQ5NjUwOTJlNjY2MGIxZDU0MTlmNDE5NS4uMzA0OTdiMDRlZmEzZGFkOGYyOTA1NTViYmY1MjZj MDhmNDgyYmEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTA1LTExICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGV4dHJhY3QgUHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2VIZWxwZXIgZnJvbSBEZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODYyMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGNoYW5nZSBhbHNvIHN0YXJ0cyB0cmFja2luZyBtZXNzYWdlcyBhbG9u ZyB3aXRoIHRoZSBsaXZlIGxvY2F0aW9uIGNoYW5nZXMuCisKKyAgICAgICAgVGVzdGVkIHdpdGgg c2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0bWwuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fcGFyc2VkU2NyaXB0U291cmNlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGVi dWdnZXJSZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ29uc29sZU1l c3NhZ2VIZWxwZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVN ZXNzYWdlSGVscGVyLnByb3RvdHlwZS5fYWRkUGVuZGluZ0NvbnNvbGVNZXNzYWdlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZUhlbHBlci5wcm90b3R5 cGUuX3BhcnNlZFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2VIZWxwZXIucHJvdG90eXBlLl9kZWJ1Z2dlclJlc2V0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZUxpbmVH dXR0ZXJDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZS5fY29uc29sZU1lc3NhZ2VBZGRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fc2V0QnJlYWtwb2ludCk6CisK KzIwMTItMDUtMTEgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBicmVha3BvaW50IG1hbmFnZXIgZnJvbSBkZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsIHRvIFdlYkluc3BlY3Rvci4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjIwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCmluZGV4IDlk MTExZTAwOTZiODEwZDFmNmE5MWE3OWY0YTYxOTM0NTg4M2NkNzEuLjkyOTBlNjBlOGQ1ZGRkZDll NmI1MTg3OTBhNjRjOWQxNTcwZjBiYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwpAQCAtNDk4LDMgKzQ5OCw2 IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5TdG9yYWdlLkl0ZW0gPSBmdW5jdGlv bihicmVha3BvaW50KQogICAgIHRoaXMuY29uZGl0aW9uID0gYnJlYWtwb2ludC5jb25kaXRpb24o KTsKICAgICB0aGlzLmVuYWJsZWQgPSBicmVha3BvaW50LmVuYWJsZWQoKTsKIH0KKworLyoqIEB0 eXBlIHtXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXJ9ICovCitXZWJJbnNwZWN0b3IuYnJl YWtwb2ludE1hbmFnZXIgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4 IGQxMmI0MjI5NGJhN2NjYWYwZWQxZDc1OTZhMjliZGJiYWI0YWU0NjcuLmUxMzE1YmM5N2YwZjU2 ZjliNTA4OTgwYjk4OWE0NzI2ZDhjN2E0NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu anMKQEAgLTM3LDE3ICszNywxMiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9zY3JpcHRNYXBwaW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5NYWluU2NyaXB0TWFwcGluZygpOwogICAgIHRoaXMuX3NjcmlwdE1hcHBpbmcuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNl Q29kZUxpc3RDaGFuZ2VkLCB0aGlzLl9oYW5kbGVVSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhp cyk7CiAKLSAgICB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzID0ge307Ci0gICAgdGhpcy5f Y29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25zID0gW107Ci0KICAgICBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2 ZW50cy5QYXJzZWRTY3JpcHRTb3VyY2UsIHRoaXMuX3BhcnNlZFNjcmlwdFNvdXJjZSwgdGhpcyk7 Ci0gICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSwgdGhp cy5fZmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5F dmVudHMuRmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSwgdGhpcy5fcGFyc2VkU2NyaXB0U291cmNl LCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkLCB0 aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsKIAotICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5FdmVudHMuTWVzc2FnZUFk ZGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVkLCB0aGlzKTsKLSAgICBXZWJJbnNwZWN0b3Iu Y29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRz LkNvbnNvbGVDbGVhcmVkLCB0aGlzLl9jb25zb2xlQ2xlYXJlZCwgdGhpcyk7Ci0KICAgICBuZXcg V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcodGhp cyk7CisgICAgbmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZUhlbHBl cigpOwogfQogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMg PSB7CkBAIC01OCwzMiArNTMsMTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuRXZlbnRzID0gewogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtEZWJ1Z2dlckFnZW50Lkxv Y2F0aW9ufSByYXdMb2NhdGlvbgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9y LlVJTG9jYXRpb24pOihib29sZWFufHVuZGVmaW5lZCl9IHVwZGF0ZURlbGVnYXRlCi0gICAgICog QHJldHVybiB7V2ViSW5zcGVjdG9yLkxpdmVMb2NhdGlvbn0KLSAgICAgKi8KLSAgICBjcmVhdGVM aXZlTG9jYXRpb246IGZ1bmN0aW9uKHJhd0xvY2F0aW9uLCB1cGRhdGVEZWxlZ2F0ZSkKLSAgICB7 Ci0gICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRG b3JJZChyYXdMb2NhdGlvbi5zY3JpcHRJZCk7Ci0gICAgICAgIHJldHVybiBzY3JpcHQuY3JlYXRl TGl2ZUxvY2F0aW9uKHJhd0xvY2F0aW9uLCB1cGRhdGVEZWxlZ2F0ZSk7Ci0gICAgfSwKLQotICAg IC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAogICAgICAqLwog ICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAg dmFyIHNjcmlwdCA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0gKi8gZXZlbnQuZGF0 YTsKICAgICAgICAgdGhpcy5fc2NyaXB0TWFwcGluZy5hZGRTY3JpcHQoc2NyaXB0KTsKLSAgICAg ICAgdGhpcy5fYWRkUGVuZGluZ0NvbnNvbGVNZXNzYWdlc1RvU2NyaXB0KHNjcmlwdCk7Ci0gICAg fSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAot ICAgICAqLwotICAgIF9mYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlOiBmdW5jdGlvbihldmVudCkK LSAgICB7Ci0gICAgICAgIHRoaXMuX3BhcnNlZFNjcmlwdFNvdXJjZShldmVudCk7CiAgICAgfSwK IAogICAgIC8qKgpAQCAtMTUyLDYgKzEyNywzMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLnNldFNjcmlwdFNvdXJjZShzY3JpcHQuc2NyaXB0SWQsIG5ld1NvdXJjZSwgZGlkRWRp dFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKICAgICB9LAogCisgICAgX2RlYnVnZ2VyUmVzZXQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3NjcmlwdE1hcHBpbmcucmVzZXQoKTsK KyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKKworLyoqCisg KiBAY29uc3RydWN0b3IKKyAqLworV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVNZXNz YWdlSGVscGVyID0gZnVuY3Rpb24oKQoreworICAgIHRoaXMuX3BlbmRpbmdDb25zb2xlTWVzc2Fn ZXMgPSB7fTsKKyAgICB0aGlzLl9wcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZXMgPSBbXTsKKwor ICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNv bnNvbGVNb2RlbC5FdmVudHMuTWVzc2FnZUFkZGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVk LCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzLkNvbnNvbGVDbGVhcmVkLCB0aGlzLl9jb25zb2xl Q2xlYXJlZCwgdGhpcyk7CisKKyAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5QYXJzZWRTY3JpcHRT b3VyY2UsIHRoaXMuX3BhcnNlZFNjcmlwdFNvdXJjZSwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2Rl bC5FdmVudHMuRmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSwgdGhpcy5fcGFyc2VkU2NyaXB0U291 cmNlLCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVk LCB0aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsKK30KKworV2ViSW5zcGVjdG9yLlByZXNlbnRh dGlvbkNvbnNvbGVNZXNzYWdlSGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKICAgICAgKi8KQEAgLTE3NCwxMyArMTc0 LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIF9hZGRDb25zb2xlTWVzc2FnZVRvU2NyaXB0OiBmdW5jdGlvbihtZXNz YWdlLCByYXdMb2NhdGlvbikKICAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIHVwZGF0ZUxvY2F0aW9u KHVpTG9jYXRpb24pCi0gICAgICAgIHsKLSAgICAgICAgICAgIHZhciBwcmVzZW50YXRpb25NZXNz YWdlID0gbmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZSh1aUxvY2F0 aW9uLnVpU291cmNlQ29kZSwgdWlMb2NhdGlvbi5saW5lTnVtYmVyLCBtZXNzYWdlKTsKLSAgICAg ICAgICAgIHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLmNvbnNvbGVNZXNzYWdlQWRkZWQocHJlc2Vu dGF0aW9uTWVzc2FnZSk7Ci0gICAgICAgIH0KLSAgICAgICAgdmFyIGxpdmVMb2NhdGlvbiA9IHRo aXMuY3JlYXRlTGl2ZUxvY2F0aW9uKHJhd0xvY2F0aW9uLCB1cGRhdGVMb2NhdGlvbi5iaW5kKHRo aXMpKTsKLSAgICAgICAgdGhpcy5fY29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25zLnB1c2gobGl2 ZUxvY2F0aW9uKTsKKyAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2VzLnB1 c2gobmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZShtZXNzYWdlLCBy YXdMb2NhdGlvbikpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTE5NCwxMCArMTg4LDEyIEBAIFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0fSBzY3JpcHQK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKICAgICAgKi8KLSAgICBf YWRkUGVuZGluZ0NvbnNvbGVNZXNzYWdlc1RvU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCisgICAg X3BhcnNlZFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICB2YXIg c2NyaXB0ID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuU2NyaXB0fSAqLyBldmVudC5kYXRhOwor CiAgICAgICAgIHZhciBtZXNzYWdlcyA9IHRoaXMuX3BlbmRpbmdDb25zb2xlTWVzc2FnZXNbc2Ny aXB0LnNvdXJjZVVSTF07CiAgICAgICAgIGlmICghbWVzc2FnZXMpCiAgICAgICAgICAgICByZXR1 cm47CkBAIC0yMjEsNDUgKzIxNyw1MyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgX2NvbnNvbGVDbGVhcmVkOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzID0ge307Ci0gICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25zLmxl bmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5fY29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25z W2ldLmRpc3Bvc2UoKTsKLSAgICAgICAgdGhpcy5fY29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25z ID0gW107Ci0gICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gdGhpcy51aVNvdXJjZUNvZGVzKCk7 CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcHJlc2VudGF0aW9uQ29uc29sZU1l c3NhZ2VzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ29uc29s ZU1lc3NhZ2VzW2ldLmRpc3Bvc2UoKTsKKyAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ29uc29s ZU1lc3NhZ2VzID0gW107CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gV2ViSW5zcGVjdG9y LmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwudWlTb3VyY2VDb2RlcygpOwogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB1 aVNvdXJjZUNvZGVzW2ldLmNvbnNvbGVNZXNzYWdlc0NsZWFyZWQoKTsKICAgICB9LAogCi0gICAg LyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNv ZGUKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gbGluZU51bWJlcgotICAgICAqLwotICAgIGNvbnRp bnVlVG9MaW5lOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpCi0gICAgewotICAg ICAgICB2YXIgcmF3TG9jYXRpb24gPSB1aVNvdXJjZUNvZGUudWlMb2NhdGlvblRvUmF3TG9jYXRp b24obGluZU51bWJlciwgMCk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNv bnRpbnVlVG9Mb2NhdGlvbihyYXdMb2NhdGlvbik7Ci0gICAgfSwKLQogICAgIF9kZWJ1Z2dlclJl c2V0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9zY3JpcHRNYXBwaW5nLnJlc2V0 KCk7CiAgICAgICAgIHRoaXMuX3BlbmRpbmdDb25zb2xlTWVzc2FnZXMgPSB7fTsKLSAgICAgICAg dGhpcy5fY29uc29sZU1lc3NhZ2VMaXZlTG9jYXRpb25zID0gW107CisgICAgICAgIHRoaXMuX3By ZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlcyA9IFtdOwogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5PYmplY3QucHJvdG90eXBlOwotCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKLSAqIEBwYXJhbSB7bnVt YmVyfSBsaW5lTnVtYmVyCi0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZX0g b3JpZ2luYWxNZXNzYWdlCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZX0g bWVzc2FnZQorICogQHBhcmFtIHtEZWJ1Z2dlckFnZW50LkxvY2F0aW9ufSByYXdMb2NhdGlvbgog ICovCi1XZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2UgPSBmdW5jdGlvbih1 aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIG9yaWdpbmFsTWVzc2FnZSkKK1dlYkluc3BlY3Rvci5Q cmVzZW50YXRpb25Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKG1lc3NhZ2UsIHJhd0xvY2F0aW9u KQogewotICAgIHRoaXMudWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwotICAgIHRoaXMubGlu ZU51bWJlciA9IGxpbmVOdW1iZXI7Ci0gICAgdGhpcy5vcmlnaW5hbE1lc3NhZ2UgPSBvcmlnaW5h bE1lc3NhZ2U7CisgICAgdGhpcy5vcmlnaW5hbE1lc3NhZ2UgPSBtZXNzYWdlOworICAgIHRoaXMu X2xpdmVMb2NhdGlvbiA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZUxpdmVMb2Nh dGlvbihyYXdMb2NhdGlvbiwgdGhpcy5fdXBkYXRlTG9jYXRpb24uYmluZCh0aGlzKSk7Cit9CisK K1dlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7Cisg ICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbn0gdWlMb2NhdGlv bgorICAgICAqLworICAgIF91cGRhdGVMb2NhdGlvbjogZnVuY3Rpb24odWlMb2NhdGlvbikKKyAg ICB7CisgICAgICAgIGlmICh0aGlzLl91aUxvY2F0aW9uKQorICAgICAgICAgICAgdGhpcy5fdWlM b2NhdGlvbi51aVNvdXJjZUNvZGUuY29uc29sZU1lc3NhZ2VSZW1vdmVkKHRoaXMpOworICAgICAg ICB0aGlzLl91aUxvY2F0aW9uID0gdWlMb2NhdGlvbjsKKyAgICAgICAgdGhpcy5fdWlMb2NhdGlv bi51aVNvdXJjZUNvZGUuY29uc29sZU1lc3NhZ2VBZGRlZCh0aGlzKTsKKyAgICB9LAorCisgICAg Z2V0IGxpbmVOdW1iZXIoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3VpTG9jYXRpb24u bGluZU51bWJlcjsKKyAgICB9LAorCisgICAgZGlzcG9zZTogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdGhpcy5fbGl2ZUxvY2F0aW9uLmRpc3Bvc2UoKTsKKyAgICB9CiB9CiAKIC8qKgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291 cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291 cmNlLmpzCmluZGV4IDJiYjZiMTRmYjUxMGZhNzIxN2E0MDBlZWFiZjhkNTVmY2Y5M2NlODAuLjYz NTZlMjRiMjIzMzQzMjhhZWNhOTFjNzI3N2Q0NWRjZWVlMTQ2ODggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2UuanMKQEAg LTQwLDEwICs0MCw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlID0gZnVuY3Rpb24o aWQsIHVybCwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nCiB7CiAgICAgV2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZS5jYWxsKHRoaXMsIGlkLCB1cmwsIGNvbnRlbnRQcm92aWRlciwgc291 cmNlTWFwcGluZyk7CiAKLSAgICAvKioKLSAgICAgKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rv ci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZT59Ci0gICAgICovCi0gICAgdGhpcy5fY29uc29s ZU1lc3NhZ2VzID0gW107CiAgICAgdGhpcy5fZm9ybWF0dGVyTWFwcGluZyA9IG5ldyBXZWJJbnNw ZWN0b3IuSWRlbnRpdHlGb3JtYXR0ZXJTb3VyY2VNYXBwaW5nKCk7CiAgICAgLy8gRklYTUU6IHBv c3Rwb25lIGJyZWFrcG9pbnRzIHJlc3RvcmUgdG8gYWZ0ZXIgdGhlIG1hcHBpbmcgaGFzIGJlZW4g ZXN0YWJsaXNoZWQuCiAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKQEAgLTU0LDI5ICs1MCw2 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlID0gZnVuY3Rpb24oaWQsIHVybCwgY29u dGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nCiAKIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlLnByb3RvdHlwZSA9IHsKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtBcnJheS48V2ViSW5z cGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlPn0KLSAgICAgKi8KLSAgICBjb25zb2xl TWVzc2FnZXM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9jb25zb2xl TWVzc2FnZXM7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlfSBtZXNzYWdlCi0gICAgICovCi0gICAgY29uc29s ZU1lc3NhZ2VBZGRlZDogZnVuY3Rpb24obWVzc2FnZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2Nv bnNvbGVNZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2Fn ZUFkZGVkLCBtZXNzYWdlKTsKLSAgICB9LAotCi0gICAgY29uc29sZU1lc3NhZ2VzQ2xlYXJlZDog ZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fY29uc29sZU1lc3NhZ2VzID0gW107Ci0g ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGUuRXZlbnRzLkNvbnNvbGVNZXNzYWdlc0NsZWFyZWQpOwotICAgIH0sCi0KLSAgICAvKioK ICAgICAgKiBAcGFyYW0gez9zdHJpbmd9IGNvbnRlbnQKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59 IGNvbnRlbnRFbmNvZGVkCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG1pbWVUeXBlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VG cmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNv dXJjZUZyYW1lLmpzCmluZGV4IGViNTYwZDkzMGNhOTE2YTQ5OTZhZDUwNmIzNWIxZWM4ZjAwNDQz NTcuLjVhNmZkYWU5Yzk2NDczYWQ3NmQ2MjE0OTEzYmUyOGMxYjViNjlhNDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1l LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNv dXJjZUZyYW1lLmpzCkBAIC01OSw2ICs1OSw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRzUGFuZWwsIG1vZGVsLCB1aVNvdXJjZUNvZGUpCiAK ICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlLkV2ZW50cy5Db250ZW50Q2hhbmdlZCwgdGhpcy5fb25Db250ZW50Q2hhbmdlZCwg dGhpcyk7CiAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29uc29sZU1lc3NhZ2VBZGRlZCwgdGhpcy5fY29uc29s ZU1lc3NhZ2VBZGRlZCwgdGhpcyk7CisgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29uc29sZU1lc3NhZ2VSZW1v dmVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZVJlbW92ZWQsIHRoaXMpOwogICAgIHRoaXMuX3VpU291 cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRz LkNvbnNvbGVNZXNzYWdlc0NsZWFyZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlc0NsZWFyZWQsIHRo aXMpOwogfQogCkBAIC0xNDIsNyArMTQzLDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxl cygpID8gIkFkZCBjb25kaXRpb25hbCBicmVha3BvaW504oCmIiA6ICJBZGQgQ29uZGl0aW9uYWwg QnJlYWtwb2ludOKApiIpLCB0aGlzLl9lZGl0QnJlYWtwb2ludENvbmRpdGlvbi5iaW5kKHRoaXMs IGxpbmVOdW1iZXIpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIFRoaXMgcm93 IGhhcyBhIGJyZWFrcG9pbnQsIHdlIHdhbnQgdG8gc2hvdyBlZGl0IGFuZCByZW1vdmUgYnJlYWtw b2ludCwgYW5kIGVpdGhlciBkaXNhYmxlIG9yIGVuYWJsZS4KLSAgICAgICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dl ckNhc2VNZW51VGl0bGVzKCkgPyAiUmVtb3ZlIGJyZWFrcG9pbnQiIDogIlJlbW92ZSBCcmVha3Bv aW50IiksIGJyZWFrcG9pbnQucmVtb3ZlLmJpbmQodGhpcykpOworICAgICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxv d2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZW1vdmUgYnJlYWtwb2ludCIgOiAiUmVtb3ZlIEJyZWFr cG9pbnQiKSwgYnJlYWtwb2ludC5yZW1vdmUuYmluZChicmVha3BvaW50KSk7CiAgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0 b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkVkaXQgYnJlYWtwb2ludOKApiIgOiAiRWRp dCBCcmVha3BvaW504oCmIiksIHRoaXMuX2VkaXRCcmVha3BvaW50Q29uZGl0aW9uLmJpbmQodGhp cywgbGluZU51bWJlciwgYnJlYWtwb2ludCkpOwogICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQu ZW5hYmxlZCgpKQogICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAi RGlzYWJsZSBicmVha3BvaW50IiA6ICJEaXNhYmxlIEJyZWFrcG9pbnQiKSwgYnJlYWtwb2ludC5z ZXRFbmFibGVkLmJpbmQoYnJlYWtwb2ludCwgZmFsc2UpKTsKQEAgLTUyMCwxMSArNTIxLDE4IEBA IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAg X2NvbnNvbGVNZXNzYWdlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFy IG1lc3NhZ2UgPSBldmVudC5kYXRhOworICAgICAgICB2YXIgbWVzc2FnZSA9IC8qKiBAdHlwZSB7 V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlfSAqLyBldmVudC5kYXRhOwog ICAgICAgICBpZiAodGhpcy5sb2FkZWQpCiAgICAgICAgICAgICB0aGlzLmFkZE1lc3NhZ2VUb1Nv dXJjZShtZXNzYWdlLmxpbmVOdW1iZXIsIG1lc3NhZ2Uub3JpZ2luYWxNZXNzYWdlKTsKICAgICB9 LAogCisgICAgX2NvbnNvbGVNZXNzYWdlUmVtb3ZlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgewor ICAgICAgICB2YXIgbWVzc2FnZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlv bkNvbnNvbGVNZXNzYWdlfSAqLyBldmVudC5kYXRhOworICAgICAgICBpZiAodGhpcy5sb2FkZWQp CisgICAgICAgICAgICB0aGlzLnJlbW92ZU1lc3NhZ2VGcm9tU291cmNlKG1lc3NhZ2UubGluZU51 bWJlciwgbWVzc2FnZS5vcmlnaW5hbE1lc3NhZ2UpOworICAgIH0sCisKICAgICBfY29uc29sZU1l c3NhZ2VzQ2xlYXJlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLmNsZWFy TWVzc2FnZXMoKTsKQEAgLTU2Myw3ICs1NzEsOCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNv dXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfY29udGludWVUb0xpbmU6IGZ1 bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAgewotICAgICAgICB0aGlzLl9tb2RlbC5jb250aW51ZVRv TGluZSh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOworICAgICAgICB2YXIgcmF3TG9j YXRpb24gPSB0aGlzLl91aVNvdXJjZUNvZGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24obGluZU51 bWJlciwgMCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNvbnRpbnVlVG9M b2NhdGlvbihyYXdMb2NhdGlvbik7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggMTFkYjY0NWQ3 ZTRhNjExZWJmZjQwZmJhZGNjMGQxNzEyM2FlZmI0Yi4uZjFjYTJlYTNlYmYxNWMxYTEwMjVmZDZi ZWI2Y2ViN2UwMjIxZGYyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC00NzMsNiArNDczLDMzIEBAIFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJvd01lc3NhZ2UucmVwZWF0Q291bnRF bGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIgKHJlcGVhdGVkICVk IHRpbWVzKSIsIHJvd01lc3NhZ2UucmVwZWF0Q291bnQpOwogICAgIH0sCiAKKyAgICByZW1vdmVN ZXNzYWdlRnJvbVNvdXJjZTogZnVuY3Rpb24obGluZU51bWJlciwgbXNnKQorICAgIHsKKyAgICAg ICAgaWYgKGxpbmVOdW1iZXIgPj0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCisgICAgICAg ICAgICBsaW5lTnVtYmVyID0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQgLSAxOworICAgICAg ICBpZiAobGluZU51bWJlciA8IDApCisgICAgICAgICAgICBsaW5lTnVtYmVyID0gMDsKKworICAg ICAgICB2YXIgcm93TWVzc2FnZXMgPSB0aGlzLl9yb3dNZXNzYWdlc1tsaW5lTnVtYmVyXTsKKyAg ICAgICAgZm9yICh2YXIgaSA9IDA7IHJvd01lc3NhZ2VzICYmIGkgPCByb3dNZXNzYWdlcy5sZW5n dGg7ICsraSkgeworICAgICAgICAgICAgdmFyIHJvd01lc3NhZ2UgPSByb3dNZXNzYWdlc1tpXTsK KyAgICAgICAgICAgIGlmIChyb3dNZXNzYWdlLmNvbnNvbGVNZXNzYWdlICE9PSBtc2cpCisgICAg ICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIHZhciBtZXNzYWdlTGluZUVsZW1l bnQgPSByb3dNZXNzYWdlLmVsZW1lbnQ7CisgICAgICAgICAgICB2YXIgbWVzc2FnZUJ1YmJsZUVs ZW1lbnQgPSBtZXNzYWdlTGluZUVsZW1lbnQucGFyZW50RWxlbWVudDsKKyAgICAgICAgICAgIG1l c3NhZ2VCdWJibGVFbGVtZW50LnJlbW92ZUNoaWxkKG1lc3NhZ2VMaW5lRWxlbWVudCk7CisgICAg ICAgICAgICByb3dNZXNzYWdlcy5yZW1vdmUocm93TWVzc2FnZSk7CisgICAgICAgICAgICBpZiAo IXJvd01lc3NhZ2VzLmxlbmd0aCkKKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fcm93TWVz c2FnZXNbbGluZU51bWJlcl07CisgICAgICAgICAgICBpZiAoIW1lc3NhZ2VCdWJibGVFbGVtZW50 LmNoaWxkRWxlbWVudENvdW50KSB7CisgICAgICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5y ZW1vdmVEZWNvcmF0aW9uKGxpbmVOdW1iZXIsIG1lc3NhZ2VCdWJibGVFbGVtZW50KTsKKyAgICAg ICAgICAgICAgICBkZWxldGUgdGhpcy5fbWVzc2FnZUJ1YmJsZXNbbGluZU51bWJlcl07CisgICAg ICAgICAgICB9CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBw b3B1bGF0ZUxpbmVHdXR0ZXJDb250ZXh0TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUsIGxpbmVO dW1iZXIpCiAgICAgewogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDRkMWMyMTNjNzJlOGU3MGYyMzhmZjY1YTM0 ODIxM2U4Mzk1ZWQ2YWUuLmZkNDY4ZmZlNjE1NDViYjVkNGUyODJkMWY0NmVkMDQ5MjRkNzgxOTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlLmpzCkBAIC01MSwxMSArNTEsMTYgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSA9IGZ1 bmN0aW9uKGlkLCB1cmwsIGNvbnRlbnRQcm92aWRlciwgc291cmNlTWFwcGluZykKICAgICAgKi8K ICAgICB0aGlzLl9yZXF1ZXN0Q29udGVudENhbGxiYWNrcyA9IFtdOwogICAgIHRoaXMuX2xpdmVM b2NhdGlvbnMgPSBbXTsKKyAgICAvKioKKyAgICAgKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rv ci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZT59CisgICAgICovCisgICAgdGhpcy5fY29uc29s ZU1lc3NhZ2VzID0gW107CiB9CiAKIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzID0g ewogICAgIENvbnRlbnRDaGFuZ2VkOiAiQ29udGVudENoYW5nZWQiLAogICAgIENvbnNvbGVNZXNz YWdlQWRkZWQ6ICJDb25zb2xlTWVzc2FnZUFkZGVkIiwKKyAgICBDb25zb2xlTWVzc2FnZVJlbW92 ZWQ6ICJDb25zb2xlTWVzc2FnZVJlbW92ZWQiLAogICAgIENvbnNvbGVNZXNzYWdlc0NsZWFyZWQ6 ICJDb25zb2xlTWVzc2FnZXNDbGVhcmVkIgogfQogCkBAIC0yMDYsNyArMjExLDM0IEBAIFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEByZXR1 cm4ge0FycmF5LjxXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2U+fQogICAg ICAqLwotICAgIGNvbnNvbGVNZXNzYWdlczogZnVuY3Rpb24oKSB7fQorICAgIGNvbnNvbGVNZXNz YWdlczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnNvbGVNZXNz YWdlczsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUHJl c2VudGF0aW9uQ29uc29sZU1lc3NhZ2V9IG1lc3NhZ2UKKyAgICAgKi8KKyAgICBjb25zb2xlTWVz c2FnZUFkZGVkOiBmdW5jdGlvbihtZXNzYWdlKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29uc29s ZU1lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkNvbnNvbGVNZXNzYWdlQWRk ZWQsIG1lc3NhZ2UpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZX0gbWVzc2FnZQorICAgICAqLworICAgIGNv bnNvbGVNZXNzYWdlUmVtb3ZlZDogZnVuY3Rpb24obWVzc2FnZSkKKyAgICB7CisgICAgICAgIHRo aXMuX2NvbnNvbGVNZXNzYWdlcy5yZW1vdmUobWVzc2FnZSk7CisgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkNvbnNv bGVNZXNzYWdlUmVtb3ZlZCwgbWVzc2FnZSk7CisgICAgfSwKKworICAgIGNvbnNvbGVNZXNzYWdl c0NsZWFyZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdl cyA9IFtdOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZXNDbGVhcmVkKTsKKyAgICB9CiB9 CiAKIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXItY29uc29sZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLWV4cGVj dGVkLnR4dAppbmRleCA2ZTM1ZmY4NzQ5ZDUyZTZmNmE4Y2IyZWE0NDMxODM0ZjUzNzBjNWNlLi4x ZWUwZmIxOTA0MjNlY2ZhYjU5OTQxMzU0NjhmNTJhYWEzMGQyNDRkIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1h dHRlci1jb25zb2xlLWV4cGVjdGVkLnR4dApAQCAtNSw2ICs1LDEyIEBAIERlYnVnZ2VyIHdhcyBl bmFibGVkLgogCiBSdW5uaW5nOiB0ZXN0Q29uc29sZU1lc3NhZ2VzRm9yRm9ybWF0dGVkU2NyaXB0 cwogc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0bWw6MTAKK1ByZS1mb3JtYXQgcm93IG1lc3Nh Z2UgbGlzdDoKK1siOSJdCitbIjkiXQogc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0bWw6MTMK K1Bvc3QtZm9ybWF0IHJvdyBtZXNzYWdlIGxpc3Q6CitbIjEyIl0KK1siMTIiXQogRGVidWdnZXIg d2FzIGRpc2FibGVkLgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci1jb25zb2xlLmh0bWwKaW5kZXggOTQ5MTNlZTQ0ZmI2 ZGRjZTM2N2YwNzIwZDVkNzljMWRmZWVjMTZmYi4uMzVhYWE2MDU0MGNjYWQ0MDBhZjJiMzkxOTNl YjQwMzMyMGY2ODgwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdC1mb3JtYXR0ZXItY29uc29sZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWNvbnNvbGUuaHRtbApAQCAtNyw3ICs3LDcgQEAK IAogZnVuY3Rpb24gZjEoKQogewotICAgIGNvbnNvbGUubG9nKCJUZXN0IG1lc3NhZ2UuIik7Cisg ICAgY29uc29sZS5lcnJvcigiVGVzdCBtZXNzYWdlLiIpOwogfQogCiB2YXIgdGVzdCA9IGZ1bmN0 aW9uKCkKQEAgLTMwLDEyICszMCwxOCBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKICAgICAgICAg ICAgIGZ1bmN0aW9uIGRpZEV2YWx1YXRlKCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICBkdW1wQ29uc29sZU1lc3NhZ2VVUkxzKCk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIlByZS1mb3JtYXQgcm93IG1lc3NhZ2UgbGlzdDoiKTsKKyAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChKU09OLnN0cmluZ2lmeShPYmplY3Qua2V5cyhz b3VyY2VGcmFtZS5fcm93TWVzc2FnZXMpKSk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoSlNPTi5zdHJpbmdpZnkoT2JqZWN0LmtleXMoc291cmNlRnJhbWUuX21lc3Nh Z2VCdWJibGVzKSkpOwogICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lLl91aVNvdXJjZUNvZGUu c2V0Rm9ybWF0dGVkKHRydWUsIGRpZEZvcm1hdExpbmtUZXh0KTsKICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgZnVuY3Rpb24gZGlkRm9ybWF0TGlua1RleHQoKQogICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgIGR1bXBDb25zb2xlTWVzc2FnZVVSTHMoKTsKKyAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiUG9zdC1mb3JtYXQgcm93IG1lc3NhZ2UgbGlzdDoi KTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChKU09OLnN0cmluZ2lm eShPYmplY3Qua2V5cyhzb3VyY2VGcmFtZS5fcm93TWVzc2FnZXMpKSk7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoSlNPTi5zdHJpbmdpZnkoT2JqZWN0LmtleXMoc291 cmNlRnJhbWUuX21lc3NhZ2VCdWJibGVzKSkpOwogICAgICAgICAgICAgICAgIG5leHQoKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQo=