142198 2015-03-02 16:30:59 -0800 Web Inspector: Context Menu to Log a Particular Object 2015-03-02 18:41:22 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1073513 0 joepeck 2015-03-02 16:30:59 -0800 * SUMMARY Context Menu to Log a Particular Object. Given a property in an Object Tree, right clicking the property / value you should be able to "Log Value" and get a new $n for just that value. 1073520 1 247719 joepeck 2015-03-02 16:45:14 -0800 Created attachment 247719 [PATCH] Proposed Fix Looks like: http://gyazo.com/6f8fde45c0f795d57b5b264c77443968 May or may not be very useful. 1073526 2 nvasilyev 2015-03-02 16:51:33 -0800 It would be a better version of Chrome’s Store as Global Variable: https://plus.google.com/+UmarHansa/posts/1fNMTusN1Y6. Seems very useful to me! 1073559 3 joepeck 2015-03-02 18:41:22 -0800 http://trac.webkit.org/changeset/180913 247719 2015-03-02 16:45:14 -0800 2015-03-02 17:01:35 -0800 [PATCH] Proposed Fix log-value.patch text/plain 25718 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGVmMjQ3MWYuLjAzMTQ3ZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTAzLTAyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29udGV4 dCBNZW51IHRvIExvZyBhIFBhcnRpY3VsYXIgT2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIxOTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBwcm90b2NvbCBtZXRob2QgdG8gYXNzaWdu IGEgJG4gaW5kZXggdG8gYSB2YWx1ZS4gRm9yIGFuIG9iamVjdAorICAgICAgICB1c2UgdGhlIGlu amVjdGVkIHNjcmlwdCBjb250ZXh0IGZvciB0aGF0IG9iamVjdC4gRm9yIGEgdmFsdWUsIHVzZQor ICAgICAgICB0aGUgZXhlY3V0aW9uIGNvbnRleHQgdG8ga25vdyB3aGVyZSB0byBzYXZlIHRoZSB2 YWx1ZS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHA6CisgICAgICAg IChJbnNwZWN0b3I6OkluamVjdGVkU2NyaXB0OjpzYXZlUmVzdWx0KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRTb3VyY2UuanM6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JSdW50aW1l QWdlbnQuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OnNh dmVSZXN1bHQpOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUnVudGltZUFn ZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0RlYnVnZ2VyLmpzb246CisgICAg ICAgICogaW5zcGVjdG9yL3Byb3RvY29sL1J1bnRpbWUuanNvbjoKKworMjAxNS0wMy0wMiAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBDb250ZXh0IE1lbnVzIHRvIE9iamVjdCBUcmVlIHByb3BlcnRpZXMKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjEyNQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCmluZGV4 IDUzYTRlMzYuLjQ5MjA2MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC0xNzcsNiArMTc3LDIzIEBAIHZvaWQgSW5qZWN0 ZWRTY3JpcHQ6OmdldENvbGxlY3Rpb25FbnRyaWVzKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywg Y29uc3QgU3RyaW5nCiAgICAgKmVudHJpZXMgPSBCaW5kaW5nVHJhaXRzPEFycmF5PFByb3RvY29s OjpSdW50aW1lOjpDb2xsZWN0aW9uRW50cnk+Pjo6cnVudGltZUNhc3QoV1RGOjptb3ZlKHJlc3Vs dCkpOwogfQogCit2b2lkIEluamVjdGVkU2NyaXB0OjpzYXZlUmVzdWx0KEVycm9yU3RyaW5nJiBl cnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBjYWxsQXJndW1lbnRKU09OLCBJbnNwZWN0b3I6OlBy b3RvY29sOjpPcHRPdXRwdXQ8aW50Piogc2F2ZWRSZXN1bHRJbmRleCkKK3sKKyAgICBEZXByZWNh dGVkOjpTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24oaW5qZWN0ZWRTY3JpcHRPYmplY3QoKSwg QVNDSUlMaXRlcmFsKCJzYXZlUmVzdWx0IiksIGluc3BlY3RvckVudmlyb25tZW50KCktPmZ1bmN0 aW9uQ2FsbEhhbmRsZXIoKSk7CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoY2FsbEFyZ3Vt ZW50SlNPTik7CisKKyAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IHJlc3VsdDsKKyAgICBtYWtl Q2FsbChmdW5jdGlvbiwgJnJlc3VsdCk7CisgICAgaWYgKCFyZXN1bHQgfHwgcmVzdWx0LT50eXBl KCkgIT0gSW5zcGVjdG9yVmFsdWU6OlR5cGU6OkludGVnZXIpIHsKKyAgICAgICAgZXJyb3JTdHJp bmcgPSBBU0NJSUxpdGVyYWwoIkludGVybmFsIGVycm9yIik7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBpbnQgc2F2ZWRSZXN1bHRJbmRleEludCA9IDA7CisgICAgaWYgKHJlc3VsdC0+ YXNJbnRlZ2VyKHNhdmVkUmVzdWx0SW5kZXhJbnQpICYmIHNhdmVkUmVzdWx0SW5kZXhJbnQgPiAw KQorICAgICAgICAqc2F2ZWRSZXN1bHRJbmRleCA9IHNhdmVkUmVzdWx0SW5kZXhJbnQ7Cit9CisK IFJlZjxBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpEZWJ1Z2dlcjo6Q2FsbEZyYW1lPj4gSW5q ZWN0ZWRTY3JpcHQ6OndyYXBDYWxsRnJhbWVzKGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVl JiBjYWxsRnJhbWVzKQogewogICAgIEFTU0VSVCghaGFzTm9WYWx1ZSgpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaAppbmRleCBiOTk4NTRj Li5iZDQzZjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdC5oCkBAIC02MCw2ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGdldERpc3Bs YXlhYmxlUHJvcGVydGllcyhFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGJv b2wgZ2VuZXJhdGVQcmV2aWV3LCBSZWZQdHI8UHJvdG9jb2w6OkFycmF5PFByb3RvY29sOjpSdW50 aW1lOjpQcm9wZXJ0eURlc2NyaXB0b3I+PiogcmVzdWx0KTsKICAgICB2b2lkIGdldEludGVybmFs UHJvcGVydGllcyhFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGJvb2wgZ2Vu ZXJhdGVQcmV2aWV3LCBSZWZQdHI8UHJvdG9jb2w6OkFycmF5PFByb3RvY29sOjpSdW50aW1lOjpJ bnRlcm5hbFByb3BlcnR5RGVzY3JpcHRvcj4+KiByZXN1bHQpOwogICAgIHZvaWQgZ2V0Q29sbGVj dGlvbkVudHJpZXMoRXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBjb25zdCBT dHJpbmcmIG9iamVjdEdyb3VwLCBpbnQgc3RhcnRJbmRleCwgaW50IG51bWJlclRvRmV0Y2gsIFJl ZlB0cjxQcm90b2NvbDo6QXJyYXk8UHJvdG9jb2w6OlJ1bnRpbWU6OkNvbGxlY3Rpb25FbnRyeT4+ KiBlbnRyaWVzKTsKKyAgICB2b2lkIHNhdmVSZXN1bHQoRXJyb3JTdHJpbmcmLCBjb25zdCBTdHJp bmcmIGNhbGxBcmd1bWVudEpTT04sIEluc3BlY3Rvcjo6UHJvdG9jb2w6Ok9wdE91dHB1dDxpbnQ+ KiBzYXZlZFJlc3VsdEluZGV4KTsKIAogICAgIFJlZjxQcm90b2NvbDo6QXJyYXk8UHJvdG9jb2w6 OkRlYnVnZ2VyOjpDYWxsRnJhbWU+PiB3cmFwQ2FsbEZyYW1lcyhjb25zdCBEZXByZWNhdGVkOjpT Y3JpcHRWYWx1ZSYpOwogICAgIFJlZlB0cjxQcm90b2NvbDo6UnVudGltZTo6UmVtb3RlT2JqZWN0 PiB3cmFwT2JqZWN0KGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJiwgY29uc3QgU3RyaW5n JiBncm91cE5hbWUsIGJvb2wgZ2VuZXJhdGVQcmV2aWV3ID0gZmFsc2UpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJj ZS5qcyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3Vy Y2UuanMKaW5kZXggNGUyNWQ1NS4uMDI5ZTU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCkBAIC0yOTUsNiAr Mjk1LDE5IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgfSk7CiAgICAg fSwKIAorICAgIHNhdmVSZXN1bHQ6IGZ1bmN0aW9uKGNhbGxBcmd1bWVudEpTT04pCisgICAgewor ICAgICAgICB0aGlzLl9zYXZlZFJlc3VsdEluZGV4ID0gMDsKKworICAgICAgICB0cnkgeworICAg ICAgICAgICAgdmFyIGNhbGxBcmd1bWVudCA9IEluamVjdGVkU2NyaXB0SG9zdC5ldmFsdWF0ZSgi KCIgKyBjYWxsQXJndW1lbnRKU09OICsgIikiKTsKKyAgICAgICAgICAgIHZhciB2YWx1ZSA9IHRo aXMuX3Jlc29sdmVDYWxsQXJndW1lbnQoY2FsbEFyZ3VtZW50KTsKKyAgICAgICAgICAgIHRoaXMu X3NhdmVSZXN1bHQodmFsdWUpOworICAgICAgICB9IGNhdGNoIChlKSB7fQorCisgICAgICAgIHJl dHVybiB0aGlzLl9zYXZlZFJlc3VsdEluZGV4OworICAgIH0sCisKICAgICBnZXRGdW5jdGlvbkRl dGFpbHM6IGZ1bmN0aW9uKGZ1bmN0aW9uSWQpCiAgICAgewogICAgICAgICB2YXIgcGFyc2VkRnVu Y3Rpb25JZCA9IHRoaXMuX3BhcnNlT2JqZWN0SWQoZnVuY3Rpb25JZCk7CkBAIC0zNjcsOCArMzgw LDEyIEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAK LSAgICBfcmVzb2x2ZUNhbGxBcmd1bWVudDogZnVuY3Rpb24oY2FsbEFyZ3VtZW50SnNvbikgewot ICAgICAgICB2YXIgb2JqZWN0SWQgPSBjYWxsQXJndW1lbnRKc29uLm9iamVjdElkOworICAgIF9y ZXNvbHZlQ2FsbEFyZ3VtZW50OiBmdW5jdGlvbihjYWxsQXJndW1lbnRKU09OKQorICAgIHsKKyAg ICAgICAgaWYgKCJ2YWx1ZSIgaW4gY2FsbEFyZ3VtZW50SlNPTikKKyAgICAgICAgICAgIHJldHVy biBjYWxsQXJndW1lbnRKU09OLnZhbHVlOworCisgICAgICAgIHZhciBvYmplY3RJZCA9IGNhbGxB cmd1bWVudEpTT04ub2JqZWN0SWQ7CiAgICAgICAgIGlmIChvYmplY3RJZCkgewogICAgICAgICAg ICAgdmFyIHBhcnNlZEFyZ0lkID0gdGhpcy5fcGFyc2VPYmplY3RJZChvYmplY3RJZCk7CiAgICAg ICAgICAgICBpZiAoIXBhcnNlZEFyZ0lkIHx8IHBhcnNlZEFyZ0lkWyJpbmplY3RlZFNjcmlwdElk Il0gIT09IGluamVjdGVkU2NyaXB0SWQpCkBAIC0zNzksMTUgKzM5NiwxNSBAQCBJbmplY3RlZFNj cmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhyb3cgIkNvdWxkIG5vdCBmaW5k IG9iamVjdCB3aXRoIGdpdmVuIGlkIjsKIAogICAgICAgICAgICAgcmV0dXJuIHJlc29sdmVkQXJn OwotICAgICAgICB9IGVsc2UgaWYgKCJ2YWx1ZSIgaW4gY2FsbEFyZ3VtZW50SnNvbikKLSAgICAg ICAgICAgIHJldHVybiBjYWxsQXJndW1lbnRKc29uLnZhbHVlOworICAgICAgICB9CisKICAgICAg ICAgcmV0dXJuIHVuZGVmaW5lZDsKICAgICB9LAogCiAgICAgX2V2YWx1YXRlQW5kV3JhcDogZnVu Y3Rpb24oZXZhbEZ1bmN0aW9uLCBvYmplY3QsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpc0V2 YWxPbkNhbGxGcmFtZSwgaW5qZWN0Q29tbWFuZExpbmVBUEksIHJldHVybkJ5VmFsdWUsIGdlbmVy YXRlUHJldmlldywgc2F2ZVJlc3VsdCkKICAgICB7CiAgICAgICAgIHRyeSB7Ci0gICAgICAgICAg ICB0aGlzLl9zYXZlZFJlc3VsdEluZGV4ID0gdW5kZWZpbmVkOworICAgICAgICAgICAgdGhpcy5f c2F2ZWRSZXN1bHRJbmRleCA9IDA7CiAKICAgICAgICAgICAgIHZhciByZXR1cm5PYmplY3QgPSB7 CiAgICAgICAgICAgICAgICAgd2FzVGhyb3duOiBmYWxzZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JSdW50aW1l QWdlbnQuY3BwCmluZGV4IDY5NDk1NWYuLmY3MzcyYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUnVudGlt ZUFnZW50LmNwcApAQCAtMjEwLDYgKzIxMCwyNiBAQCB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2Vu dDo6Z2V0Q29sbGVjdGlvbkVudHJpZXMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdAog ICAgIGluamVjdGVkU2NyaXB0LmdldENvbGxlY3Rpb25FbnRyaWVzKGVycm9yU3RyaW5nLCBvYmpl Y3RJZCwgb2JqZWN0R3JvdXAgPyAqb2JqZWN0R3JvdXAgOiBTdHJpbmcoKSwgc3RhcnQsIGZldGNo LCAmZW50cmllcyk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yUnVudGltZUFnZW50OjpzYXZlUmVzdWx0 KEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVj dG9yT2JqZWN0PiYmIGNhbGxBcmd1bWVudCwgY29uc3QgaW50KiBleGVjdXRpb25Db250ZXh0SWQs IEluc3BlY3Rvcjo6UHJvdG9jb2w6Ok9wdE91dHB1dDxpbnQ+KiBzYXZlZFJlc3VsdEluZGV4KQor eworICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0OworCisgICAgU3RyaW5nIG9iamVj dElkOworICAgIGlmIChjYWxsQXJndW1lbnQtPmdldFN0cmluZyhBU0NJSUxpdGVyYWwoIm9iamVj dElkIiksIG9iamVjdElkKSkgeworICAgICAgICBpbmplY3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvck9iamVjdElkKG9iamVjdElkKTsKKyAgICAg ICAgaWYgKGluamVjdGVkU2NyaXB0Lmhhc05vVmFsdWUoKSkgeworICAgICAgICAgICAgZXJyb3JT dHJpbmcgPSBBU0NJSUxpdGVyYWwoIkluc3BlY3RlZCBmcmFtZSBoYXMgZ29uZSIpOworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgaW5qZWN0ZWRT Y3JpcHQgPSBpbmplY3RlZFNjcmlwdEZvckV2YWwoZXJyb3JTdHJpbmcsIGV4ZWN1dGlvbkNvbnRl eHRJZCk7CisgICAgICAgIGlmIChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCisgICAgICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgaW5qZWN0ZWRTY3JpcHQuc2F2ZVJlc3VsdChlcnJv clN0cmluZywgY2FsbEFyZ3VtZW50LT50b0pTT05TdHJpbmcoKSwgc2F2ZWRSZXN1bHRJbmRleCk7 Cit9CisKIHZvaWQgSW5zcGVjdG9yUnVudGltZUFnZW50OjpyZWxlYXNlT2JqZWN0KEVycm9yU3Ry aW5nJiwgY29uc3QgU3RyaW5nJiBvYmplY3RJZCkKIHsKICAgICBJbmplY3RlZFNjcmlwdCBpbmpl Y3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvck9i amVjdElkKG9iamVjdElkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKaW5kZXggNGI5Nzc2 My4uYmYwNWRkYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9h Z2VudHMvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKQEAgLTY2LDYgKzY2LDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBnZXRQcm9wZXJ0aWVzKEVycm9yU3RyaW5nJiwg Y29uc3QgU3RyaW5nJiBvYmplY3RJZCwgY29uc3QgYm9vbCogb3duUHJvcGVydGllcywgY29uc3Qg Ym9vbCogZ2VuZXJhdGVQcmV2aWV3LCBSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8 SW5zcGVjdG9yOjpQcm90b2NvbDo6UnVudGltZTo6UHJvcGVydHlEZXNjcmlwdG9yPj4mIHJlc3Vs dCwgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6 OlJ1bnRpbWU6OkludGVybmFsUHJvcGVydHlEZXNjcmlwdG9yPj4mIGludGVybmFsUHJvcGVydGll cykgb3ZlcnJpZGUgZmluYWw7CiAgICAgdmlydHVhbCB2b2lkIGdldERpc3BsYXlhYmxlUHJvcGVy dGllcyhFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IGJvb2wqIGdl bmVyYXRlUHJldmlldywgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3BlY3Rv cjo6UHJvdG9jb2w6OlJ1bnRpbWU6OlByb3BlcnR5RGVzY3JpcHRvcj4+JiByZXN1bHQsIFJlZlB0 cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpSdW50aW1l OjpJbnRlcm5hbFByb3BlcnR5RGVzY3JpcHRvcj4+JiBpbnRlcm5hbFByb3BlcnRpZXMpIG92ZXJy aWRlIGZpbmFsOwogICAgIHZpcnR1YWwgdm9pZCBnZXRDb2xsZWN0aW9uRW50cmllcyhFcnJvclN0 cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyogb2JqZWN0R3JvdXAs IGNvbnN0IGludCogc3RhcnRJbmRleCwgY29uc3QgaW50KiBudW1iZXJUb0ZldGNoLCBSZWZQdHI8 SW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8SW5zcGVjdG9yOjpQcm90b2NvbDo6UnVudGltZTo6 Q29sbGVjdGlvbkVudHJ5Pj4mIGVudHJpZXMpIG92ZXJyaWRlIGZpbmFsOworICAgIHZpcnR1YWwg dm9pZCBzYXZlUmVzdWx0KEVycm9yU3RyaW5nJiwgY29uc3QgUmVmUHRyPEluc3BlY3Rvcjo6SW5z cGVjdG9yT2JqZWN0PiYmIGNhbGxBcmd1bWVudCwgY29uc3QgaW50KiBleGVjdXRpb25Db250ZXh0 SWQsIEluc3BlY3Rvcjo6UHJvdG9jb2w6Ok9wdE91dHB1dDxpbnQ+KiBzYXZlZFJlc3VsdEluZGV4 KSBvdmVycmlkZSBmaW5hbDsKICAgICB2aXJ0dWFsIHZvaWQgcmVsZWFzZU9iamVjdEdyb3VwKEVy cm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCkgb3ZlcnJpZGUgZmluYWw7CiAg ICAgdmlydHVhbCB2b2lkIHJ1bihFcnJvclN0cmluZyYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg dm9pZCBnZXRSdW50aW1lVHlwZXNGb3JWYXJpYWJsZXNBdE9mZnNldHMoRXJyb3JTdHJpbmcmLCBj b25zdCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4mJiBsb2NhdGlvbnMsIFJlZlB0 cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpSdW50aW1l OjpUeXBlRGVzY3JpcHRpb24+PiYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9EZWJ1Z2dlci5qc29uIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9EZWJ1Z2dlci5qc29uCmluZGV4IDhjMzcxZmIu LmE2NTUyMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJv dG9jb2wvRGVidWdnZXIuanNvbgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3Byb3RvY29sL0RlYnVnZ2VyLmpzb24KQEAgLTIzMCw3ICsyMzAsNyBAQAogICAgICAgICAgICAg InJldHVybnMiOiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkZXRhaWxzIiwgIiRyZWYi OiAiRnVuY3Rpb25EZXRhaWxzIiwgImRlc2NyaXB0aW9uIjogIkluZm9ybWF0aW9uIGFib3V0IHRo ZSBmdW5jdGlvbi4iIH0KICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiUmV0dXJucyBkZXRhaWxlZCBpbmZvcm10YXRpb24gb24gZ2l2ZW4gZnVuY3Rpb24uIgorICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgZGV0YWlsZWQgaW5mb3JtYXRpb24gb24g Z2l2ZW4gZnVuY3Rpb24uIgogICAgICAgICB9LAogICAgICAgICB7CiAgICAgICAgICAgICAibmFt ZSI6ICJzZXRQYXVzZU9uRXhjZXB0aW9ucyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1J1bnRpbWUuanNvbiBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uCmluZGV4IGNhNGFiNTMuLjE2Y2Ew MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wv UnVudGltZS5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9j b2wvUnVudGltZS5qc29uCkBAIC0yNzQsNiArMjc0LDE3IEBACiAgICAgICAgICAgICBdCiAgICAg ICAgIH0sCiAgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1lIjogInNhdmVSZXN1bHQiLAorICAg ICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1 ZSIsICIkcmVmIjogIkNhbGxBcmd1bWVudCIsICJkZXNjcmlwdGlvbiI6ICJJZCBvciB2YWx1ZSBv ZiB0aGUgb2JqZWN0IHRvIHNhdmUuIiB9LAorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29u dGV4dElkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgIiRyZWYiOiAiRXhlY3V0aW9uQ29udGV4dElkIiwg ImRlc2NyaXB0aW9uIjogIlVuaXF1ZSBpZCBvZiB0aGUgZXhlY3V0aW9uIGNvbnRleHQuIFRvIHNw ZWNpZnkgaW4gd2hpY2ggZXhlY3V0aW9uIGNvbnRleHQgc2NyaXB0IGV2YWx1YXRpb24gc2hvdWxk IGJlIHBlcmZvcm1lZC4gSWYgbm90IHByb3ZpZGVkLCBkZXRlcm1pbmUgZnJvbSB0aGUgQ2FsbEFy Z3VtZW50J3Mgb2JqZWN0SWQuIiB9CisgICAgICAgICAgICBdLAorICAgICAgICAgICAgInJldHVy bnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzYXZlZFJlc3VsdEluZGV4IiwgInR5 cGUiOiAiaW50ZWdlciIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZiB0aGUg dmFsdWUgd2FzIHNhdmVkLCB0aGlzIGlzIHRoZSAkbiBpbmRleCB0aGF0IGNhbiBiZSB1c2VkIHRv IGFjY2VzcyB0aGUgdmFsdWUuIiB9CisgICAgICAgICAgICBdLAorICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkFzc2lnbiBhIHNhdmVkIHJlc3VsdCBpbmRleCB0byB0aGlzIHZhbHVlLiIKKyAg ICAgICAgfSwKKyAgICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAicmVsZWFzZU9iamVjdCIs CiAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjog Im9iamVjdElkIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0SWQiLCAiZGVzY3JpcHRpb24iOiAiSWRl bnRpZmllciBvZiB0aGUgb2JqZWN0IHRvIHJlbGVhc2UuIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwppbmRleCAxMDE2YjYzLi4xZmUxMTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NyBAQAogMjAxNS0wMy0wMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvbnRleHQgTWVudSB0byBMb2cgYSBQYXJ0 aWN1bGFyIE9iamVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQyMTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJv bGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xs ZXIucHJvdG90eXBlLnNhdmVSZXN1bHRDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5hcHBlbmRJbW1lZGlhdGVFeGVj dXRpb25XaXRoUmVzdWx0KToKKyAgICAgICAgQWRkIGEgd2F5IHRvIHNob3cgYW4gZXhlY3V0aW9u IGFuZCByZXN1bHQgaW1tZWRpYXRlbHkgaW4gdGhlIExvZyBWaWV3LgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVQcm9tcHQucHJvdG90eXBlLnB1c2hIaXN0b3J5SXRlbSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29uc29sZVByb21wdC5wcm90b3R5cGUuY29tbWl0VGV4dE9ySW5zZXJ0TmV3TGlu ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVByb21wdC5wcm90b3R5cGUuX2hhbmRs ZUVudGVyS2V5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0LnByb3RvdHlw ZS5fY29tbWl0SGlzdG9yeUVudHJ5KToKKyAgICAgICAgQWRkIGEgd2F5IHRvIGFwcGVuZCBhIGhp c3RvcnkgaXRlbSB0byB0aGUgY29uc29sZSBwcm9tcHQgaGlzdG9yeS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBl KToKKyAgICAgICAgQWRkIGEgY29udGV4dCBtZW51IGl0ZW0gdG8gb2JqZWN0IHRyZWUgcHJvcGVy dGllcyB0byBsb2cgdGhlIHZhbHVlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2Nv bC9SZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmNy ZWF0ZUNhbGxBcmd1bWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnBy b3RvdHlwZS5jYWxsRnVuY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dC5wcm90b3R5cGUuYXNDYWxsQXJndW1lbnQpOgorICAgICAgICBTaW1wbGlmeSBDYWxsQXJndW1l bnQgY3JlYXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRp bWVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3Rv dHlwZS5teWNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5w cm90b3R5cGUuc2F2ZVJlc3VsdCk6CisgICAgICAgIFdyYXAgUnVudGltZUFnZW50LnNhdmVSZXN1 bHQuIElmIHN1cHBvcnRlZCwgcnVuIHRoZSBiYWNrZW5kIGNvbW1hbmQKKyAgICAgICAgYW5kIGZl dGNoIGEgc2F2ZWQgcmVzdWx0IGluZGV4IGZyb20gdGhlIGJhY2tlbmQgZm9yIHRoZSBnaXZlbiB2 YWx1ZS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3 LnByb3RvdHlwZS5nZXQgbG9nVmlld0NvbnRyb2xsZXIpOgorICAgICAgICBNaXNjLgorCisyMDE1 LTAzLTAyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAg V2ViIEluc3BlY3RvcjogQWRkIENvbnRleHQgTWVudXMgdG8gT2JqZWN0IFRyZWUgcHJvcGVydGll cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMTI1 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDY0MjNhNGQxMTliNzgyODdl MGQxMGU2NzE4OGY0NGJhZTAxNTFhNTAuLmYwMWRmYWFmYWNlNmVlNmNiMjk1MTIzOTM0ODMwMjEw ODhjOGU4Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMjg2LDYgKzI4 Niw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkxvY2FsIFZhcmlhYmxlcyJdID0gIkxvY2FsIFZhcmlh YmxlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2NhdGVkIGF0ICVzIl0gPSAiTG9jYXRlZCBhdCAl cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2NhdGlvbiJdID0gIkxvY2F0aW9uIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkxvZyBNZXNzYWdlIl0gPSAiTG9nIE1lc3NhZ2UiOworbG9jYWxpemVkU3RyaW5n c1siTG9nIFZhbHVlIl0gPSAiTG9nIFZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZzogIl0g PSAiTG9nOiAiOwogbG9jYWxpemVkU3RyaW5nc1siTG9ncyJdID0gIkxvZ3MiOwogbG9jYWxpemVk U3RyaW5nc1siTUlNRSBUeXBlIl0gPSAiTUlNRSBUeXBlIjsKQEAgLTQwMiw2ICs0MDMsNyBAQCBs b2NhbGl6ZWRTdHJpbmdzWyJTZWN1cml0eSBJc3N1ZSJdID0gIlNlY3VyaXR5IElzc3VlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlNlbGVjdGVkIl0gPSAiU2VsZWN0ZWQiOwogbG9jYWxpemVkU3RyaW5n c1siU2VsZWN0ZWQgSXRlbSJdID0gIlNlbGVjdGVkIEl0ZW0iOwogbG9jYWxpemVkU3RyaW5nc1si U2VsZWN0ZWQgSXRlbXMiXSA9ICJTZWxlY3RlZCBJdGVtcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJT ZWxlY3RlZCBWYWx1ZSJdID0gIlNlbGVjdGVkIFZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNl bGYgVGltZSJdID0gIlNlbGYgVGltZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZW1hbnRpYyBJc3N1 ZSJdID0gIlNlbWFudGljIElzc3VlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlc3Npb24iXSA9ICJT ZXNzaW9uIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcwppbmRleCAyMWM1N2Y5Li5kMDRiODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0yMjcsNiArMjI3LDcgQEAgV2Vi SW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fY29uc29sZVJl cHJlc2VudGVkT2JqZWN0ID0gbmV3IFdlYkluc3BlY3Rvci5Mb2dPYmplY3Q7CiAgICAgdGhpcy5f Y29uc29sZVRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Mb2dUcmVlRWxlbWVudCh0aGlz Ll9jb25zb2xlUmVwcmVzZW50ZWRPYmplY3QpOwogICAgIHRoaXMuY29uc29sZUNvbnRlbnRWaWV3 ID0gV2ViSW5zcGVjdG9yLmNvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRP YmplY3QodGhpcy5fY29uc29sZVJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICB0aGlzLmNvbnNvbGVM b2dWaWV3Q29udHJvbGxlciA9IHRoaXMuY29uc29sZUNvbnRlbnRWaWV3LmxvZ1ZpZXdDb250cm9s bGVyOwogCiAgICAgLy8gRklYTUU6IFRoZSBzaWRlYmFycyBzaG91bGQgYmUgZmxpcHBlZCBpbiBS VEwgbGFuZ3VhZ2VzLgogICAgIHRoaXMubGVmdFNpZGViYXIgPSB0aGlzLm5hdmlnYXRpb25TaWRl YmFyID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJu YXZpZ2F0aW9uLXNpZGViYXIiKSwgV2ViSW5zcGVjdG9yLlNpZGViYXIuU2lkZXMuTGVmdCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMK aW5kZXggYjc1NDc1Mi4uZDhhZTMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwpAQCAtMTMwLDYgKzEzMCwyMiBAQCBXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAg Y29uc29sZUdyb3VwLmVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoKTsKICAgICB9LAogCisgICAgYXBw ZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3VsdDogZnVuY3Rpb24odGV4dCwgcmVzdWx0KQor ICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQocmVzdWx0IGluc3RhbmNlb2YgV2ViSW5zcGVj dG9yLlJlbW90ZU9iamVjdCk7CisKKyAgICAgICAgdmFyIGNvbW1hbmRNZXNzYWdlID0gbmV3IFdl Ykluc3BlY3Rvci5Db25zb2xlQ29tbWFuZCh0ZXh0KTsKKyAgICAgICAgdGhpcy5fYXBwZW5kQ29u c29sZU1lc3NhZ2UoY29tbWFuZE1lc3NhZ2UsIHRydWUpOworCisgICAgICAgIGZ1bmN0aW9uIHNh dmVSZXN1bHRDYWxsYmFjayhzYXZlZFJlc3VsdEluZGV4KQorICAgICAgICB7CisgICAgICAgICAg ICB2YXIgY29tbWFuZFJlc3VsdE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kUmVzdWx0KHJlc3VsdCwgZmFsc2UsIGNvbW1hbmRNZXNzYWdlLCBzYXZlZFJlc3VsdEluZGV4 KTsKKyAgICAgICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKGNvbW1hbmRSZXN1bHRN ZXNzYWdlLCB0cnVlKTsKKyAgICAgICAgfQorCisgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1l TWFuYWdlci5zYXZlUmVzdWx0KHJlc3VsdCwgc2F2ZVJlc3VsdENhbGxiYWNrLmJpbmQodGhpcykp OworICAgIH0sCisKICAgICBhcHBlbmRDb25zb2xlTWVzc2FnZTogZnVuY3Rpb24oY29uc29sZU1l c3NhZ2UpCiAgICAgewogICAgICAgICAvLyBDbG9uZSB0aGUgbWVzc2FnZSBzaW5jZSB0aGVyZSBt aWdodCBiZSBtdWx0aXBsZSBjbGllbnRzIHVzaW5nIHRoZSBtZXNzYWdlLApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1h bmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9SdW50aW1lTWFuYWdlci5qcwppbmRleCBmNzEwNmE0Li5kMzBlODUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9SdW50aW1lTWFuYWdlci5qcwpAQCAtNzksNiArNzksMjYgQEAgV2ViSW5zcGVjdG9yLlJ1 bnRpbWVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRl Lmludm9rZSh7ZXhwcmVzc2lvbjogZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6IG9iamVjdEdyb3Vw LCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0 ZUNvbnNvbGUsIGNvbnRleHRJZDogY29udGV4dElkLCBmcmFtZUlkOiBjb250ZXh0SWQsIHJldHVy bkJ5VmFsdWU6IHJldHVybkJ5VmFsdWUsIGdlbmVyYXRlUHJldmlldzogZ2VuZXJhdGVQcmV2aWV3 LCBzYXZlUmVzdWx0OiBzYXZlUmVzdWx0fSwgZXZhbENhbGxiYWNrLmJpbmQodGhpcykpOwogICAg IH0sCiAKKyAgICBzYXZlUmVzdWx0OiBmdW5jdGlvbihyZW1vdGVPYmplY3QsIGNhbGxiYWNrKQor ICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQocmVtb3RlT2JqZWN0IGluc3RhbmNlb2YgV2Vi SW5zcGVjdG9yLlJlbW90ZU9iamVjdCk7CisKKyAgICAgICAgaWYgKCFSdW50aW1lQWdlbnQuc2F2 ZVJlc3VsdCkgeworICAgICAgICAgICAgY2FsbGJhY2sodW5kZWZpbmVkKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIG15Y2FsbGJhY2soZXJyb3Is IHNhdmVkUmVzdWx0SW5kZXgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKHNhdmVk UmVzdWx0SW5kZXgpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHJlbW90ZU9iamVjdC5vYmpl Y3RJZCkKKyAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5zYXZlUmVzdWx0KHJlbW90ZU9iamVjdC5h c0NhbGxBcmd1bWVudCgpLCBteWNhbGxiYWNrKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg UnVudGltZUFnZW50LnNhdmVSZXN1bHQocmVtb3RlT2JqZWN0LmFzQ2FsbEFyZ3VtZW50KCksIFdl Ykluc3BlY3Rvci5xdWlja0NvbnNvbGUuZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIsIG15Y2Fs bGJhY2spOworICAgIH0sCisKICAgICBnZXRQcm9wZXJ0aWVzRm9yUmVtb3RlT2JqZWN0OiBmdW5j dGlvbihvYmplY3RJZCwgY2FsbGJhY2spCiAgICAgewogICAgICAgICBSdW50aW1lQWdlbnQuZ2V0 UHJvcGVydGllcyhvYmplY3RJZCwgZnVuY3Rpb24oZXJyb3IsIHJlc3VsdCkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2Jq ZWN0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVt b3RlT2JqZWN0LmpzCmluZGV4IDJhNGFiYTAuLjNkM2Y5NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90ZU9iamVjdC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmpl Y3QuanMKQEAgLTgyLDYgKzgyLDE3IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBh eWxvYWQgPSBmdW5jdGlvbihwYXlsb2FkKQogICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdChwYXlsb2FkLm9iamVjdElkLCBwYXlsb2FkLnR5cGUsIHBheWxvYWQuc3VidHlw ZSwgcGF5bG9hZC52YWx1ZSwgcGF5bG9hZC5kZXNjcmlwdGlvbiwgcGF5bG9hZC5wcmV2aWV3KTsK IH07CiAKK1dlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuY3JlYXRlQ2FsbEFyZ3VtZW50ID0gZnVu Y3Rpb24odmFsdWVPck9iamVjdCkKK3sKKyAgICBpZiAodmFsdWVPck9iamVjdCBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QpIHsKKyAgICAgICAgaWYgKHZhbHVlT3JPYmplY3Qu b2JqZWN0SWQpCisgICAgICAgICAgICByZXR1cm4ge29iamVjdElkOiB2YWx1ZU9yT2JqZWN0Lm9i amVjdElkfTsKKyAgICAgICAgcmV0dXJuIHt2YWx1ZTogdmFsdWVPck9iamVjdC52YWx1ZX07Cisg ICAgfQorCisgICAgcmV0dXJuIHt2YWx1ZTogdmFsdWVPck9iamVjdH07Cit9OworCiBXZWJJbnNw ZWN0b3IuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlID0gZnVuY3Rpb24obm9kZSwgb2JqZWN0R3Jv dXAsIGNhbGxiYWNrKQogewogICAgIERPTUFnZW50LnJlc29sdmVOb2RlKG5vZGUuaWQsIG9iamVj dEdyb3VwLCBmdW5jdGlvbihlcnJvciwgb2JqZWN0KSB7CkBAIC00MTMsMTYgKzQyNCw4IEBAIFdl Ykluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FsbGJh Y2soZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChh cmdzKSB7Ci0gICAgICAgICAgICBhcmdzID0gYXJncy5tYXAoZnVuY3Rpb24oYXJnKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKGFyZyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3Qp IHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGFyZy5vYmplY3RJZCkKLSAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiB7b2JqZWN0SWQ6IGFyZy5vYmplY3RJZH07Ci0gICAgICAgICAgICAg ICAgICAgIHJldHVybiB7dmFsdWU6IGFyZy52YWx1ZX07Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgIHJldHVybiB7dmFsdWU6IGFyZ307Ci0gICAgICAgICAgICB9KTsKLSAgICAg ICAgfQorICAgICAgICBpZiAoYXJncykKKyAgICAgICAgICAgIGFyZ3MgPSBhcmdzLm1hcChXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0LmNyZWF0ZUNhbGxBcmd1bWVudCk7CiAKICAgICAgICAgUnVu dGltZUFnZW50LmNhbGxGdW5jdGlvbk9uKHRoaXMuX29iamVjdElkLCBmdW5jdGlvbkRlY2xhcmF0 aW9uLnRvU3RyaW5nKCksIGFyZ3MsIHRydWUsIHVuZGVmaW5lZCwgZ2VuZXJhdGVQcmV2aWV3LCBt eWNhbGxiYWNrKTsKICAgICB9LApAQCAtNDkyLDYgKzQ5NSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVt b3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHBhcnNlSW50KG1hdGNoZXNb MV0sIDEwKTsKICAgICB9LAogCisgICAgYXNDYWxsQXJndW1lbnQ6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmNyZWF0ZUNhbGxBcmd1 bWVudCh0aGlzKTsKKyAgICB9LAorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3dlYWtDb2xsZWN0 aW9uT2JqZWN0R3JvdXA6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzCmluZGV4IDUwODFi NTkuLjdhY2M0N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVByb21wdC5qcwpAQCAtMTQwLDYgKzE0MCwxMSBAQCBX ZWJJbnNwZWN0b3IuQ29uc29sZVByb21wdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2Nv bXBsZXRpb25Db250cm9sbGVyLnVwZGF0ZUNvbXBsZXRpb25zKGNvbXBsZXRpb25zLCBpbXBsaWNp dFN1ZmZpeCk7CiAgICAgfSwKIAorICAgIHB1c2hIaXN0b3J5SXRlbTogZnVuY3Rpb24odGV4dCkK KyAgICB7CisgICAgICAgIHRoaXMuX2NvbW1pdEhpc3RvcnlFbnRyeSh7dGV4dDogdGV4dH0pOwor ICAgIH0sCisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGNvbXBsZXRpb25Db250cm9sbGVyQ29t cGxldGlvbnNOZWVkZWQ6IGZ1bmN0aW9uKGNvbXBsZXRpb25Db250cm9sbGVyLCBwcmVmaXgsIGRl ZmF1bHRDb21wbGV0aW9ucywgYmFzZSwgc3VmZml4LCBmb3JjZWQpCkBAIC0yMzksMjMgKzI0NCw3 IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBoaXN0b3J5RW50 cnkgPSB0aGlzLl9oaXN0b3J5RW50cnlGb3JDdXJyZW50VGV4dCgpOwotCi0gICAgICAgICAgICAv LyBSZXBsYWNlIHRoZSBwcmV2aW91cyBlbnRyeSBpZiBpdCBkb2VzIG5vdCBoYXZlIHRleHQgb3Ig aWYgdGhlIHRleHQgaXMgdGhlIHNhbWUuCi0gICAgICAgICAgICBpZiAodGhpcy5faGlzdG9yeVsx XSAmJiAoIXRoaXMuX2hpc3RvcnlbMV0udGV4dCB8fCB0aGlzLl9oaXN0b3J5WzFdLnRleHQgPT09 IGhpc3RvcnlFbnRyeS50ZXh0KSkgewotICAgICAgICAgICAgICAgIHRoaXMuX2hpc3RvcnlbMV0g PSBoaXN0b3J5RW50cnk7Ci0gICAgICAgICAgICAgICAgdGhpcy5faGlzdG9yeVswXSA9IHt9Owot ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBSZXBsYWNlIHRoZSBmaXJz dCBoaXN0b3J5IGVudHJ5IGFuZCBwdXNoIGEgbmV3IGVtcHR5IG9uZS4KLSAgICAgICAgICAgICAg ICB0aGlzLl9oaXN0b3J5WzBdID0gaGlzdG9yeUVudHJ5OwotICAgICAgICAgICAgICAgIHRoaXMu X2hpc3RvcnkudW5zaGlmdCh7fSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBUcmltIHRoZSBoaXN0 b3J5IGxlbmd0aCBpZiBuZWVkZWQuCi0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX2hpc3Rvcnku bGVuZ3RoID4gV2ViSW5zcGVjdG9yLkNvbnNvbGVQcm9tcHQuTWF4aW11bUhpc3RvcnlTaXplKQot ICAgICAgICAgICAgICAgICAgICB0aGlzLl9oaXN0b3J5ID0gdGhpcy5faGlzdG9yeS5zbGljZSgw LCBXZWJJbnNwZWN0b3IuQ29uc29sZVByb21wdC5NYXhpbXVtSGlzdG9yeVNpemUpOwotICAgICAg ICAgICAgfQotCi0gICAgICAgICAgICB0aGlzLl9oaXN0b3J5SW5kZXggPSAwOworICAgICAgICAg ICAgdGhpcy5fY29tbWl0SGlzdG9yeUVudHJ5KHRoaXMuX2hpc3RvcnlFbnRyeUZvckN1cnJlbnRU ZXh0KCkpOwogCiAgICAgICAgICAgICB0aGlzLl9jb2RlTWlycm9yLnNldFZhbHVlKCIiKTsKICAg ICAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3IuY2xlYXJIaXN0b3J5KCk7CkBAIC0yNzUsNiArMjY0 LDI1IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAg Y29tbWl0VGV4dE9ySW5zZXJ0TmV3TGluZS5jYWxsKHRoaXMsIHRydWUpOwogICAgIH0sCiAKKyAg ICBfY29tbWl0SGlzdG9yeUVudHJ5OiBmdW5jdGlvbihoaXN0b3J5RW50cnkpCisgICAgeworICAg ICAgICAvLyBSZXBsYWNlIHRoZSBwcmV2aW91cyBlbnRyeSBpZiBpdCBkb2VzIG5vdCBoYXZlIHRl eHQgb3IgaWYgdGhlIHRleHQgaXMgdGhlIHNhbWUuCisgICAgICAgIGlmICh0aGlzLl9oaXN0b3J5 WzFdICYmICghdGhpcy5faGlzdG9yeVsxXS50ZXh0IHx8IHRoaXMuX2hpc3RvcnlbMV0udGV4dCA9 PT0gaGlzdG9yeUVudHJ5LnRleHQpKSB7CisgICAgICAgICAgICB0aGlzLl9oaXN0b3J5WzFdID0g aGlzdG9yeUVudHJ5OworICAgICAgICAgICAgdGhpcy5faGlzdG9yeVswXSA9IHt9OworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgLy8gUmVwbGFjZSB0aGUgZmlyc3QgaGlzdG9yeSBlbnRy eSBhbmQgcHVzaCBhIG5ldyBlbXB0eSBvbmUuCisgICAgICAgICAgICB0aGlzLl9oaXN0b3J5WzBd ID0gaGlzdG9yeUVudHJ5OworICAgICAgICAgICAgdGhpcy5faGlzdG9yeS51bnNoaWZ0KHt9KTsK KworICAgICAgICAgICAgLy8gVHJpbSB0aGUgaGlzdG9yeSBsZW5ndGggaWYgbmVlZGVkLgorICAg ICAgICAgICAgaWYgKHRoaXMuX2hpc3RvcnkubGVuZ3RoID4gV2ViSW5zcGVjdG9yLkNvbnNvbGVQ cm9tcHQuTWF4aW11bUhpc3RvcnlTaXplKQorICAgICAgICAgICAgICAgIHRoaXMuX2hpc3Rvcnkg PSB0aGlzLl9oaXN0b3J5LnNsaWNlKDAsIFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0Lk1heGlt dW1IaXN0b3J5U2l6ZSk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9oaXN0b3J5SW5kZXgg PSAwOworICAgIH0sCisKICAgICBfaGFuZGxlQ29tbWFuZEVudGVyS2V5OiBmdW5jdGlvbihjb2Rl TWlycm9yKQogICAgIHsKICAgICAgICAgdGhpcy5faGFuZGxlRW50ZXJLZXkoY29kZU1pcnJvciwg dHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDMzM2MyMDIuLjNjOWYwNTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0xMjUsNiArMTI1LDExIEBAIFdlYkluc3BlY3Rvci5Mb2dD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zY29wZUJhcjsK ICAgICB9LAogCisgICAgZ2V0IGxvZ1ZpZXdDb250cm9sbGVyKCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLl9sb2dWaWV3Q29udHJvbGxlcjsKKyAgICB9LAorCiAgICAgdXBkYXRlTGF5b3V0 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJv dG90eXBlLnVwZGF0ZUxheW91dC5jYWxsKHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1l bnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RU cmVlUHJvcGVydHlUcmVlRWxlbWVudC5qcwppbmRleCA0ZDcyMDA5Li4yZTYxZDE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVl UHJvcGVydHlUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5qcwpAQCAtNDczLDYg KzQ3MywyMiBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAorICAgIF9sb2dWYWx1ZTogZnVuY3Rpb24o dmFsdWUpCisgICAgeworICAgICAgICB2YXIgcmVzb2x2ZWRWYWx1ZSA9IHZhbHVlIHx8IHRoaXMu X3Jlc29sdmVkVmFsdWUoKTsKKyAgICAgICAgaWYgKCFyZXNvbHZlZFZhbHVlKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHZhciBwcm9wZXJ0eVBhdGggPSB0aGlzLl9yZXNvbHZlZFZh bHVlUHJvcGVydHlQYXRoKCk7CisgICAgICAgIHZhciBpc0ltcG9zc2libGUgPSBwcm9wZXJ0eVBh dGguaXNGdWxsUGF0aEltcG9zc2libGUoKTsKKyAgICAgICAgdmFyIHRleHQgPSBpc0ltcG9zc2li bGUgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdGVkIFZhbHVlIikgOiBwcm9wZXJ0eVBh dGguZGlzcGxheVBhdGgodGhpcy5fcHJvcGVydHlQYXRoVHlwZSgpKTsKKworICAgICAgICBpZiAo IWlzSW1wb3NzaWJsZSkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5xdWlja0NvbnNvbGUucHJv bXB0LnB1c2hIaXN0b3J5SXRlbSh0ZXh0KTsKKworICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29s ZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4ZWN1dGlvbldpdGhSZXN1bHQodGV4 dCwgcmVzb2x2ZWRWYWx1ZSk7CisgICAgfSwKKwogICAgIF9jb250ZXh0TWVudUhhbmRsZXI6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHJlc29sdmVkVmFsdWUgPSB0aGlzLl9y ZXNvbHZlZFZhbHVlKCk7CkBAIC00ODAsNiArNDk2LDcgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFRy ZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51 KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkxvZyBWYWx1ZSIpLCB0aGlzLl9sb2dWYWx1ZS5iaW5kKHRoaXMpKTsKIAogICAgICAg ICB2YXIgcHJvcGVydHlQYXRoID0gdGhpcy5fcmVzb2x2ZWRWYWx1ZVByb3BlcnR5UGF0aCgpOwog ICAgICAgICBpZiAocHJvcGVydHlQYXRoICYmICFwcm9wZXJ0eVBhdGguaXNGdWxsUGF0aEltcG9z c2libGUoKSkgewo=