158548 2016-06-08 15:46:11 -0700 REGRESSION: Web Inspector: Should be able to evaluate "{a:1, b:2}" in the console 2016-06-08 23:19:30 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1200640 0 joepeck 2016-06-08 15:46:11 -0700 * Summary Web Inspector: Should be able to evaluate "{a:1, b:2}" in the console * Notes - Looks like this regressed when adding the console evaluation names - The sourceURL is appended to the evaluation text before runtime manager has looked at it - And runtime manager is where we add the convenience > consolePromptTextCommitted(prompt, text) > { > ... > text = appendWebInspectorConsoleEvaluationSourceURL(text); > > WebInspector.runtimeManager.evaluateInInspectedWindow(text, WebInspector.RuntimeManager.ConsoleObjectGroup, true, false, false, true, true, printResult.bind(this)); > } > evaluateInInspectedWindow(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, saveResult, callback) > { > if (!expression) { > // There is no expression, so the completion should happen against global properties. > expression = "this"; > } else if (/^\s*\{/.test(expression) && /\}\s*$/.test(expression)) { > // Transform {a:1} to ({a:1}) so it is treated like an object literal instead of a block with a label. > expression = "(" + expression + ")"; > } > ... 1200641 1 joepeck 2016-06-08 15:47:05 -0700 Lets just move the convenience to consolePromptTextCommitted. It really is the only place I think we expect this to happen right now. 1200646 2 webkit-bug-importer 2016-06-08 15:49:13 -0700 <rdar://problem/26708513> 1200693 3 280866 joepeck 2016-06-08 18:45:48 -0700 Created attachment 280866 [PATCH] Proposed Fix 1200738 4 280866 commit-queue 2016-06-08 23:19:26 -0700 Comment on attachment 280866 [PATCH] Proposed Fix Clearing flags on attachment: 280866 Committed r201855: <http://trac.webkit.org/changeset/201855> 1200739 5 commit-queue 2016-06-08 23:19:30 -0700 All reviewed patches have been landed. Closing bug. 280866 2016-06-08 18:45:48 -0700 2016-06-08 23:19:26 -0700 [PATCH] Proposed Fix fix-it.patch text/plain 25600 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOTUzOGEzLi4wYTc0YmIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTYtMDYt MDggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdS RVNTSU9OOiBXZWIgSW5zcGVjdG9yOiBTaG91bGQgYmUgYWJsZSB0byBldmFsdWF0ZSAie2E6MSwg YjoyfSIgaW4gdGhlIGNvbnNvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1ODU0OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjY3MDg1MTM+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvY29uc29sZS9hZGRJbnNwZWN0ZWROb2RlLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Nv bnNvbGUvY29tbWFuZC1saW5lLWFwaS1jb3B5Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Nv bnNvbGUvY29tbWFuZC1saW5lLWFwaS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xl L2NvbnNvbGUtYXBpLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10 YWJsZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL21lc3NhZ2VzQ2xlYXJlZC5o dG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb250cm9sbGVyL3J1bnRpbWUtY29udHJvbGxlci5o dG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9jb21tYW5kLWxpbmUtYXBpLWV4Y2Vw dGlvbi1uZXN0ZWQtY2F0Y2guaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvY29t bWFuZC1saW5lLWFwaS1leGNlcHRpb24uaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvbW9kZWwv cmVtb3RlLW9iamVjdC1nZXQtcHJvcGVydGllcy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9t b2RlbC9yZW1vdGUtb2JqZWN0LXdlYWstY29sbGVjdGlvbi5odG1sOgorICAgICAgICAqIGluc3Bl Y3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3RpbWVs aW5lL2V4Y2VwdGlvbi1pbi1pbmplY3RlZC1zY3JpcHQtd2hpbGUtcmVjb3JkaW5nLmh0bWw6Cisg ICAgICAgIFVwZGF0ZSBldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93IGNhbGxzaXRlcyB0byB1c2Ug b3B0aW9ucyBkaWN0aW9uYXJ5LgorCiAyMDE2LTA2LTA1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp dC5vcmc+CiAKICAgICAgICAgQWRkIGV4cGVyaW1lbnRhbCBzdXBwb3J0IGZvciBzcHJpbmcgYmFz ZWQgQ1NTIGFuaW1hdGlvbnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25z b2xlL2FkZEluc3BlY3RlZE5vZGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xl L2FkZEluc3BlY3RlZE5vZGUuaHRtbAppbmRleCAzZWZiNTI3Li5jNDk2MzE5IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9hZGRJbnNwZWN0ZWROb2RlLmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvYWRkSW5zcGVjdGVkTm9kZS5odG1sCkBA IC02LDEzICs2LDcgQEAKIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIGZ1bmN0aW9uIGV2YWx1YXRl JDAoY2FsbGJhY2spIHsKLSAgICAgICAgY29uc3Qgb2JqZWN0R3JvdXAgPSAidGVzdCI7Ci0gICAg ICAgIGNvbnN0IGluY2x1ZGVDb21tYW5kTGluZUFQSSA9IHRydWU7Ci0gICAgICAgIGNvbnN0IGln bm9yZVBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZSA9IGZhbHNlOwotICAgICAgICBjb25zdCBzaG91 bGRSZXR1cm5CeVZhbHVlID0gZmFsc2U7Ci0gICAgICAgIGNvbnN0IHNob3VsZEdlbmVyYXRlUHJl dmlldyA9IGZhbHNlOwotICAgICAgICBjb25zdCBzaG91bGRTYXZlUmVzdWx0ID0gZmFsc2U7Ci0g ICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2lu ZG93KCIkMCIsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGlnbm9yZVBhdXNl T25FeGNlcHRpb25zQW5kTXV0ZSwgc2hvdWxkUmV0dXJuQnlWYWx1ZSwgc2hvdWxkR2VuZXJhdGVQ cmV2aWV3LCBzaG91bGRTYXZlUmVzdWx0LCBjYWxsYmFjayk7CisgICAgICAgIFdlYkluc3BlY3Rv ci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCIkMCIsIHtvYmplY3RH cm91cDogInRlc3QiLCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IHRydWV9LCBjYWxsYmFjayk7CiAg ICAgfQogCiAgICAgbGV0IG5vZGVBLCBub2RlQjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9jb25zb2xlL2NvbW1hbmQtbGluZS1hcGktY29weS5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2NvbnNvbGUvY29tbWFuZC1saW5lLWFwaS1jb3B5Lmh0bWwKaW5kZXggOGNjOTM3 Ny4uNmQ5M2Y1NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29t bWFuZC1saW5lLWFwaS1jb3B5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNv bGUvY29tbWFuZC1saW5lLWFwaS1jb3B5Lmh0bWwKQEAgLTIyLDE0ICsyMiw4IEBAIGZ1bmN0aW9u IHRlc3QoKQogICAgIH0KIAogICAgIGZ1bmN0aW9uIGNvbW1hbmRMaW5lQVBJQ29weUFuZFBhc3Rl KGV4cHJlc3Npb24sIGNhbGxiYWNrKSB7Ci0gICAgICAgIGNvbnN0IG9iamVjdEdyb3VwID0gInRl c3QiOwotICAgICAgICBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEkgPSB0cnVlOwotICAgICAg ICBjb25zdCBpZ25vcmVQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGUgPSBmYWxzZTsKLSAgICAgICAg Y29uc3Qgc2hvdWxkUmV0dXJuQnlWYWx1ZSA9IGZhbHNlOwotICAgICAgICBjb25zdCBzaG91bGRH ZW5lcmF0ZVByZXZpZXcgPSBmYWxzZTsKLSAgICAgICAgY29uc3Qgc2hvdWxkU2F2ZVJlc3VsdCA9 IGZhbHNlOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydCh0eXBlb2YgZXhwcmVzc2lvbiA9 PT0gInN0cmluZyIsICJUZXN0IHJlcXVpcmVzIHN0cmluZyBleHByZXNzaW9uIHRvIGV2YWx1YXRl IG9uIHRoZSBwYWdlLiIpOwotICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZh bHVhdGVJbkluc3BlY3RlZFdpbmRvdyhgY29weSgke2V4cHJlc3Npb259KWAsIG9iamVjdEdyb3Vw LCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGlnbm9yZVBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZSwg c2hvdWxkUmV0dXJuQnlWYWx1ZSwgc2hvdWxkR2VuZXJhdGVQcmV2aWV3LCBzaG91bGRTYXZlUmVz dWx0LCAoKSA9PiB7CisgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0 ZUluSW5zcGVjdGVkV2luZG93KGBjb3B5KCR7ZXhwcmVzc2lvbn0pYCwge29iamVjdEdyb3VwOiAi dGVzdCIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogdHJ1ZX0sICgpID0+IHsKICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInBhc3RlQW5kUmV0dXJuU3RyaW5nKCkiLCAo ZXJyb3IsIHJlbW90ZU9iamVjdFBheWxvYWQpID0+IHsKICAgICAgICAgICAgICAgICBsZXQgcmVt b3RlT2JqZWN0ID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZW1vdGVP YmplY3RQYXlsb2FkKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChyZW1v dGVPYmplY3QudHlwZSA9PT0gInN0cmluZyIsICJSZW1vdGVPYmplY3QgZnJvbSBwYXN0ZUFuZFJl dHVyblN0cmluZyBzaG91bGQgcmV0dXJuIGEgc3RyaW5nLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29tbWFuZC1saW5lLWFwaS5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29tbWFuZC1saW5lLWFwaS5odG1sCmluZGV4IDBiMmQ0YTYu LjBjNGQyZjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbW1h bmQtbGluZS1hcGkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb21t YW5kLWxpbmUtYXBpLmh0bWwKQEAgLTY5LDEzICs2OSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg ICAgICAgICAgICAgICAgICAgICAgcmVqZWN0KCk7CiAgICAgICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICAgICAgY29uc3Qgb2JqZWN0R3JvdXAgPSAidGVzdCI7Ci0gICAgICAgICAgICAgICAg Y29uc3QgaW5jbHVkZUNvbW1hbmRMaW5lQVBJID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICBjb25z dCBpZ25vcmVQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGUgPSBmYWxzZTsKLSAgICAgICAgICAgICAg ICBjb25zdCBzaG91bGRSZXR1cm5CeVZhbHVlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgY29u c3Qgc2hvdWxkR2VuZXJhdGVQcmV2aWV3ID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgY29uc3Qg c2hvdWxkU2F2ZVJlc3VsdCA9IGZhbHNlOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5y dW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KGBTdHJpbmcoJHtpbnB1dH0p YCwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgaWdub3JlUGF1c2VPbkV4Y2Vw dGlvbnNBbmRNdXRlLCBzaG91bGRSZXR1cm5CeVZhbHVlLCBzaG91bGRHZW5lcmF0ZVByZXZpZXcs IHNob3VsZFNhdmVSZXN1bHQsIGNhbGxiYWNrKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhgU3RyaW5nKCR7aW5w dXR9KWAsIHtvYmplY3RHcm91cDogInRlc3QiLCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IHRydWV9 LCBjYWxsYmFjayk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0pCiAgICAgfQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1hcGkuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtYXBpLmh0bWwKaW5kZXggMDQzM2ExOS4u MWU4NzI0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29s ZS1hcGkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWFw aS5odG1sCkBAIC02Niw3ICs2Niw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIH0pOwogCiAgICAg Zm9yICh2YXIgc3RlcCBvZiBzdGVwcykKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5h Z2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coc3RlcCwgInRlc3QiLCBmYWxzZSwgdHJ1ZSwg ZmFsc2UsIHRydWUsIGZhbHNlLCBmdW5jdGlvbigpe30pOworICAgICAgICBXZWJJbnNwZWN0b3Iu cnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhzdGVwLCB7b2JqZWN0R3Jv dXA6ICJ0ZXN0IiwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlLCBn ZW5lcmF0ZVByZXZpZXc6IHRydWV9LCBmdW5jdGlvbigpe30pOwogfQogPC9zY3JpcHQ+CiA8L2hl YWQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXRh YmxlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXRhYmxlLmh0 bWwKaW5kZXggNmFlMjA5ZC4uYThiNjE4MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2NvbnNvbGUvY29uc29sZS10YWJsZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9jb25zb2xlL2NvbnNvbGUtdGFibGUuaHRtbApAQCAtNDQsNyArNDQsNyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICB9KTsKIAogICAgIGZvciAodmFyIHN0ZXAgb2Ygc3RlcHMpCi0gICAgICAgIFdl Ykluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KHN0ZXAs ICJ0ZXN0IiwgZmFsc2UsIHRydWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwgZnVuY3Rpb24oKXt9KTsK KyAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRX aW5kb3coc3RlcCwge29iamVjdEdyb3VwOiAidGVzdCIsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNB bmRNdXRlQ29uc29sZTogdHJ1ZSwgZ2VuZXJhdGVQcmV2aWV3OiB0cnVlfSwgZnVuY3Rpb24oKXt9 KTsKIH0KIDwvc2NyaXB0PgogPC9oZWFkPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2NvbnNvbGUvbWVzc2FnZXNDbGVhcmVkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv Y29uc29sZS9tZXNzYWdlc0NsZWFyZWQuaHRtbAppbmRleCBjNTg1N2U5Li44MTdjOTY0IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9tZXNzYWdlc0NsZWFyZWQuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9tZXNzYWdlc0NsZWFyZWQuaHRt bApAQCAtMzUsMTMgKzM1LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJDbGVh clZpYUNvbW1hbmRMaW5lQVBJIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJDYWxsaW5nIGBjbGVh cigpYCBpbiB0aGUgY29tbWFuZCBsaW5lIEFQSSBzaG91bGQgdHJpZ2dlciBDb25zb2xlLm1lc3Nh Z2VzQ2xlYXJlZC4iLAogICAgICAgICB0ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7Ci0gICAg ICAgICAgICBjb25zdCBvYmplY3RHcm91cCA9ICJ0ZXN0IjsKLSAgICAgICAgICAgIGNvbnN0IGlu Y2x1ZGVDb21tYW5kTGluZUFQSSA9IHRydWU7Ci0gICAgICAgICAgICBjb25zdCBpZ25vcmVQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGUgPSBmYWxzZTsKLSAgICAgICAgICAgIGNvbnN0IHNob3VsZFJl dHVybkJ5VmFsdWUgPSBmYWxzZTsKLSAgICAgICAgICAgIGNvbnN0IHNob3VsZEdlbmVyYXRlUHJl dmlldyA9IGZhbHNlOwotICAgICAgICAgICAgY29uc3Qgc2hvdWxkU2F2ZVJlc3VsdCA9IGZhbHNl OwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNw ZWN0ZWRXaW5kb3coImNsZWFyKCkiLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJ LCBpZ25vcmVQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGUsIHNob3VsZFJldHVybkJ5VmFsdWUsIHNo b3VsZEdlbmVyYXRlUHJldmlldywgc2hvdWxkU2F2ZVJlc3VsdCwgZnVuY3Rpb24oKXt9KTsKKyAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVk V2luZG93KCJjbGVhcigpIiwge29iamVjdEdyb3VwOiAidGVzdCIsIGluY2x1ZGVDb21tYW5kTGlu ZUFQSTogdHJ1ZX0sIGZ1bmN0aW9uKCl7fSk7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9n TWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5F dmVudC5DbGVhcmVkLCAoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdFRoYXQoZXZlbnQsICJDbGVhcmVkIGV2ZW50IHNob3VsZCBmaXJlLiIpOwogICAgICAg ICAgICAgICAgIHJlc29sdmUoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9j b250cm9sbGVyL3J1bnRpbWUtY29udHJvbGxlci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2NvbnRyb2xsZXIvcnVudGltZS1jb250cm9sbGVyLmh0bWwKaW5kZXggZjc3ODA0Ni4uYmJlYmJh MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnRyb2xsZXIvcnVudGltZS1j b250cm9sbGVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnRyb2xsZXIvcnVu dGltZS1jb250cm9sbGVyLmh0bWwKQEAgLTEyLDEzICsxMiw3IEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgICAgICBkZXNjcmlwdGlvbjogIlRlc3QgZXZhbHVhdGluZyBhbiBvYmplY3QgbGl0ZXJhbCBz dHJpbmcgY29udmVuaWVudGx5IGNvbnZlcnRzIHdyYXBzIGl0IGluIHBhcmVudGhlc2lzIHRvIGF2 b2lkIG1pc2ludGVycHJldGF0aW9uIGFzIGEgcHJvZ3JhbSB3aXRoIGEgYmxvY2sgYW5kIGxhYmVs ZWQgc3RhdGVtZW50LiIsCiAgICAgICAgIHRlc3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKICAg ICAgICAgICAgIGZ1bmN0aW9uIHRlc3RTb3VyY2UoZXhwcmVzc2lvbiwgY2FsbGJhY2spIHsKLSAg ICAgICAgICAgICAgICBjb25zdCBvYmplY3RHcm91cCA9ICJ0ZXN0IjsKLSAgICAgICAgICAgICAg ICBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEkgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBj b25zdCBpZ25vcmVQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGUgPSBmYWxzZTsKLSAgICAgICAgICAg ICAgICBjb25zdCBzaG91bGRSZXR1cm5CeVZhbHVlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAg Y29uc3Qgc2hvdWxkR2VuZXJhdGVQcmV2aWV3ID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgY29u c3Qgc2hvdWxkU2F2ZVJlc3VsdCA9IGZhbHNlOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KGV4cHJlc3Npb24sIG9i amVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGlnbm9yZVBhdXNlT25FeGNlcHRpb25z QW5kTXV0ZSwgc2hvdWxkUmV0dXJuQnlWYWx1ZSwgc2hvdWxkR2VuZXJhdGVQcmV2aWV3LCBzaG91 bGRTYXZlUmVzdWx0LCAocmVzdWx0LCB3YXNUaHJvd24pID0+IHsKKyAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhleHBy ZXNzaW9uLCB7b2JqZWN0R3JvdXA6ICJ0ZXN0In0sIChyZXN1bHQsIHdhc1Rocm93bikgPT4gewog ICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiU291cmNlOiAiICsgZXhwcmVz c2lvbik7CiAgICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKHJlc3VsdCwgd2FzVGhyb3duKTsK ICAgICAgICAgICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9jb21tYW5kLWxpbmUtYXBpLWV4Y2VwdGlvbi1uZXN0ZWQtY2F0Y2guaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb21tYW5kLWxpbmUtYXBpLWV4Y2VwdGlvbi1u ZXN0ZWQtY2F0Y2guaHRtbAppbmRleCBhYWQ0YmNjLi5lYTg4ZDVlIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29tbWFuZC1saW5lLWFwaS1leGNlcHRpb24tbmVz dGVkLWNhdGNoLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NvbW1h bmQtbGluZS1hcGktZXhjZXB0aW9uLW5lc3RlZC1jYXRjaC5odG1sCkBAIC0xNiwxMyArMTYsMTMg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hbGxF eGNlcHRpb25zQnJlYWtwb2ludC5kaXNhYmxlZCA9IGZhbHNlOwogCiAgICAgZnVuY3Rpb24gZHVt cENvbW1hbmRMaW5lQVBJVmFsdWUocHJlZml4KSB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5ydW50 aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCIkZXhjZXB0aW9uIiwgInRlc3Qi LCB0cnVlLCB0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmdW5jdGlvbihyZXN1bHQsIHdhc1Ro cm93bikgeworICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbklu c3BlY3RlZFdpbmRvdygiJGV4Y2VwdGlvbiIsIHtvYmplY3RHcm91cDogInRlc3QiLCBpbmNsdWRl Q29tbWFuZExpbmVBUEk6IHRydWUsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29s ZTogdHJ1ZX0sIGZ1bmN0aW9uKHJlc3VsdCwgd2FzVGhyb3duKSB7CiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmxvZyhwcmVmaXggKyAiOiAkZXhjZXB0aW9uID0+ICIgKyByZXN1bHQuZGVzY3Jp cHRpb24pOwogICAgICAgICB9KTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBjaGVja0lmRXhjZXB0 aW9uVmFsdWVNYXRjaGVzVmFyaWFibGUodmFyTmFtZSkgewotICAgICAgICBXZWJJbnNwZWN0b3Iu cnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdygiJGV4Y2VwdGlvbiA9PT0g IiArIHZhck5hbWUsICJ0ZXN0IiwgdHJ1ZSwgdHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZnVu Y3Rpb24ocmVzdWx0LCB3YXNUaHJvd24pIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVN YW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coIiRleGNlcHRpb24gPT09ICIgKyB2YXJO YW1lLCB7b2JqZWN0R3JvdXA6ICJ0ZXN0IiwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJOiB0cnVlLCBk b05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IHRydWV9LCBmdW5jdGlvbihyZXN1 bHQsIHdhc1Rocm93bikgewogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIiAgQ0FUQ0g6 ICRleGNlcHRpb24gPT09ICIgKyB2YXJOYW1lICsgIiA/ICIgKyByZXN1bHQuZGVzY3JpcHRpb24p OwogICAgICAgICB9KTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvY29tbWFuZC1saW5lLWFwaS1leGNlcHRpb24uaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9jb21tYW5kLWxpbmUtYXBpLWV4Y2VwdGlvbi5odG1sCmluZGV4IGJl YjhkMzIuLjBjN2I5MWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9jb21tYW5kLWxpbmUtYXBpLWV4Y2VwdGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9jb21tYW5kLWxpbmUtYXBpLWV4Y2VwdGlvbi5odG1sCkBAIC00MCwxMyAr NDAsMTMgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgfQogCiAgICAgZnVuY3Rpb24gZHVtcENvbW1h bmRMaW5lQVBJVmFsdWUocHJlZml4KSB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFu YWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCIkZXhjZXB0aW9uIiwgInRlc3QiLCB0cnVl LCB0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmdW5jdGlvbihyZXN1bHQsIHdhc1Rocm93bikg eworICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3Rl ZFdpbmRvdygiJGV4Y2VwdGlvbiIsIHtvYmplY3RHcm91cDogInRlc3QiLCBpbmNsdWRlQ29tbWFu ZExpbmVBUEk6IHRydWUsIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1 ZX0sIGZ1bmN0aW9uKHJlc3VsdCwgd2FzVGhyb3duKSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmxvZyhwcmVmaXggKyAiOiAkZXhjZXB0aW9uID0+ICIgKyByZXN1bHQuZGVzY3JpcHRpb24p OwogICAgICAgICB9KTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBjaGVja0lmRXhjZXB0aW9uVmFs dWVNYXRjaGVzQ2F0Y2hWYXJpYWJsZSgpIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVN YW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coIiRleGNlcHRpb24gPT09IGUiLCAidGVz dCIsIHRydWUsIHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZ1bmN0aW9uKHJlc3VsdCwgd2Fz VGhyb3duKSB7CisgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUlu SW5zcGVjdGVkV2luZG93KCIkZXhjZXB0aW9uID09PSBlIiwge29iamVjdEdyb3VwOiAidGVzdCIs IGluY2x1ZGVDb21tYW5kTGluZUFQSTogdHJ1ZSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11 dGVDb25zb2xlOiB0cnVlfSwgZnVuY3Rpb24ocmVzdWx0LCB3YXNUaHJvd24pIHsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QubG9nKCJTVEVQUEVEIE9VVCBUTyBDQVRDSCBCTE9DSzogJGV4Y2Vw dGlvbiA9PT0gZSA/ICIgKyByZXN1bHQuZGVzY3JpcHRpb24pOwogICAgICAgICB9KTsKICAgICB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1n ZXQtcHJvcGVydGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1v YmplY3QtZ2V0LXByb3BlcnRpZXMuaHRtbAppbmRleCAxNGIxOTk3Li42ZWJjYjY0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1nZXQtcHJvcGVy dGllcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0 LWdldC1wcm9wZXJ0aWVzLmh0bWwKQEAgLTc1LDcgKzc1LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAg ICAgICAgIEluc3BlY3RvclRlc3QubG9nKCItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLSIpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiRVhQ UkVTU0lPTjogIiArIHN0ZXAuZXhwcmVzc2lvbik7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJ1 bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coc3RlcC5leHByZXNzaW9uLCAi dGVzdCIsIGZhbHNlLCB0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmdW5jdGlvbihyZW1vdGVP YmplY3QsIHdhc1Rocm93bikgeworICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIu ZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhzdGVwLmV4cHJlc3Npb24sIHtvYmplY3RHcm91cDog InRlc3QiLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IHRydWV9LCBmdW5j dGlvbihyZW1vdGVPYmplY3QsIHdhc1Rocm93bikgewogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnQocmVtb3RlT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygidHlwZTogIiArIHJlbW90ZU9iamVj dC50eXBlKTsKICAgICAgICAgICAgIGlmIChyZW1vdGVPYmplY3Quc3VidHlwZSkKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LXdlYWstY29sbGVj dGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qtd2Vh ay1jb2xsZWN0aW9uLmh0bWwKaW5kZXggMDFiZDU2NC4uNzEwNzU1ZSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qtd2Vhay1jb2xsZWN0aW9uLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qtd2Vhay1j b2xsZWN0aW9uLmh0bWwKQEAgLTUzLDggKzUzLDggQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAg ICAgLy8gUnVuIHRoZSBleHByZXNzaW9uLCBhbmQgdGhlbiBydW4gYSBnYXJiYWdlIGNvbGxlY3Rp b24gb24gYSBkaWZmZXJlbnQKICAgICAgICAgLy8gZXZlbnQgbG9vcCBzbyBubyBvYmplY3RzIGFy ZSBrZXB0IGFsaXZlIGJ5IHRoZSBzdGFjay4KLSAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVN YW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coc3RlcC5leHByZXNzaW9uLCAidGVzdCIs IGZhbHNlLCB0cnVlLCBmYWxzZSwgdHJ1ZSwgZmFsc2UsIGZ1bmN0aW9uKHJlbW90ZU9iamVjdCwg d2FzVGhyb3duKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZh bHVhdGVJbkluc3BlY3RlZFdpbmRvdygiR0NDb250cm9sbGVyLmNvbGxlY3QoKSIsICJ0ZXN0Iiwg ZmFsc2UsIHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZ1bmN0aW9uKCkgeworICAgICAgICBX ZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhzdGVw LmV4cHJlc3Npb24sIHtvYmplY3RHcm91cDogInRlc3QiLCBkb05vdFBhdXNlT25FeGNlcHRpb25z QW5kTXV0ZUNvbnNvbGU6IHRydWUsIGdlbmVyYXRlUHJldmlldzogdHJ1ZX0sIGZ1bmN0aW9uKHJl bW90ZU9iamVjdCwgd2FzVGhyb3duKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGlt ZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdygiR0NDb250cm9sbGVyLmNvbGxlY3Qo KSIsIHtvYmplY3RHcm91cDogInRlc3QiLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNv bnNvbGU6IHRydWV9LCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydChyZW1vdGVPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0 KTsKICAgICAgICAgICAgICAgICByZW1vdGVPYmplY3QuZ2V0Q29sbGVjdGlvbkVudHJpZXMoMCwg MTAwLCBmdW5jdGlvbihlbnRyaWVzKSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QubG9nKCJFTlRSSUVTOiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1v dGUtb2JqZWN0Lmh0bWwKaW5kZXggMmIyOTYyZC4uMTNhZTVhMyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1sCkBAIC0yMTUsNyArMjE1LDcgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3Bl Y3RlZFdpbmRvdyhzdGVwLmV4cHJlc3Npb24sICJ0ZXN0IiwgZmFsc2UsIHRydWUsIGZhbHNlLCB0 cnVlLCBmYWxzZSwgZnVuY3Rpb24ocmVtb3RlT2JqZWN0LCB3YXNUaHJvd24pIHsKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93 KHN0ZXAuZXhwcmVzc2lvbiwge29iamVjdEdyb3VwOiAidGVzdCIsIGRvTm90UGF1c2VPbkV4Y2Vw dGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwgZ2VuZXJhdGVQcmV2aWV3OiB0cnVlfSwgZnVuY3Rp b24ocmVtb3RlT2JqZWN0LCB3YXNUaHJvd24pIHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmxvZygiIik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIi0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIik7CiAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIkVYUFJFU1NJT046ICIgKyBzdGVwLmV4cHJlc3Np b24pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2V4Y2VwdGlv bi1pbi1pbmplY3RlZC1zY3JpcHQtd2hpbGUtcmVjb3JkaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdGltZWxpbmUvZXhjZXB0aW9uLWluLWluamVjdGVkLXNjcmlwdC13aGlsZS1yZWNv cmRpbmcuaHRtbAppbmRleCAxOWUzN2M4Li4zZTI1YzFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGltZWxpbmUvZXhjZXB0aW9uLWluLWluamVjdGVkLXNjcmlwdC13aGlsZS1y ZWNvcmRpbmcuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvZXhjZXB0 aW9uLWluLWluamVjdGVkLXNjcmlwdC13aGlsZS1yZWNvcmRpbmcuaHRtbApAQCAtNTAsNyArNTAs NyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICB9KTsKIAogICAgIGZ1bmN0aW9uIGNoZWNrSWZFeGNl cHRpb25Mb29wc0ZvcmV2ZXIoKSB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdl ci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCIoe30pLngueCIsICJ0ZXN0IiwgdHJ1ZSwgdHJ1 ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZnVuY3Rpb24ocmVzdWx0LCB3YXNUaHJvd24pIHsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5k b3coIih7fSkueC54Iiwge29iamVjdEdyb3VwOiAidGVzdCIsIGluY2x1ZGVDb21tYW5kTGluZUFQ STogdHJ1ZSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVlfSwgZnVu Y3Rpb24ocmVzdWx0LCB3YXNUaHJvd24pIHsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJBbiBleGNlcHRpb24gd2FzICIgKyAod2FzVGhyb3duID8gIiIgOiAibm90ICIpICsg InRocm93biBmcm9tIHRoZSBpbmplY3RlZCBzY3JpcHQuIik7CiAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnJlc3VtZSgpLnRoZW4oZnVuY3Rpb24oKSB7CiAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkRlYnVnZ2VyIHJlc3VtZWQ7IHN0b3Bw aW5nIHRpbWVsaW5lIGNhcHR1cmUuIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1NmE5 ODZlLi41ZjM1NDZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAor MjAxNi0wNi0wOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT046IFdlYiBJbnNwZWN0b3I6IFNob3VsZCBiZSBhYmxlIHRvIGV2YWx1YXRl ICJ7YToxLCBiOjJ9IiBpbiB0aGUgY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTQ4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNjcw ODUxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIucHJvdG90eXBlLmV2YWx1YXRlSW5JbnNwZWN0ZWRX aW5kb3cpOgorICAgICAgICBTd2l0Y2ggdGhlIG1hbnkgcGFyYW1ldGVycyB0byBhbiBvcHRpb25z IGRpY3Rpb25hcnkuCisgICAgICAgIEluY2x1ZGUgYSBuZXcgb3B0aW9uIGZvciBzb3VyY2VVUkwg YXBwZW5kZXIsIHNvIHRoYXQKKyAgICAgICAgQ29uc29sZSBldmFsdWF0aW9ucyBjYW4gaGF2ZSBp dHMgb3duIGFwcGVuZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2 YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRMb2dWaWV3Q29udHJvbGxlci5wcm90b3R5cGUuY29uc29sZVByb21wdFRleHRDb21taXR0 ZWQpOgorICAgICAgICBVc2UgdGhlIGFwcGVuZFdlYkluc3BlY3RvckNvbnNvbGVFdmFsdWF0aW9u U291cmNlVVJMIGFwcGVuZGVyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9KYXZhU2NyaXB0UnVudGltZUNvbXBsZXRpb25Qcm92aWRlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0UnVudGltZUNvbXBsZXRpb25Qcm92aWRlci5wcm90b3R5cGUuY29t cGxldGlvbkNvbnRyb2xsZXJDb21wbGV0aW9uc05lZWRlZC5ldmFsdWF0ZWQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90 eXBlLl9nZW5lcmF0ZVdhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZVdh dGNoRXhwcmVzc2lvbnNTZWN0aW9uKToKKyAgICAgICAgVXNlIHRoZSBuZXcgb3B0aW9ucyBkaWN0 aW9uYXJ5LgorCiAyMDE2LTA2LTA1ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBSRUdSRVNTSU9OIChyMjAxNjg2KTogV2ViIEluc3BlY3RvcjogRml4IHR5cG8g Y2F1c2luZyBhbiBpbnRlcm5hbCBlcnJvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVy LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2 YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCmluZGV4IGMzZDcwZDMuLjE3NmMyZWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMK QEAgLTIzMSw5ICsyMzEsMTcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dWaWV3Q29udHJv bGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBleHQKICAgICAgICAgICAg IHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlVmlldyhjb21tYW5kUmVzdWx0TWVzc2FnZVZpZXcs IHRydWUpOwogICAgICAgICB9CiAKLSAgICAgICAgdGV4dCA9IGFwcGVuZFdlYkluc3BlY3RvckNv bnNvbGVFdmFsdWF0aW9uU291cmNlVVJMKHRleHQpOworICAgICAgICBsZXQgb3B0aW9ucyA9IHsK KyAgICAgICAgICAgIG9iamVjdEdyb3VwOiBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuQ29u c29sZU9iamVjdEdyb3VwLAorICAgICAgICAgICAgaW5jbHVkZUNvbW1hbmRMaW5lQVBJOiB0cnVl LAorICAgICAgICAgICAgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiBmYWxz ZSwKKyAgICAgICAgICAgIHJldHVybkJ5VmFsdWU6IGZhbHNlLAorICAgICAgICAgICAgZ2VuZXJh dGVQcmV2aWV3OiB0cnVlLAorICAgICAgICAgICAgc2F2ZVJlc3VsdDogdHJ1ZSwKKyAgICAgICAg ICAgIHNvdXJjZVVSTEFwcGVuZGVyOiBhcHBlbmRXZWJJbnNwZWN0b3JDb25zb2xlRXZhbHVhdGlv blNvdXJjZVVSTCwKKyAgICAgICAgfTsKIAotICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1h bmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyh0ZXh0LCBXZWJJbnNwZWN0b3IuUnVudGlt ZU1hbmFnZXIuQ29uc29sZU9iamVjdEdyb3VwLCB0cnVlLCBmYWxzZSwgZmFsc2UsIHRydWUsIHRy dWUsIHByaW50UmVzdWx0LmJpbmQodGhpcykpOworICAgICAgICBXZWJJbnNwZWN0b3IucnVudGlt ZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyh0ZXh0LCBvcHRpb25zLCBwcmludFJl c3VsdC5iaW5kKHRoaXMpKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0 UnVudGltZUNvbXBsZXRpb25Qcm92aWRlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRSdW50aW1lQ29tcGxldGlvblByb3ZpZGVy LmpzCmluZGV4IDcwNTk5MjIuLjM0ZWM3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRSdW50aW1lQ29tcGxldGlv blByb3ZpZGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0phdmFTY3JpcHRSdW50aW1lQ29tcGxldGlvblByb3ZpZGVyLmpzCkBAIC0xMDIs OCArMTAyLDEwIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0UnVudGltZUNvbXBsZXRpb25Qcm92 aWRlciA9IGNsYXNzIEphdmFTY3JpcHRSdW50aW1lQ29tcGxlCiAgICAgICAgIHZhciBhY3RpdmVD YWxsRnJhbWUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFjdGl2ZUNhbGxGcmFtZTsK ICAgICAgICAgaWYgKCFiYXNlICYmIGFjdGl2ZUNhbGxGcmFtZSAmJiAhdGhpcy5fYWx3YXlzRXZh bHVhdGVJbldpbmRvd0NvbnRleHQpCiAgICAgICAgICAgICBhY3RpdmVDYWxsRnJhbWUuY29sbGVj dFNjb3BlQ2hhaW5WYXJpYWJsZU5hbWVzKHJlY2VpdmVkUHJvcGVydHlOYW1lcy5iaW5kKHRoaXMp KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2Vy LmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coYmFzZSwgImNvbXBsZXRpb24iLCB0cnVlLCB0cnVl LCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBldmFsdWF0ZWQuYmluZCh0aGlzKSk7CisgICAgICAgIGVs c2UgeworICAgICAgICAgICAgbGV0IG9wdGlvbnMgPSB7b2JqZWN0R3JvdXA6ICJjb21wbGV0aW9u IiwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJOiB0cnVlLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5k TXV0ZUNvbnNvbGU6IHRydWUsIHJldHVybkJ5VmFsdWU6IGZhbHNlLCBnZW5lcmF0ZVByZXZpZXc6 IGZhbHNlLCBzYXZlUmVzdWx0OiBmYWxzZX07CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVu dGltZU1hbmFnZXIuZXZhbHVhdGVJbkluc3BlY3RlZFdpbmRvdyhiYXNlLCBvcHRpb25zLCBldmFs dWF0ZWQuYmluZCh0aGlzKSk7CisgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiB1cGRhdGVM YXN0UHJvcGVydHlOYW1lcyhwcm9wZXJ0eU5hbWVzKQogICAgICAgICB7CkBAIC0xODUsOSArMTg3 LDEwIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0UnVudGltZUNvbXBsZXRpb25Qcm92aWRlciA9 IGNsYXNzIEphdmFTY3JpcHRSdW50aW1lQ29tcGxlCiAgICAgICAgICAgICAgICAgcmVzdWx0LmNh bGxGdW5jdGlvbkpTT04oaW5zcGVjdGVkUGFnZV9ldmFsUmVzdWx0X2dldEFycmF5Q29tcGxldGlv bnMsIHVuZGVmaW5lZCwgcmVjZWl2ZWRBcnJheVByb3BlcnR5TmFtZXMuYmluZCh0aGlzKSk7CiAg ICAgICAgICAgICBlbHNlIGlmIChyZXN1bHQudHlwZSA9PT0gIm9iamVjdCIgfHwgcmVzdWx0LnR5 cGUgPT09ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmNhbGxGdW5jdGlvbkpT T04oaW5zcGVjdGVkUGFnZV9ldmFsUmVzdWx0X2dldENvbXBsZXRpb25zLCB1bmRlZmluZWQsIHJl Y2VpdmVkUHJvcGVydHlOYW1lcy5iaW5kKHRoaXMpKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHJl c3VsdC50eXBlID09PSAic3RyaW5nIiB8fCByZXN1bHQudHlwZSA9PT0gIm51bWJlciIgfHwgcmVz dWx0LnR5cGUgPT09ICJib29sZWFuIiB8fCByZXN1bHQudHlwZSA9PT0gInN5bWJvbCIpCi0gICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0 ZWRXaW5kb3coIigiICsgaW5zcGVjdGVkUGFnZV9ldmFsUmVzdWx0X2dldENvbXBsZXRpb25zICsg IikoXCIiICsgcmVzdWx0LnR5cGUgKyAiXCIpIiwgImNvbXBsZXRpb24iLCBmYWxzZSwgdHJ1ZSwg dHJ1ZSwgZmFsc2UsIGZhbHNlLCByZWNlaXZlZFByb3BlcnR5TmFtZXNGcm9tRXZhbHVhdGUuYmlu ZCh0aGlzKSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBlbHNlIGlmIChyZXN1bHQu dHlwZSA9PT0gInN0cmluZyIgfHwgcmVzdWx0LnR5cGUgPT09ICJudW1iZXIiIHx8IHJlc3VsdC50 eXBlID09PSAiYm9vbGVhbiIgfHwgcmVzdWx0LnR5cGUgPT09ICJzeW1ib2wiKSB7CisgICAgICAg ICAgICAgICAgbGV0IG9wdGlvbnMgPSB7b2JqZWN0R3JvdXA6ICJjb21wbGV0aW9uIiwgaW5jbHVk ZUNvbW1hbmRMaW5lQVBJOiBmYWxzZSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25z b2xlOiB0cnVlLCByZXR1cm5CeVZhbHVlOiBmYWxzZSwgZ2VuZXJhdGVQcmV2aWV3OiBmYWxzZSwg c2F2ZVJlc3VsdDogZmFsc2V9OworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1l TWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93KCIoIiArIGluc3BlY3RlZFBhZ2VfZXZh bFJlc3VsdF9nZXRDb21wbGV0aW9ucyArICIpKFwiIiArIHJlc3VsdC50eXBlICsgIlwiKSIsIG9w dGlvbnMsIHJlY2VpdmVkUHJvcGVydHlOYW1lc0Zyb21FdmFsdWF0ZS5iaW5kKHRoaXMpKTsKKyAg ICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24g cmVzdWx0IHR5cGU6ICIgKyByZXN1bHQudHlwZSk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1h bmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9SdW50aW1lTWFuYWdlci5qcwppbmRleCA0Nzc3NzZjLi41MDA1YmIyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SdW50aW1lTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9SdW50aW1lTWFuYWdlci5qcwpAQCAtMzUsOCArMzUsMjAgQEAgV2ViSW5zcGVjdG9yLlJ1 bnRpbWVNYW5hZ2VyID0gY2xhc3MgUnVudGltZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAKICAgICAvLyBQdWJsaWMKIAotICAgIGV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3co ZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlLCByZXR1cm5CeVZhbHVlLCBnZW5lcmF0ZVByZXZp ZXcsIHNhdmVSZXN1bHQsIGNhbGxiYWNrKQorICAgIGV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3co ZXhwcmVzc2lvbiwgb3B0aW9ucywgY2FsbGJhY2spCiAgICAgeworICAgICAgICBsZXQge29iamVj dEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRN dXRlQ29uc29sZSwgcmV0dXJuQnlWYWx1ZSwgZ2VuZXJhdGVQcmV2aWV3LCBzYXZlUmVzdWx0LCBz b3VyY2VVUkxBcHBlbmRlcn0gPSBvcHRpb25zOworCisgICAgICAgIGluY2x1ZGVDb21tYW5kTGlu ZUFQSSA9IGluY2x1ZGVDb21tYW5kTGluZUFQSSB8fCBmYWxzZTsKKyAgICAgICAgZG9Ob3RQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlID0gZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11 dGVDb25zb2xlIHx8IGZhbHNlOworICAgICAgICByZXR1cm5CeVZhbHVlID0gcmV0dXJuQnlWYWx1 ZSB8fCBmYWxzZTsKKyAgICAgICAgZ2VuZXJhdGVQcmV2aWV3ID0gZ2VuZXJhdGVQcmV2aWV3IHx8 IGZhbHNlOworICAgICAgICBzYXZlUmVzdWx0ID0gc2F2ZVJlc3VsdCB8fCBmYWxzZTsKKyAgICAg ICAgc291cmNlVVJMQXBwZW5kZXIgPSBzb3VyY2VVUkxBcHBlbmRlciB8fCBhcHBlbmRXZWJJbnNw ZWN0b3JTb3VyY2VVUkw7CisKKyAgICAgICAgY29uc29sZS5hc3NlcnQob2JqZWN0R3JvdXAsICJS dW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2luZG93IHNob3VsZCBhbHdheXMgYmUg Y2FsbGVkIHdpdGggYW4gb2JqZWN0R3JvdXAiKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodHlw ZW9mIHNvdXJjZVVSTEFwcGVuZGVyID09PSAiZnVuY3Rpb24iKTsKKwogICAgICAgICBpZiAoIWV4 cHJlc3Npb24pIHsKICAgICAgICAgICAgIC8vIFRoZXJlIGlzIG5vIGV4cHJlc3Npb24sIHNvIHRo ZSBjb21wbGV0aW9uIHNob3VsZCBoYXBwZW4gYWdhaW5zdCBnbG9iYWwgcHJvcGVydGllcy4KICAg ICAgICAgICAgIGV4cHJlc3Npb24gPSAidGhpcyI7CkBAIC00NSw3ICs1Nyw3IEBAIFdlYkluc3Bl Y3Rvci5SdW50aW1lTWFuYWdlciA9IGNsYXNzIFJ1bnRpbWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgICAgICAgICAgZXhwcmVzc2lvbiA9ICIoIiArIGV4cHJlc3Npb24g KyAiKSI7CiAgICAgICAgIH0KIAotICAgICAgICBleHByZXNzaW9uID0gYXBwZW5kV2ViSW5zcGVj dG9yU291cmNlVVJMKGV4cHJlc3Npb24pOworICAgICAgICBleHByZXNzaW9uID0gc291cmNlVVJM QXBwZW5kZXIoZXhwcmVzc2lvbik7CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbENhbGxiYWNrKGVy cm9yLCByZXN1bHQsIHdhc1Rocm93biwgc2F2ZWRSZXN1bHRJbmRleCkKICAgICAgICAgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVD aGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAzYjA2 ZmFmLi45OTEwNGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGVi YXJQYW5lbC5qcwpAQCAtMzUwLDcgKzM1MCw4IEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsCiAg ICAgICAgIGxldCBwcm9taXNlcyA9IFtdOwogICAgICAgICBmb3IgKGxldCBleHByZXNzaW9uIG9m IHdhdGNoRXhwcmVzc2lvbnMpIHsKICAgICAgICAgICAgIHByb21pc2VzLnB1c2gobmV3IFByb21p c2UoZnVuY3Rpb24ocmVzb2x2ZSwgcmVqZWN0KSB7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3coZXhwcmVzc2lvbiwg V2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLldhdGNoRXhwcmVzc2lv bnNPYmplY3RHcm91cE5hbWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwgdHJ1ZSwgZmFsc2UsIGZ1bmN0 aW9uKG9iamVjdCwgd2FzVGhyb3duKSB7CisgICAgICAgICAgICAgICAgbGV0IG9wdGlvbnMgPSB7 b2JqZWN0R3JvdXA6IFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5X YXRjaEV4cHJlc3Npb25zT2JqZWN0R3JvdXBOYW1lLCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IGZh bHNlLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IHRydWUsIHJldHVybkJ5 VmFsdWU6IGZhbHNlLCBnZW5lcmF0ZVByZXZpZXc6IHRydWUsIHNhdmVSZXN1bHQ6IGZhbHNlfTsK KyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZXZhbHVhdGVJbklu c3BlY3RlZFdpbmRvdyhleHByZXNzaW9uLCBvcHRpb25zLCBmdW5jdGlvbihvYmplY3QsIHdhc1Ro cm93bikgewogICAgICAgICAgICAgICAgICAgICBsZXQgcHJvcGVydHlEZXNjcmlwdG9yID0gbmV3 IFdlYkluc3BlY3Rvci5Qcm9wZXJ0eURlc2NyaXB0b3Ioe25hbWU6IGV4cHJlc3Npb24sIHZhbHVl OiBvYmplY3R9LCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgd2FzVGhyb3duKTsKICAgICAgICAgICAg ICAgICAgICAgb2JqZWN0VHJlZS5hcHBlbmRFeHRyYVByb3BlcnR5RGVzY3JpcHRvcihwcm9wZXJ0 eURlc2NyaXB0b3IpOwogICAgICAgICAgICAgICAgICAgICByZXNvbHZlKHByb3BlcnR5RGVzY3Jp cHRvcik7Cg==