126855 2014-01-12 14:50:20 -0800 Web Inspector: scope chain details sidebar doesn't update values modified via console 2014-02-15 00:23:38 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg webkit-unassigned chrisjshull commit-queue joepeck timothy webkit-bug-importer oldest_to_newest 967036 0 bburg 2014-01-12 14:50:20 -0800 Test case: when paused, add a new property to some object visible in the scope chain details sidebar. The new property won't be added to the tree until you take a step in the debugger. 967037 1 webkit-bug-importer 2014-01-12 14:50:38 -0800 <rdar://problem/15801345> 980515 2 224125 chrisjshull 2014-02-13 16:16:41 -0800 Created attachment 224125 Patch 980592 3 224125 timothy 2014-02-13 19:16:48 -0800 Comment on attachment 224125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224125&action=review Thanks for looking into this! > Source/WebInspectorUI/UserInterface/JavaScriptLogViewController.js:228 > + WebInspector.scopeChainDetailsSidebarPanel.needsRefresh(); This would be better as an event that the sidebar observes. Having this low-level view class directly call a higher-level class is a layering violation. RuntimeManager would be a good place to fire the event that the sidebar observes. 980593 4 timothy 2014-02-13 19:19:12 -0800 Having RuntimeManager fire it after doing an evaluate would catch any other place we evaluate expressions. 980658 5 224166 chrisjshull 2014-02-13 23:12:35 -0800 Created attachment 224166 Patch 980659 6 chrisjshull 2014-02-13 23:14:36 -0800 Thanks for the feedback, uploaded new patch. Two things I wasn’t sure about: 1) I didn’t add any data to the event, since it seems like most events don’t include data unless something will use it. Happy to add if you want though. 2) I didn’t refactor RuntimeManager#evaluateInInspectedWindow() to not have a callback at all, since having a callback made more sense for the things which were calling that method (since they needed to have callbacks specific to the invocation, as opposed to generic like the event is used.) Plus, one of the other args changes what args get passed to the callback. 980864 7 224166 joepeck 2014-02-14 10:44:50 -0800 Comment on attachment 224166 Patch You need to bind.(this) on both evalCallback calls. There is one on RuntimeManager.js a few lines down (line 75 after your patches). Otherwise, just typing in the console normally (not paused) will throw an exception right? 980871 8 224233 chrisjshull 2014-02-14 10:55:28 -0800 Created attachment 224233 Patch 980872 9 chrisjshull 2014-02-14 10:55:54 -0800 Yikes! Thank you for catching that. Patch updated. 981127 10 224233 commit-queue 2014-02-15 00:23:36 -0800 Comment on attachment 224233 Patch Clearing flags on attachment: 224233 Committed r164163: <http://trac.webkit.org/changeset/164163> 981128 11 commit-queue 2014-02-15 00:23:38 -0800 All reviewed patches have been landed. Closing bug. 224125 2014-02-13 16:16:41 -0800 2014-02-13 23:12:31 -0800 Patch bug-126855-20140213161640.patch text/plain 2331 chrisjshull SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0MDcxKQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE0LTAyLTEzICBDaHJpcyBKLiBTaHVsbCAgPGNocmlzanNodWxsQGdtYWlsLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBzY29wZSBjaGFpbiBkZXRhaWxzIHNpZGViYXIgZG9lc24n dCB1cGRhdGUgdmFsdWVzIG1vZGlmaWVkIHZpYSBjb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY4NTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQgdGhlIHNjb3BlIGNoYWluIGRldGFpbHMg c2lkZWJhciBrbm93IHRoYXQgaXQgbmVlZHMgdG8gcmVmcmVzaCBhZnRlcgorICAgICAgICBldmFs dWF0aW5nIHNvbWV0aGluZyBvbiB0aGUgY29uc29sZSBwcm9tcHQuCisKKyAgICAgICAgVGVzdGlu ZyBvbiB0aGlzIGlzIGJsb2NrZWQgYnkgaHR0cDovL3dlYmtpdC5vcmcvYi8xMjg3MjQKKyAgICAg ICAgKFdlYiBJbnNwZWN0b3I6IElzc3VlIHRlc3RpbmcgYnJlYWtwb2ludHMpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS51cGRh dGVXaXRoUmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIucHJvdG90eXBlLmNvbnNvbGVQcm9tcHRUZXh0Q29tbWl0dGVkKToKKwogMjAxNC0w Mi0xMyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBEYXRhR3JpZCBzaG91bGQgc3VwcG9ydCBlZGl0aW5nIHRhYmxlcyB3aXRoIGFyYml0cmFy eSBjb2x1bW5zCkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9KYXZh U2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCShyZXZp c2lvbiAxNjM5OTkpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9KYXZh U2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMJKHdvcmtpbmcgY29weSkKQEAgLTIyMiw4ICsyMjIs MTEgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlcgogICAgICAgICB2 YXIgY29tbWFuZE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kKHRleHQp OwogICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlTWVzc2FnZShjb21tYW5kTWVzc2FnZSwgdHJ1 ZSk7CiAKLSAgICAgICAgZnVuY3Rpb24gcHJpbnRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24pCisg ICAgICAgIGZ1bmN0aW9uIHVwZGF0ZVdpdGhSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24pCiAgICAg ICAgIHsKKyAgICAgICAgICAgIC8vIFZhcmlhYmxlcyBpbiB0aGUgc2NvcGUgY2hhaW4gbWF5IGhh dmUgY2hhbmdlZC4KKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zY29wZUNoYWluRGV0YWlsc1Np ZGViYXJQYW5lbC5uZWVkc1JlZnJlc2goKTsKKwogICAgICAgICAgICAgaWYgKCFyZXN1bHQgfHwg dGhpcy5fY2xlYXJlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTIzMiw3ICsyMzUs NyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyCiAKICAgICAgICAg dGV4dCArPSAiXG4vLyMgc291cmNlVVJMPV9fV2ViSW5zcGVjdG9yQ29uc29sZV9fXG4iOwogCi0g ICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5ldmFsdWF0ZUluSW5zcGVjdGVkV2lu ZG93KHRleHQsICJjb25zb2xlIiwgdHJ1ZSwgZmFsc2UsIGZhbHNlLCBwcmludFJlc3VsdC5iaW5k KHRoaXMpKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5J bnNwZWN0ZWRXaW5kb3codGV4dCwgImNvbnNvbGUiLCB0cnVlLCBmYWxzZSwgZmFsc2UsIHVwZGF0 ZVdpdGhSZXN1bHQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIC8vIFByaXZhdGUK 224166 2014-02-13 23:12:35 -0800 2014-02-14 10:55:26 -0800 Patch bug-126855-20140213231234.patch text/plain 3524 chrisjshull SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0MDk0KQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTAyLTEzICBDaHJpcyBKLiBTaHVsbCAgPGNocmlzanNodWxsQGdtYWlsLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBzY29wZSBjaGFpbiBkZXRhaWxzIHNpZGViYXIgZG9lc24n dCB1cGRhdGUgdmFsdWVzIG1vZGlmaWVkIHZpYSBjb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY4NTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBSdW50aW1lTWFuYWdlciBldmVudCB0 aGF0IHRoZSBzY29wZSBjaGFpbiBkZXRhaWxzIHNpZGViYXIgY2FuIAorICAgICAgICBsaXN0ZW4g dG8gdG8gdHJpZ2dlciByZWZyZXNoLgorCisgICAgICAgIFRlc3Rpbmcgb24gdGhpcyBpcyBibG9j a2VkIGJ5IGh0dHA6Ly93ZWJraXQub3JnL2IvMTI4NzI0CisgICAgICAgIChXZWIgSW5zcGVjdG9y OiBJc3N1ZSB0ZXN0aW5nIGJyZWFrcG9pbnRzKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv UnVudGltZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIu cHJvdG90eXBlLmV2YWxDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGltZU1h bmFnZXIucHJvdG90eXBlLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3cpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwpOgorCiAyMDE0LTAyLTEz ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IERhdGFHcmlkIHNob3VsZCBzdXBwb3J0IGVkaXRpbmcgdGFibGVzIHdpdGggYXJiaXRyYXJ5IGNv bHVtbnMKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1J1bnRpbWVN YW5hZ2VyLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1J1bnRpbWVNYW5hZ2VyLmpzCShyZXZpc2lvbiAxNjM5OTkpCisrKyBTb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9SdW50aW1lTWFuYWdlci5qcwkod29ya2luZyBjb3B5KQpA QCAtMzIsNiArMzIsMTAgQEAgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyID0gZnVuY3Rpb24o KQogICAgICAgICBSdW50aW1lQWdlbnQuZW5hYmxlKCk7CiB9OwogCitXZWJJbnNwZWN0b3IuUnVu dGltZU1hbmFnZXIuRXZlbnQgPSB7CisgICAgRGlkRXZhbHVhdGU6ICJydW50aW1lLW1hbmFnZXIt ZGlkLWV2YWx1YXRlIgorfTsKKwogV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLAogCkBA IC00Niw2ICs1MCw4IEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUgPSAK IAogICAgICAgICBmdW5jdGlvbiBldmFsQ2FsbGJhY2soZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3du KQogICAgICAgICB7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuRXZlbnQuRGlkRXZhbHVhdGUpOworICAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKGVycm9yKTsKICAgICAgICAgICAgICAgICBjYWxsYmFjayhudWxsLCBmYWxzZSk7CkBAIC01 OSw3ICs2NSw3IEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUgPSAKICAg ICAgICAgfQogCiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFjdGl2 ZUNhbGxGcmFtZSkgewotICAgICAgICAgICAgRGVidWdnZXJBZ2VudC5ldmFsdWF0ZU9uQ2FsbEZy YW1lKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2FsbEZyYW1lLmlkLCBleHBy ZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBkb05vdFBhdXNlT25F eGNlcHRpb25zQW5kTXV0ZUNvbnNvbGUsIHJldHVybkJ5VmFsdWUsIGV2YWxDYWxsYmFjayk7Cisg ICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmV2YWx1YXRlT25DYWxsRnJhbWUoV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTWFuYWdlci5hY3RpdmVDYWxsRnJhbWUuaWQsIGV4cHJlc3Npb24sIG9iamVjdEdy b3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRl Q29uc29sZSwgcmV0dXJuQnlWYWx1ZSwgZXZhbENhbGxiYWNrLmJpbmQodGhpcykpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Njb3BlQ2hhaW5EZXRhaWxz U2lkZWJhclBhbmVsLmpzCShyZXZpc2lvbiAxNjM5OTkpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMjcsNiArMjcsOSBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNT aWRlYmFyUGFuCiAgICAgV2ViSW5zcGVjdG9yLkRldGFpbHNTaWRlYmFyUGFuZWwuY2FsbCh0aGlz LCAic2NvcGUtY2hhaW4iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjb3BlIENoYWluIiksIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU2NvcGUgQ2hhaW4iKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRl bVZhcmlhYmxlLnN2ZyIsICI1Iik7CiAKICAgICB0aGlzLl9jYWxsRnJhbWUgPSBudWxsOworICAg IAorICAgIC8vIFVwZGF0ZSBvbiBjb25zb2xlIHByb21wdCBldmFsIGFzIG9iamVjdHMgaW4gdGhl IHNjb3BlIGNoYWluIG1heSBoYXZlIGNoYW5nZWQuCisgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVN YW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLkV2ZW50 LkRpZEV2YWx1YXRlLCB0aGlzLm5lZWRzUmVmcmVzaCwgdGhpcyk7CiB9OwogCiBXZWJJbnNwZWN0 b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewo= 224233 2014-02-14 10:55:28 -0800 2014-02-15 00:23:36 -0800 Patch bug-126855-20140214105527.patch text/plain 4455 chrisjshull SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0MDk0KQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE0LTAyLTEzICBDaHJpcyBKLiBTaHVsbCAgPGNocmlzanNodWxsQGdtYWlsLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBzY29wZSBjaGFpbiBkZXRhaWxzIHNpZGViYXIgZG9lc24n dCB1cGRhdGUgdmFsdWVzIG1vZGlmaWVkIHZpYSBjb25zb2xlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY4NTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBSdW50aW1lTWFuYWdlciBldmVudCB0 aGF0IHRoZSBzY29wZSBjaGFpbiBkZXRhaWxzIHNpZGViYXIgY2FuIAorICAgICAgICBsaXN0ZW4g dG8gdG8gdHJpZ2dlciByZWZyZXNoLgorCisgICAgICAgIFRlc3Rpbmcgb24gdGhpcyBpcyBibG9j a2VkIGJ5IGh0dHA6Ly93ZWJraXQub3JnL2IvMTI4NzI0CisgICAgICAgIChXZWIgSW5zcGVjdG9y OiBJc3N1ZSB0ZXN0aW5nIGJyZWFrcG9pbnRzKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv UnVudGltZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIu cHJvdG90eXBlLmV2YWxDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUnVudGltZU1h bmFnZXIucHJvdG90eXBlLmV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3cpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwpOgorCiAyMDE0LTAyLTEz ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IERhdGFHcmlkIHNob3VsZCBzdXBwb3J0IGVkaXRpbmcgdGFibGVzIHdpdGggYXJiaXRyYXJ5IGNv bHVtbnMKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1J1bnRpbWVN YW5hZ2VyLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1J1bnRpbWVNYW5hZ2VyLmpzCShyZXZpc2lvbiAxNjM5OTkpCisrKyBTb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9SdW50aW1lTWFuYWdlci5qcwkod29ya2luZyBjb3B5KQpA QCAtMzIsNiArMzIsMTAgQEAgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyID0gZnVuY3Rpb24o KQogICAgICAgICBSdW50aW1lQWdlbnQuZW5hYmxlKCk7CiB9OwogCitXZWJJbnNwZWN0b3IuUnVu dGltZU1hbmFnZXIuRXZlbnQgPSB7CisgICAgRGlkRXZhbHVhdGU6ICJydW50aW1lLW1hbmFnZXIt ZGlkLWV2YWx1YXRlIgorfTsKKwogV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLAogCkBA IC00Niw2ICs1MCw4IEBAIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUgPSAK IAogICAgICAgICBmdW5jdGlvbiBldmFsQ2FsbGJhY2soZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3du KQogICAgICAgICB7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuRXZlbnQuRGlkRXZhbHVhdGUpOworICAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKGVycm9yKTsKICAgICAgICAgICAgICAgICBjYWxsYmFjayhudWxsLCBmYWxzZSk7CkBAIC01 OSwxNCArNjUsMTQgQEAgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZSA9IAog ICAgICAgICB9CiAKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0 aXZlQ2FsbEZyYW1lKSB7Ci0gICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmV2YWx1YXRlT25DYWxs RnJhbWUoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hY3RpdmVDYWxsRnJhbWUuaWQsIGV4 cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VP bkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZSwgcmV0dXJuQnlWYWx1ZSwgZXZhbENhbGxiYWNrKTsK KyAgICAgICAgICAgIERlYnVnZ2VyQWdlbnQuZXZhbHVhdGVPbkNhbGxGcmFtZShXZWJJbnNwZWN0 b3IuZGVidWdnZXJNYW5hZ2VyLmFjdGl2ZUNhbGxGcmFtZS5pZCwgZXhwcmVzc2lvbiwgb2JqZWN0 R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11 dGVDb25zb2xlLCByZXR1cm5CeVZhbHVlLCBldmFsQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChp T1MgNik6IEV4ZWN1dGlvbiBjb250ZXh0IGlkZW50aWZpZXJzIChjb250ZXh0SWQpIGRpZCBub3Qg ZXhpc3QKICAgICAgICAgLy8gaW4gaU9TIDYuIEZhbGxiYWNrIHRvIGluY2x1ZGluZyB0aGUgZnJh bWUgaWRlbnRpZmllciAoZnJhbWVJZCkuCiAgICAgICAgIHZhciBjb250ZXh0SWQgPSBXZWJJbnNw ZWN0b3IucXVpY2tDb25zb2xlLmV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyOwotICAgICAgICBS dW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOiBleHByZXNzaW9uLCBvYmpl Y3RHcm91cDogb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogaW5jbHVkZUNvbW1h bmRMaW5lQVBJLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IGRvTm90UGF1 c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZSwgY29udGV4dElkOiBjb250ZXh0SWQsIGZyYW1l SWQ6IGNvbnRleHRJZCwgcmV0dXJuQnlWYWx1ZTogcmV0dXJuQnlWYWx1ZX0sIGV2YWxDYWxsYmFj ayk7CisgICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uoe2V4cHJlc3Npb246IGV4 cHJlc3Npb24sIG9iamVjdEdyb3VwOiBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJ OiBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29u c29sZTogZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlLCBjb250ZXh0SWQ6IGNv bnRleHRJZCwgZnJhbWVJZDogY29udGV4dElkLCByZXR1cm5CeVZhbHVlOiByZXR1cm5CeVZhbHVl fSwgZXZhbENhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBnZXRQcm9wZXJ0aWVz Rm9yUmVtb3RlT2JqZWN0OiBmdW5jdGlvbihvYmplY3RJZCwgY2FsbGJhY2spCkluZGV4OiBTb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQ YW5lbC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcwkocmV2aXNpb24gMTYzOTk5KQorKysg U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NvcGVDaGFpbkRldGFpbHNTaWRl YmFyUGFuZWwuanMJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDkgQEAgV2ViSW5zcGVjdG9y LlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbgogICAgIFdlYkluc3BlY3Rvci5EZXRhaWxzU2lk ZWJhclBhbmVsLmNhbGwodGhpcywgInNjb3BlLWNoYWluIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTY29wZSBDaGFpbiIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjb3BlIENoYWluIiksICJJ bWFnZXMvTmF2aWdhdGlvbkl0ZW1WYXJpYWJsZS5zdmciLCAiNSIpOwogCiAgICAgdGhpcy5fY2Fs bEZyYW1lID0gbnVsbDsKKyAgICAKKyAgICAvLyBVcGRhdGUgb24gY29uc29sZSBwcm9tcHQgZXZh bCBhcyBvYmplY3RzIGluIHRoZSBzY29wZSBjaGFpbiBtYXkgaGF2ZSBjaGFuZ2VkLgorICAgIFdl Ykluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5S dW50aW1lTWFuYWdlci5FdmVudC5EaWRFdmFsdWF0ZSwgdGhpcy5uZWVkc1JlZnJlc2gsIHRoaXMp OwogfTsKIAogV2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLnByb3Rv dHlwZSA9IHsK