159183 2016-06-27 17:23:22 -0700 Web Inspector: QuickConsole should update its selection when RuntimeManager.defaultExecutionContextIdentifier changes 2016-06-28 11:40:55 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 bburg bburg bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1205790 0 bburg 2016-06-27 17:23:22 -0700 Make it respect the data in the model instead of the UI state. 1205860 1 282207 bburg 2016-06-27 21:17:50 -0700 Created attachment 282207 Proposed Fix 1206032 2 282207 commit-queue 2016-06-28 08:12:31 -0700 Comment on attachment 282207 Proposed Fix Clearing flags on attachment: 282207 Committed r202566: <http://trac.webkit.org/changeset/202566> 1206033 3 commit-queue 2016-06-28 08:12:34 -0700 All reviewed patches have been landed. Closing bug. 1206104 4 282207 joepeck 2016-06-28 11:40:55 -0700 Comment on attachment 282207 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282207&action=review > Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js:155 > WebInspector.RuntimeManager.Event = { > - DidEvaluate: "runtime-manager-did-evaluate" > + DidEvaluate: Symbol("runtime-manager-did-evaluate"), > + DefaultExecutionContextChanged: Symbol("runtime-manager-default-execution-context-changed"), > }; I don't think we use Symbols for event names anywhere else. Maybe we should start moving in that direction. We could shorten these event names, heh. > Source/WebInspectorUI/UserInterface/Models/Frame.js:211 > + this.dispatchEventToListeners(WebInspector.Frame.Event.ExecutionContextsCleared, {committingProvisionalLoad:!!committingProvisionalLoad, contexts}); Style: object literal style needs a space 282207 2016-06-27 21:17:50 -0700 2016-06-28 08:12:31 -0700 Proposed Fix bug-159183-20160627211734.patch text/plain 20646 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 NzQ2ZDVkNmVjOTFkNzEzM2E0ZmE4ZDA3ZWM4NGE2NGJlMzM0ZjU3Li44NzVlNDk0ZTRjY2M0NjU5 YTM5YzMwY2RiM2UwNTNiMDQ4ZTYxYTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw2MiBAQAogMjAxNi0wNi0yNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBRdWlja0NvbnNvbGUgc2hvdWxkIHVwZGF0ZSBpdHMgc2Vs ZWN0aW9uIHdoZW4gUnVudGltZU1hbmFnZXIuZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlm aWVyIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1OTE4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEN1cnJlbnRseSwgdGhlIFVJIGxpc3RlbnMgZm9yIHN0YXRlIGNoYW5nZXMgaW4gdGhlIEZy YW1lIHRyZWUgdG8gZGVjaWRlIHdoZW4gdG8gcmVzZXQKKyAgICAgICAgdGhlIHNlbGVjdGVkIGV4 ZWN1dGlvbiBjb250ZXh0IGJhY2sgdG8gaXRzIGRlZmF1bHQgdmFsdWUuIFRoaXMgaXMgbm8gZ29v ZCwgYmVjYXVzZSB0aGlzCisgICAgICAgIHNob3VsZCBoYXBwZW4gZXZlbiBpZiB3ZSBoYXZlIG5v IFVJIChpLmUuLCB0ZXN0aW5nIG1vZGVscyBvbmx5KS4gVGhlIFVJIHNob3VsZCBzaW1wbHkKKyAg ICAgICAgZGlzcGxheSBjaGFuZ2VzIHRvIHRoZSBtb2RlbCByYXRoZXIgdGhhbiBkcml2aW5nIHRo ZW0gYmFzZWQgb24gb3RoZXIgbW9kZWwgY2hhbmdlcy4KKworICAgICAgICBNb3ZlIHRoZSBsb2dp YyB0byByZXNldCB0aGUgZXhlY3V0aW9uIGNvbnRleHQgaW50byBSdW50aW1lTWFuYWdlci4gV2hl biB0aGUgc2VsZWN0ZWQKKyAgICAgICAgY29udGV4dCBjaGFuZ2VzLCBhbiBldmVudCBpcyBmaXJl ZCB3aGljaCBjYXVzZXMgdGhlIFF1aWNrQ29uc29sZSB0byByZWJ1aWxkIGl0cyBwYXRoIGNvbXBv bmVudHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVNYW5h Z2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5wcm90b3R5cGUuc2V0IGRlZmF1bHRFeGVjdXRp b25Db250ZXh0SWRlbnRpZmllcik6CisgICAgICAgIEZpcmUgYW4gZXZlbnQgd2hlbiB0aGUgZXhl Y3V0aW9uIGNvbnRleHQgYWN0dWFsbHkgY2hhbmdlcy4KKworICAgICAgICAoV2ViSW5zcGVjdG9y LlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZS5fZnJhbWVFeGVjdXRpb25Db250ZXh0c0NsZWFyZWQp OgorICAgICAgICBBZGRlZC4gSWYgdGhlIHNlbGVjdGVkIGNvbnRleHQgd2FzIGNsZWFyZWQsIHJl c2V0IGJhY2sgdG8gZGVmYXVsdC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0Zy YW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lLnByb3RvdHlwZS5jbGVhckV4ZWN1 dGlvbkNvbnRleHRzKToKKyAgICAgICAgSW5jbHVkZSB0aGUgY29udGV4dHMgdGhhdCB3ZXJlIGNs ZWFyZWQgc28gY2xpZW50cyBjYW4gbWF0Y2ggYWdhaW5zdCB0aGVtLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UXVpY2tDb25zb2xlKToKKyAgICAgICAgVXNlIHRoZSBwcm9wZXIgY29uc3RhbnQgbmFtZS4gQm90 aCB0aGUgb2xkIGFuZCBuZXcgbmFtZXMgZXZhbHVhdGVkIHRvIGB1bmRlZmluZWRgLgorICAgICAg ICBObyBuZWVkIHRvIGtlZXAgdHJhY2sgb2YgdGhlIHNlbGVjdGVkIHBhdGggY29tcG9uZW50LCBp dCB3aWxsIGFsd2F5cyBtYXRjaCB0aGUKKyAgICAgICAgZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJ ZGVudGlmaWVyIGluIFJ1bnRpbWVNYW5hZ2VyLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuUXVp Y2tDb25zb2xlLnByb3RvdHlwZS5nZXQgc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmll cik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5zZXQgc2Vs ZWN0ZWRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllcik6CisgICAgICAgIEZvcndhcmQgdG8gUnVu dGltZU1hbmFnZXIuIFRoaXMgbmFtZSBpcyBsZXNzIGF3a3dhcmQgZm9yIHRoZSBVSSBjb2RlIHRo YXQgbWFuYWdlcyBzZWxlY3Rpb25zLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuUXVpY2tDb25z b2xlLnByb3RvdHlwZS5fZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRzVG9EaXNwbGF5KToK KyAgICAgICAgU3BlY2lhbC1jYXNlIGZvciB0aGUgbWFpbiBmcmFtZSBleGVjdXRpb24gY29udGV4 dC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2ZyYW1l UGFnZUV4ZWN1dGlvbkNvbnRleHRzQ2hhbmdlZCk6CisgICAgICAgIFJlbW92ZSBpbmRpcmVjdGlv bi4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2ZyYW1l RXhlY3V0aW9uQ29udGV4dHNDbGVhcmVkKToKKyAgICAgICAgRml4IHRoZSBndWFyZCB0byBoYW5k bGUgdW5kZWZpbmVkIGV4ZWN1dGlvbiBjb250ZXh0cyBpbiB0aGUgY2FzZSB3aGVyZSBpdCByZXBy ZXNlbnRzIHRoZSBtYWluIGZyYW1lICh1bmRlZmluZWQpLgorCisgICAgICAgIChXZWJJbnNwZWN0 b3IuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRDaGFuZ2Vk KToKKyAgICAgICAgUmVidWlsZCB3aGVuIHRoZSBtb2RlbCBjaGFuZ2VzLgorCisgICAgICAgIChX ZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fcGF0aENvbXBvbmVudFNlbGVjdGVk KTogU2ltcGxpZnkuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLnByb3RvdHlw ZS5nZXQgZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3JlbW92ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50Rm9yRnJhbWUpOgorICAgICAgICBNb3ZlIHRoZSBmYWxsYmFjayBzZWxlY3Rpb24gYmVoYXZp b3IgaW50byBSdW50aW1lTWFuYWdlci4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29u c29sZS5wcm90b3R5cGUuX3VwZGF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJh bWUpOiBEZWxldGVkLgorICAgICAgICBUaGlzIGhhcyBiZWVuIGRlYWQgY29kZSBldmVyIHNpbmNl IHdlIHJlbW92ZWQgaU9TIDYgbGVnYWN5IHN1cHBvcnQuCisKKzIwMTYtMDYtMjcgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUnVudGltZU1h bmFnZXIgc2hvdWxkIG5vdCB1c2UgdmlldyBvYmplY3QgV2ViSW5zcGVjdG9yLnF1aWNrQ29uc29s ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MDky CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTk2NjUyNj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1J1bnRpbWVNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGlt ZU1hbmFnZXIuanMKaW5kZXggYWU4NGMwZWI5NmE4MGVkYjJhZmVhMzk0OGViOGFhMGMyN2U0MGUy NC4uOTQwYTRhMzMwN2NlNjBhZGM5MTgwOTFkNjYyMWRhMDNmM2EwNDU4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvUnVudGltZU1hbmFnZXIuanMKQEAgLTMxLDYgKzMxLDggQEAgV2ViSW5zcGVjdG9yLlJ1 bnRpbWVNYW5hZ2VyID0gY2xhc3MgUnVudGltZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAKICAgICAgICAgLy8gRW5hYmxlIHRoZSBSdW50aW1lQWdlbnQgdG8gcmVjZWl2ZSBu b3RpZmljYXRpb24gb2YgZXhlY3V0aW9uIGNvbnRleHRzLgogICAgICAgICBSdW50aW1lQWdlbnQu ZW5hYmxlKCk7CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50LkV4ZWN1dGlvbkNvbnRleHRzQ2xlYXJlZCwgdGhpcy5f ZnJhbWVFeGVjdXRpb25Db250ZXh0c0NsZWFyZWQsIHRoaXMpOwogICAgIH0KIAogICAgIC8vIFB1 YmxpYwpAQCAtMTI0LDEzICsxMjYsMzIgQEAgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyID0g Y2xhc3MgUnVudGltZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgfQog CiAgICAgZ2V0IGRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllcigpIHsgcmV0dXJuIHRo aXMuX2RlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllcjsgfQotICAgIHNldCBkZWZhdWx0 RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIodmFsdWUpIHsgdGhpcy5fZGVmYXVsdEV4ZWN1dGlv bkNvbnRleHRJZGVudGlmaWVyID0gdmFsdWU7IH0KKyAgICBzZXQgZGVmYXVsdEV4ZWN1dGlvbkNv bnRleHRJZGVudGlmaWVyKHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2RlZmF1bHRF eGVjdXRpb25Db250ZXh0SWRlbnRpZmllciA9PT0gdmFsdWUpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgdGhpcy5fZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyID0gdmFs dWU7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5S dW50aW1lTWFuYWdlci5FdmVudC5EZWZhdWx0RXhlY3V0aW9uQ29udGV4dENoYW5nZWQpOworICAg IH0KKworICAgIC8vIFByaXZhdGUKKworICAgIF9mcmFtZUV4ZWN1dGlvbkNvbnRleHRzQ2xlYXJl ZChldmVudCkKKyAgICB7CisgICAgICAgIGxldCBjb250ZXh0cyA9IGV2ZW50LmRhdGEuY29udGV4 dHMgfHwgW107CisKKyAgICAgICAgbGV0IGN1cnJlbnRDb250ZXh0V2FzRGVzdHJveWVkID0gY29u dGV4dHMuc29tZSgoY29udGV4dCkgPT4gY29udGV4dC5pZCA9PT0gdGhpcy5fZGVmYXVsdEV4ZWN1 dGlvbkNvbnRleHRJZGVudGlmaWVyKTsKKyAgICAgICAgaWYgKGN1cnJlbnRDb250ZXh0V2FzRGVz dHJveWVkKQorICAgICAgICAgICAgdGhpcy5kZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZp ZXIgPSBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuVG9wTGV2ZWxFeGVjdXRpb25Db250ZXh0 SWRlbnRpZmllcjsKKyAgICB9CiB9OwogCiBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuVG9w TGV2ZWxFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciA9IHVuZGVmaW5lZDsKIAogV2ViSW5zcGVj dG9yLlJ1bnRpbWVNYW5hZ2VyLkV2ZW50ID0gewotICAgIERpZEV2YWx1YXRlOiAicnVudGltZS1t YW5hZ2VyLWRpZC1ldmFsdWF0ZSIKKyAgICBEaWRFdmFsdWF0ZTogU3ltYm9sKCJydW50aW1lLW1h bmFnZXItZGlkLWV2YWx1YXRlIiksCisgICAgRGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRDaGFuZ2Vk OiBTeW1ib2woInJ1bnRpbWUtbWFuYWdlci1kZWZhdWx0LWV4ZWN1dGlvbi1jb250ZXh0LWNoYW5n ZWQiKSwKIH07CiAKIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5Db25zb2xlT2JqZWN0R3Jv dXAgPSAiY29uc29sZSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvRnJhbWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvRnJhbWUuanMKaW5kZXggMTgxYjM3ZTNkNTdkMWU4NGY4OWYwN2Q5YmQ3OGE0 NTRhNTNlNmRmNS4uMzZjZmJlY2U0Nzg2YWNkNzZlM2FlM2M2MmQzMmE2NmYwYTAxNTlmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0ZyYW1l LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9GcmFt ZS5qcwpAQCAtMjA2LDggKzIwNiw5IEBAIFdlYkluc3BlY3Rvci5GcmFtZSA9IGNsYXNzIEZyYW1l IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgIGNsZWFyRXhlY3V0aW9uQ29udGV4dHMo Y29tbWl0dGluZ1Byb3Zpc2lvbmFsTG9hZCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9leGVj dXRpb25Db250ZXh0TGlzdC5jb250ZXh0cy5sZW5ndGgpIHsKKyAgICAgICAgICAgIGxldCBjb250 ZXh0cyA9IHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRMaXN0LmNvbnRleHRzLnNsaWNlKCk7CiAgICAg ICAgICAgICB0aGlzLl9leGVjdXRpb25Db250ZXh0TGlzdC5jbGVhcigpOwotICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50LkV4 ZWN1dGlvbkNvbnRleHRzQ2xlYXJlZCwge2NvbW1pdHRpbmdQcm92aXNpb25hbExvYWQ6ISFjb21t aXR0aW5nUHJvdmlzaW9uYWxMb2FkfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuRXhlY3V0aW9uQ29udGV4dHNDbGVh cmVkLCB7Y29tbWl0dGluZ1Byb3Zpc2lvbmFsTG9hZDohIWNvbW1pdHRpbmdQcm92aXNpb25hbExv YWQsIGNvbnRleHRzfSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwppbmRl eCA1ZTRmOTI2MWU0NWI4MGJhMjA4Mjk0NmEwNTgzZDdkMTI5MTA0Mjg1Li44MWY2Y2VmZTIzNGE2 NzgzODQyNDRkYjJjOTVlMzkwMzhmMmNjNmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMywgMjAxNSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMsIDIwMTUsIDIwMTYgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC0zMSw5ICszMSw4IEBAIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlj a0NvbnNvbGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogCiAgICAgICAgIHRoaXMuX3RvZ2ds ZU9yRm9jdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0KG51bGwsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5Fc2NhcGUsIHRoaXMu X3RvZ2dsZU9yRm9jdXMuYmluZCh0aGlzKSk7CiAKLSAgICAgICAgdmFyIG1haW5GcmFtZUV4ZWN1 dGlvbkNvbnRleHQgPSBuZXcgV2ViSW5zcGVjdG9yLkV4ZWN1dGlvbkNvbnRleHQoV2ViSW5zcGVj dG9yLlF1aWNrQ29uc29sZS5NYWluRnJhbWVDb250ZXh0RXhlY3V0aW9uSWRlbnRpZmllciwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJNYWluIEZyYW1lIiksIHRydWUsIG51bGwpOworICAgICAgICBs ZXQgbWFpbkZyYW1lRXhlY3V0aW9uQ29udGV4dCA9IG5ldyBXZWJJbnNwZWN0b3IuRXhlY3V0aW9u Q29udGV4dChXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuVG9wTGV2ZWxDb250ZXh0RXhlY3V0 aW9uSWRlbnRpZmllciwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNYWluIEZyYW1lIiksIHRydWUs IG51bGwpOwogICAgICAgICB0aGlzLl9tYWluRnJhbWVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBv bmVudCA9IHRoaXMuX2NyZWF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KG1haW5GcmFt ZUV4ZWN1dGlvbkNvbnRleHQubmFtZSwgbWFpbkZyYW1lRXhlY3V0aW9uQ29udGV4dC5pZGVudGlm aWVyKTsKLSAgICAgICAgdGhpcy5fc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVu dCA9IHRoaXMuX21haW5GcmFtZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50OwogCiAgICAg ICAgIHRoaXMuX290aGVyRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRzID0gW107CiAgICAg ICAgIHRoaXMuX2ZyYW1lSWRlbnRpZmllclRvRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRN YXAgPSB7fTsKQEAgLTcwLDYgKzY5LDggQEAgV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZSA9IGNs YXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIFdlYklu c3BlY3Rvci5GcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5F eGVjdXRpb25Db250ZXh0c0NsZWFyZWQsIHRoaXMuX2ZyYW1lRXhlY3V0aW9uQ29udGV4dHNDbGVh cmVkLCB0aGlzKTsKIAogICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5BY3RpdmVDYWxs RnJhbWVEaWRDaGFuZ2UsIHRoaXMuX2RlYnVnZ2VyQWN0aXZlQ2FsbEZyYW1lRGlkQ2hhbmdlLCB0 aGlzKTsKKworICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuRXZlbnQuRGVmYXVsdEV4ZWN1dGlvbkNv bnRleHRDaGFuZ2VkLCB0aGlzLl9kZWZhdWx0RXhlY3V0aW9uQ29udGV4dENoYW5nZWQsIHRoaXMp OwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpAQCAtNzksOSArODAsMTcgQEAgV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5W aWV3CiAgICAgICAgIHJldHVybiB0aGlzLl9uYXZpZ2F0aW9uQmFyOwogICAgIH0KIAotICAgIGdl dCBleGVjdXRpb25Db250ZXh0SWRlbnRpZmllcigpCisgICAgZ2V0IHNlbGVjdGVkRXhlY3V0aW9u Q29udGV4dElkZW50aWZpZXIoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NlbGVjdGVk RXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQuX2V4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVy OworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVj dXRpb25Db250ZXh0SWRlbnRpZmllcjsKKyAgICB9CisKKyAgICBzZXQgc2VsZWN0ZWRFeGVjdXRp b25Db250ZXh0SWRlbnRpZmllcih2YWx1ZSkKKyAgICB7CisgICAgICAgIGlmICh2YWx1ZSA9PT0g dGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5kZWZhdWx0RXhlY3V0 aW9uQ29udGV4dElkZW50aWZpZXIgPSB2YWx1ZTsKICAgICB9CiAKICAgICBjb25zb2xlTG9nVmlz aWJpbGl0eUNoYW5nZWQodmlzaWJsZSkKQEAgLTEyNCw3ICsxMzMsMTAgQEAgV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5W aWV3CiAgICAgICAgIGlmICghdGhpcy5fb3RoZXJFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVu dHMubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIFtdOwogCi0gICAgICAgIHJldHVybiBbdGhp cy5fc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudF07CisgICAgICAgIGlmICh0 aGlzLnNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgPT09IHRoaXMuX21haW5GcmFt ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Ll9leGVjdXRpb25Db250ZXh0SWRlbnRpZmll cikKKyAgICAgICAgICAgIHJldHVybiBbdGhpcy5fbWFpbkZyYW1lRXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnRdOworCisgICAgICAgIHJldHVybiB0aGlzLl9vdGhlckV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50cy5maWx0ZXIoKGNvbXBvbmVudCkgPT4gY29tcG9uZW50Ll9leGVjdXRp b25Db250ZXh0SWRlbnRpZmllciA9PT0gdGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRJZGVu dGlmaWVyKTsKICAgICB9CiAKICAgICBfcmVidWlsZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50cygpCkBAIC0xNDcsMzAgKzE1OSwzMyBAQCBXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlID0g Y2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdmFy IG5ld0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0gdGhpcy5faW5zZXJ0RXhlY3V0aW9u Q29udGV4dFBhdGhDb21wb25lbnRGb3JGcmFtZShmcmFtZSwgc2hvdWxkQXV0b21hdGljYWxseVNl bGVjdCk7CiAKICAgICAgICAgaWYgKHNob3VsZEF1dG9tYXRpY2FsbHlTZWxlY3QpIHsKLSAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJh bWU7Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50ID0gbmV3RXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQ7Ci0gICAgICAgICAgICBXZWJJ bnNwZWN0b3IucnVudGltZU1hbmFnZXIuZGVmYXVsdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVy ID0gdGhpcy5leGVjdXRpb25Db250ZXh0SWRlbnRpZmllcjsKLSAgICAgICAgICAgIHRoaXMuX3Jl YnVpbGRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMoKTsKKyAgICAgICAgICAgIHRoaXMu X3Jlc3RvcmVTZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZSA9IG51bGw7CisgICAgICAg ICAgICB0aGlzLnNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgPSBuZXdFeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudC5fZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI7CiAgICAg ICAgIH0KICAgICB9CiAKICAgICBfZnJhbWVFeGVjdXRpb25Db250ZXh0c0NsZWFyZWQoZXZlbnQp CiAgICAgewotICAgICAgICB2YXIgZnJhbWUgPSBldmVudC50YXJnZXQ7CisgICAgICAgIGxldCBm cmFtZSA9IGV2ZW50LnRhcmdldDsKIAogICAgICAgICAvLyBJZiB0aGlzIGZyYW1lIGlzIG5hdmln YXRpbmcgYW5kIGl0IGlzIHNlbGVjdGVkIGluIHRoZSBVSSB3ZSB3YW50IHRvIHJlc2VsZWN0IGl0 cyBuZXcgaXRlbSBhZnRlciBuYXZpZ2F0aW9uLgogICAgICAgICBpZiAoZXZlbnQuZGF0YS5jb21t aXR0aW5nUHJvdmlzaW9uYWxMb2FkICYmICF0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25D b250ZXh0Rm9yRnJhbWUpIHsKLSAgICAgICAgICAgIHZhciBleGVjdXRpb25Db250ZXh0UGF0aENv bXBvbmVudCA9IHRoaXMuX2ZyYW1lSWRlbnRpZmllclRvRXhlY3V0aW9uQ29udGV4dFBhdGhDb21w b25lbnRNYXBbZnJhbWUuaWRdOwotICAgICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnQgPT09IGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 KSB7CisgICAgICAgICAgICBsZXQgZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQgPSB0aGlz Ll9mcmFtZUlkZW50aWZpZXJUb0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50TWFwW2ZyYW1l LmlkXTsKKyAgICAgICAgICAgIGlmIChleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCAmJiBl eGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudC5fZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIg PT09IHRoaXMuc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllcikgewogICAgICAgICAg ICAgICAgIHRoaXMuX3Jlc3RvcmVTZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZSA9IGZy YW1lOwogICAgICAgICAgICAgICAgIC8vIEFzIGEgZmFpbCBzYWZlLCBpZiB0aGUgZnJhbWUgbmV2 ZXIgZ2V0cyBhbiBleGVjdXRpb24gY29udGV4dCwgY2xlYXIgdGhlIHJlc3RvcmUgdmFsdWUuCi0g ICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsgZGVsZXRlIHRoaXMuX3Jlc3Rv cmVTZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZTsgfS5iaW5kKHRoaXMpLCAxMCk7Cisg ICAgICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7IHRoaXMuX3Jlc3RvcmVTZWxlY3RlZEV4 ZWN1dGlvbkNvbnRleHRGb3JGcmFtZSA9IGZhbHNlOyB9LCAxMCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAogICAgICAgICB0aGlzLl9yZW1vdmVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBv bmVudEZvckZyYW1lKGZyYW1lKTsKICAgICB9CiAKKyAgICBfZGVmYXVsdEV4ZWN1dGlvbkNvbnRl eHRDaGFuZ2VkKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVidWlsZEV4ZWN1dGlvbkNv bnRleHRQYXRoQ29tcG9uZW50cygpOworICAgIH0KKwogICAgIF9jcmVhdGVFeGVjdXRpb25Db250 ZXh0UGF0aENvbXBvbmVudChuYW1lLCBpZGVudGlmaWVyKQogICAgIHsKICAgICAgICAgdmFyIHBh dGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQo bmFtZSwgImV4ZWN1dGlvbi1jb250ZXh0IiwgaWRlbnRpZmllciwgdHJ1ZSwgdHJ1ZSk7CkBAIC0y NjEsMTEgKzI3Niw2IEBAIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0Nv bnNvbGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBpZiAobmV4dCkKICAgICAg ICAgICAgIG5leHQucHJldmlvdXNTaWJsaW5nID0gcHJldjsKIAotICAgICAgICBpZiAodGhpcy5f c2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9PT0gZXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnQpIHsKLSAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkRXhlY3V0aW9uQ29u dGV4dFBhdGhDb21wb25lbnQgPSB0aGlzLl9tYWluRnJhbWVFeGVjdXRpb25Db250ZXh0UGF0aENv bXBvbmVudDsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5kZWZhdWx0 RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgPSB0aGlzLmV4ZWN1dGlvbkNvbnRleHRJZGVudGlm aWVyOwotICAgICAgICB9Ci0KICAgICAgICAgdGhpcy5fb3RoZXJFeGVjdXRpb25Db250ZXh0UGF0 aENvbXBvbmVudHMucmVtb3ZlKGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50LCB0cnVlKTsK ICAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lSWRlbnRpZmllclRvRXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnRNYXBbZnJhbWUuaWRdOwogCkBAIC0yNzMsMzcgKzI4Myw5IEBAIFdlYkluc3Bl Y3Rvci5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuVmlldwogICAgICAgICAgICAgdGhpcy5fcmVidWlsZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50cygpOwogICAgIH0KIAotICAgIF91cGRhdGVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBv bmVudEZvckZyYW1lKGZyYW1lKQotICAgIHsKLSAgICAgICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1l KCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIGV4ZWN1dGlvbkNvbnRleHRQ YXRoQ29tcG9uZW50ID0gdGhpcy5fZnJhbWVJZGVudGlmaWVyVG9FeGVjdXRpb25Db250ZXh0UGF0 aENvbXBvbmVudE1hcFtmcmFtZS5pZF07Ci0gICAgICAgIGlmICghZXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIHdhc1NlbGVj dGVkID0gdGhpcy5fc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9PT0gZXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQ7Ci0KLSAgICAgICAgdGhpcy5fcmVtb3ZlRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnRGb3JGcmFtZShmcmFtZSwgdHJ1ZSk7Ci0gICAgICAgIHZh ciBuZXdFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMuX2luc2VydEV4ZWN1dGlv bkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUoZnJhbWUsIHRydWUpOwotCi0gICAgICAgIGlm ICh3YXNTZWxlY3RlZCkgewotICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRFeGVjdXRpb25Db250 ZXh0UGF0aENvbXBvbmVudCA9IG5ld0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50OwotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250 ZXh0SWRlbnRpZmllciA9IHRoaXMuZXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI7Ci0gICAgICAg IH0KLQotICAgICAgICB0aGlzLl9yZWJ1aWxkRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRz KCk7Ci0gICAgfQotCiAgICAgX3BhdGhDb21wb25lbnRTZWxlY3RlZChldmVudCkKICAgICB7Ci0g ICAgICAgIGlmIChldmVudC5kYXRhLnBhdGhDb21wb25lbnQgPT09IHRoaXMuX3NlbGVjdGVkRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAg ICAgdGhpcy5fc2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IGV2ZW50LmRh dGEucGF0aENvbXBvbmVudDsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRl ZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciA9IHRoaXMuZXhlY3V0aW9uQ29udGV4dElk ZW50aWZpZXI7Ci0KLSAgICAgICAgdGhpcy5fcmVidWlsZEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50cygpOworICAgICAgICB0aGlzLnNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dElkZW50aWZp ZXIgPSBldmVudC5kYXRhLnBhdGhDb21wb25lbnQuX2V4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVy OwogICAgIH0KIAogICAgIF9wYXRoQ29tcG9uZW50Q2xpY2tlZChldmVudCkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhZDY1 MWU2ZGUzYmIxN2QyMDIyZDIxYTNhNDkwNmY5MGMyMjE5NmUwLi43ZGMxN2I4MmFiNWY3MjdjODQ3 NjkyMTMyMTUwMWRmNzlkNTk3MWY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTYtMDYtMjcg IEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog UXVpY2tDb25zb2xlIHNob3VsZCB1cGRhdGUgaXRzIHNlbGVjdGlvbiB3aGVuIFJ1bnRpbWVNYW5h Z2VyLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciBjaGFuZ2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkxODMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgdGVzdCBjYXNl IGZvciByZXZlcnRpbmcgdG8gdGhlIHRvcC1sZXZlbCBleGVjdXRpb24gY29udGV4dCB3aGVuIHRo ZSBzZWxlY3RlZCBjb250ZXh0IGlzIGRlc3Ryb3llZC4KKworICAgICAgICAqIGluc3BlY3Rvci9y dW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLWV4cGVjdGVkLnR4dDoK KyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGltZS9jaGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRl bnRpZmllci5odG1sOgorCisyMDE2LTA2LTI3ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29t PgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJ1bnRpbWVNYW5hZ2VyIHNob3VsZCBub3QgdXNl IHZpZXcgb2JqZWN0IFdlYkluc3BlY3Rvci5xdWlja0NvbnNvbGUKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODA5MgogICAgICAgICA8cmRhcjovL3By b2JsZW0vMTU5NjY1MjY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGlt ZS9jaGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRpZmllci1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9jaGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRp Zmllci1leHBlY3RlZC50eHQKaW5kZXggYzBlMWZkMTY1MzIyMTBiNWUxZWFkYWRjNzZjNTAxMWUy YjI5YmU4Yy4uZTFiYTdhNTZmYjI4OGMxZjRhNGI5ZTdjNzRhOWJhYTgzNjQ2MjljYyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvY2hhbmdlLWV4ZWN1dGlvbi1jb250 ZXh0LWlkZW50aWZpZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9y dW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLWV4cGVjdGVkLnR4dApA QCAtMSw0ICsxLDMgQEAKLQogVGVzdCB0aGF0IFJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNw ZWN0ZWRXaW5kb3cgcmVzcGVjdHMgdGhlIHNlbGVjdGVkIGV4ZWN1dGlvbiBjb250ZXh0LgogCiAK QEAgLTE5LDMgKzE4LDggQEAgUEFTUzogVGhlIHBhc3NwaHJhc2Ugc2hvdWxkIG1hdGNoIHRoZSBw aHJhc2UgZGVmaW5lZCBpbiB0aGUgc3ViZnJhbWUuCiBQYXNzcGhyYXNlIGluIHNlbGVjdGVkIGZy YW1lOiBjb2xkd2F0ZXIKIFBBU1M6IFRoZSBwYXNzcGhyYXNlIHNob3VsZCBtYXRjaCB0aGUgcGhy YXNlIGRlZmluZWQgaW4gdGhlIG1haW4gZnJhbWUuCiAKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBT Y3JpcHRFeGVjdXRpb25Db250ZXh0UmVtb3ZlU3ViZnJhbWUKK1BBU1M6IFRoZSB0ZXN0IHBhZ2Ug c2hvdWxkIG9ubHkgaGF2ZSBvbmUgc3ViLWZyYW1lLgorUEFTUzogVGhlIHRlc3QgcGFnZSBzaG91 bGQgbm93IGhhdmUgbm8gc3ViLWZyYW1lcy4KK1BBU1M6IFdoZW4gYSBzZWxlY3RlZCBub24tdG9w LWxldmVsIGV4ZWN1dGlvbiBjb250ZXh0IGlzIHJlbW92ZWQsIHRoZSBkZWZhdWx0IGV4ZWN1dGlv biBjb250ZXh0IHNob3VsZCByZXZlcnQgdG8gdGhlIHRvcC1sZXZlbCBjb250ZXh0LgorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9jaGFuZ2UtZXhlY3V0aW9uLWNv bnRleHQtaWRlbnRpZmllci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvY2hh bmdlLWV4ZWN1dGlvbi1jb250ZXh0LWlkZW50aWZpZXIuaHRtbAppbmRleCA0Y2Y1ZjExODg2MTg3 OTc1YjkxYjdiZTU1Mjc1Y2NmODQ0N2EwMWMzLi41MmZhYTJhNGUxOWYxZmEzOGMzMDBlOGNjNDMx MDMzYzhmMjdkNjQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9j aGFuZ2UtZXhlY3V0aW9uLWNvbnRleHQtaWRlbnRpZmllci5odG1sCisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL2NoYW5nZS1leGVjdXRpb24tY29udGV4dC1pZGVudGlmaWVyLmh0 bWwKQEAgLTM2LDcgKzM2LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGRlc2NyaXB0aW9u OiAiVGVzdCB0aGF0IGV2YWx1YXRlSW5JbnNwZWN0ZWRXaW5kb3cgd29ya3Mgd2hlbiBkZWZhdWx0 RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgaXMgYSBzdWJmcmFtZSBjb250ZXh0LiIsCiAgICAg ICAgIHRlc3Q6IChyZXNvbHZlLCByZWplY3QpID0+IHsKICAgICAgICAgICAgIGxldCBtYWluRnJh bWUgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lOwotICAgICAg ICAgICAgbGV0IHN1YmZyYW1lcyA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5m cmFtZXMuZmlsdGVyKChmcmFtZSkgPT4gZnJhbWUgIT0gbWFpbkZyYW1lKTsKKyAgICAgICAgICAg IGxldCBzdWJmcmFtZXMgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIuZnJhbWVz LmZpbHRlcigoZnJhbWUpID0+IGZyYW1lICE9PSBtYWluRnJhbWUpOwogICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5leHBlY3RUaGF0KHN1YmZyYW1lcy5sZW5ndGggPT09IDEsICJUaGUgdGVzdCBw YWdlIHNob3VsZCBvbmx5IGhhdmUgb25lIHN1Yi1mcmFtZS4iKTsKIAogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmll ciA9IHN1YmZyYW1lc1swXS5wYWdlRXhlY3V0aW9uQ29udGV4dC5pZDsKQEAgLTYzLDEyICs2Mywz NSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgfQogICAgIH0pOwogCisgICAgc3VpdGUuYWRk VGVzdENhc2UoeworICAgICAgICBuYW1lOiAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dFJlbW92ZVN1 YmZyYW1lIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IHRoYXQgZXZhbHVhdGVJbkluc3Bl Y3RlZFdpbmRvdyB3b3JrcyB3aGVuIHRoZSBkZWZhdWx0RXhlY3V0aW9uQ29udGV4dElkZW50aWZp ZXIgaXMgZGVzdHJveWVkIGFuZCByZXZlcnRzIHRvIHRoZSB0b3AtbGV2ZWwgY29udGV4dC4iLAor ICAgICAgICB0ZXN0OiAocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBsZXQgbWFp bkZyYW1lID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZTsKKyAg ICAgICAgICAgIGxldCBzdWJmcmFtZXMgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFn ZXIuZnJhbWVzLmZpbHRlcigoZnJhbWUpID0+IGZyYW1lICE9PSBtYWluRnJhbWUpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHN1YmZyYW1lcy5sZW5ndGggPT09IDEsICJU aGUgdGVzdCBwYWdlIHNob3VsZCBvbmx5IGhhdmUgb25lIHN1Yi1mcmFtZS4iKTsKKworICAgICAg ICAgICAgLy8gU2V0IHRoZSBleGVjdXRpb24gY29udGV4dCB0byB0aGUgc3ViZnJhbWUgc28gd2Ug Y2FuIHN3aXRjaCBhd2F5IGZyb20gaXQgd2hlbiB0aGUgZnJhbWUgaXMgZGV0YWNoZWQuCisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuZGVmYXVsdEV4ZWN1dGlvbkNvbnRl eHRJZGVudGlmaWVyID0gc3ViZnJhbWVzWzBdLnBhZ2VFeGVjdXRpb25Db250ZXh0LmlkOworCisg ICAgICAgICAgICAvLyBGb3JjZS1vdmVycmlkZSB0aGUgY29udGV4dElkLCBvdGhlcndpc2Ugd2Ug d29uJ3QgYmUgYWJsZSB0byBhY2Nlc3MgdGhlIGlmcmFtZSdzIERPTSBlbGVtZW50IHdoZW4gZXZh bHVhdGluZyBpbiB0aGUgaWZyYW1lIGV4ZWN1dGlvbiBjb250ZXh0LgorICAgICAgICAgICAgbGV0 IGV4cHJlc3Npb24gPSBgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN1YmZyYW1lIikucmVtb3Zl KCk7YDsKKyAgICAgICAgICAgIGxldCBvYmplY3RHcm91cCA9ICJ0ZXN0IjsKKyAgICAgICAgICAg IGxldCBjb250ZXh0SWQgPSBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuVG9wTGV2ZWxFeGVj dXRpb25Db250ZXh0SWRlbnRpZmllcjsKKyAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0 ZS5pbnZva2Uoe2V4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBjb250ZXh0SWR9LCAoKSA9PiB7Cisg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KFdlYkluc3BlY3Rvci5mcmFt ZVJlc291cmNlTWFuYWdlci5mcmFtZXMubGVuZ3RoID09PSAxLCAiVGhlIHRlc3QgcGFnZSBzaG91 bGQgbm93IGhhdmUgbm8gc3ViLWZyYW1lcy4iKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdFRoYXQoV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmRlZmF1bHRFeGVjdXRp b25Db250ZXh0SWRlbnRpZmllciA9PT0gV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLlRvcExl dmVsRXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIsICJXaGVuIGEgc2VsZWN0ZWQgbm9uLXRvcC1s ZXZlbCBleGVjdXRpb24gY29udGV4dCBpcyByZW1vdmVkLCB0aGUgZGVmYXVsdCBleGVjdXRpb24g Y29udGV4dCBzaG91bGQgcmV2ZXJ0IHRvIHRoZSB0b3AtbGV2ZWwgY29udGV4dC4iKTsKKyAgICAg ICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0p OworCiAgICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7CiB9CiA8L3NjcmlwdD4KIDwv aGVhZD4KIDxib2R5PgotPGlmcmFtZSBzcmM9InJlc291cmNlcy9jaGFuZ2UtZXhlY3V0aW9uLWNv bnRleHQtaWRlbnRpZmllci1zdWJmcmFtZS5odG1sIiBvbmxvYWQ9InJ1blRlc3QoKSI+PC9pZnJh bWU+Cis8aWZyYW1lIGlkPSJzdWJmcmFtZSIgc3JjPSJyZXNvdXJjZXMvY2hhbmdlLWV4ZWN1dGlv bi1jb250ZXh0LWlkZW50aWZpZXItc3ViZnJhbWUuaHRtbCIgb25sb2FkPSJydW5UZXN0KCkiPjwv aWZyYW1lPgogPHA+VGVzdCB0aGF0IFJ1bnRpbWVNYW5hZ2VyLmV2YWx1YXRlSW5JbnNwZWN0ZWRX aW5kb3cgcmVzcGVjdHMgdGhlIHNlbGVjdGVkIGV4ZWN1dGlvbiBjb250ZXh0LjwvcD4KIDwvYm9k eT4KIDwvaHRtbD4K