203155 2019-10-18 09:58:18 -0700 Web Inspector: Elements: $0 is shown for the wrong node when selecting elements in a user agent shadow tree 2019-10-18 15:29:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1581443 0 hi 2019-10-18 09:58:18 -0700 # STEPS TO REPRODUCE: 1. inspect any page with a UserAgent shadow tree (e.g. an `<input>`) 2. in the Elements Tab, select a node inside the UserAgent shadow tree => $0 appears next to the newly selected node 3. evaluate `$0` in the Console => the previously selected node (NOT the node inside the UserAgent shadow tree) is logged 1581446 1 381311 hi 2019-10-18 10:01:08 -0700 Created attachment 381311 Patch 1581505 2 381311 mattbaker 2019-10-18 13:57:53 -0700 Comment on attachment 381311 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381311&action=review r=me > Source/WebInspectorUI/ChangeLog:8 > + Rather than "blindly" using the last selected node (from `WI.TreeOutline`), we should wait Switch to a more descriptive term like 'naively', so you can eliminate the double-quotes. > Source/WebInspectorUI/ChangeLog:9 > + to see if the inspected page actually "accepts" the selected node as being inspectable and Let's not use quotation marks around words like this. AMA style says that other than quoting material directly from a source, quotation marks are used "to introduce a word or phrase used as an ironic comment, as slang, or as an invented or coined expression". Pick words that are more technical/descriptive if necessary, or just remove the quotes. 1581513 3 381326 hi 2019-10-18 14:17:56 -0700 Created attachment 381326 Patch 1581563 4 381326 commit-queue 2019-10-18 15:28:05 -0700 Comment on attachment 381326 Patch Clearing flags on attachment: 381326 Committed r251302: <https://trac.webkit.org/changeset/251302> 1581564 5 commit-queue 2019-10-18 15:28:06 -0700 All reviewed patches have been landed. Closing bug. 1581566 6 webkit-bug-importer 2019-10-18 15:29:19 -0700 <rdar://problem/56421773> 381311 2019-10-18 10:01:08 -0700 2019-10-18 14:17:56 -0700 Patch 203155.diff text/plain 8236 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE2MjFjMzVjMjM0Li45MjRlODIwZjQ1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMTAtMTggIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVs ZW1lbnRzOiAkMCBpcyBzaG93biBmb3IgdGhlIHdyb25nIG5vZGUgd2hlbiBzZWxlY3RpbmcgZWxl bWVudHMgaW4gYSB1c2VyIGFnZW50IHNoYWRvdyB0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDMxNTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSYXRoZXIgdGhhbiAiYmxpbmRseSIgdXNpbmcgdGhl IGxhc3Qgc2VsZWN0ZWQgbm9kZSAoZnJvbSBgV0kuVHJlZU91dGxpbmVgKSwgd2Ugc2hvdWxkIHdh aXQKKyAgICAgICAgdG8gc2VlIGlmIHRoZSBpbnNwZWN0ZWQgcGFnZSBhY3R1YWxseSAiYWNjZXB0 cyIgdGhlIHNlbGVjdGVkIG5vZGUgYXMgYmVpbmcgaW5zcGVjdGFibGUgYW5kCisgICAgICAgIG9u bHkgc2hvdyB0aGUgYCQwYCBpZiBpdCBkb2VzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9D b250cm9sbGVycy9ET01NYW5hZ2VyLmpzOgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5 cGUuc2V0SW5zcGVjdGVkTm9kZSk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkRPTVRyZWVDb250ZW50Vmlldyk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qczoKKyAgICAgICAg KFdJLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5faGFuZGxlSW5zcGVjdGVkTm9kZUNoYW5nZWQp OiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNz czoKKyAgICAgICAgKC50cmVlLW91dGxpbmUuZG9tIGxpLmluc3BlY3RlZC1ub2RlID4gc3Bhbjo6 YWZ0ZXIpOiBBZGRlZC4KKyAgICAgICAgKC50cmVlLW91dGxpbmUuZG9tOmZvY3VzIGxpLmluc3Bl Y3RlZC1ub2RlLnNlbGVjdGVkID4gc3Bhbjo6YWZ0ZXIpOiBBZGRlZC4KKyAgICAgICAgKC50cmVl LW91dGxpbmUuZG9tLnNob3ctbGFzdC1zZWxlY3RlZCBsaS5sYXN0LXNlbGVjdGVkID4gc3Bhbjo6 YWZ0ZXIpOiBEZWxldGVkLgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb20uc2hvdy1sYXN0LXNl bGVjdGVkOmZvY3VzIGxpLmxhc3Qtc2VsZWN0ZWQgPiBzcGFuOjphZnRlcik6IERlbGV0ZWQuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAo V0kuVHJlZU91dGxpbmUucHJvdG90eXBlLnNlbGVjdGlvbkNvbnRyb2xsZXJTZWxlY3Rpb25EaWRD aGFuZ2UpOgorCiAyMDE5LTEwLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBFbGVtZW50czogc2VsZWN0aW9uIHNob3VsZG4ndCBi ZSBkaW1tZWQgYnkgc2hhZG93IHRyZWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwppbmRleCA4 NTZkNDgyYjM5Zi4uNzM1MmU1YjY2YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwpAQCAt NTg1LDkgKzU4NSwxMCBAQCBXSS5ET01NYW5hZ2VyID0gY2xhc3MgRE9NTWFuYWdlciBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgICAgIHJldHVy bjsKIAorICAgICAgICAgICAgbGV0IGxhc3RJbnNwZWN0ZWROb2RlID0gdGhpcy5faW5zcGVjdGVk Tm9kZTsKICAgICAgICAgICAgIHRoaXMuX2luc3BlY3RlZE5vZGUgPSBub2RlOwogCi0gICAgICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5ET01NYW5hZ2VyLkV2ZW50Lklu c3BlY3RlZE5vZGVDaGFuZ2VkKTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdJLkRPTU1hbmFnZXIuRXZlbnQuSW5zcGVjdGVkTm9kZUNoYW5nZWQsIHtsYXN0SW5z cGVjdGVkTm9kZX0pOwogICAgICAgICB9OwogCiAgICAgICAgIGxldCB0YXJnZXQgPSBXSS5hc3N1 bWluZ01haW5UYXJnZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcwppbmRleCAyZmQ3 ZmIyZWQ4OC4uOGI2OWVkMWUzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMKQEAg LTY3LDcgKzY3LDcgQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRl bnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNz TGlzdC5hZGQoImRvbS10cmVlIik7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX21vdXNlV2FzQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAK LSAgICAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUgPSBuZXcgV0kuRE9NVHJlZU91dGxpbmUoe29t aXRSb290RE9NTm9kZTogdHJ1ZSwgZXhjbHVkZVJldmVhbEVsZW1lbnRDb250ZXh0TWVudTogdHJ1 ZSwgc2hvd0xhc3RTZWxlY3RlZDogdHJ1ZX0pOworICAgICAgICB0aGlzLl9kb21UcmVlT3V0bGlu ZSA9IG5ldyBXSS5ET01UcmVlT3V0bGluZSh7b21pdFJvb3RET01Ob2RlOiB0cnVlLCBleGNsdWRl UmV2ZWFsRWxlbWVudENvbnRleHRNZW51OiB0cnVlLCBzaG93SW5zcGVjdGVkTm9kZTogdHJ1ZX0p OwogICAgICAgICB0aGlzLl9kb21UcmVlT3V0bGluZS5hbGxvd3NFbXB0eVNlbGVjdGlvbiA9IGZh bHNlOwogICAgICAgICB0aGlzLl9kb21UcmVlT3V0bGluZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlv biA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIo V0kuVHJlZU91dGxpbmUuRXZlbnQuRWxlbWVudEFkZGVkLCB0aGlzLl9kb21UcmVlRWxlbWVudEFk ZGVkLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwppbmRleCA3ODYxMzgzMDE0Yy4uYTJk MWIwZjc5YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5jc3MKQEAgLTc0LDE0ICs3NCwxNCBAQAog ICAgIHotaW5kZXg6IDE7CiB9CiAKLS50cmVlLW91dGxpbmUuZG9tLnNob3ctbGFzdC1zZWxlY3Rl ZCBsaS5sYXN0LXNlbGVjdGVkID4gc3Bhbjo6YWZ0ZXIgeworLnRyZWUtb3V0bGluZS5kb20gbGku aW5zcGVjdGVkLW5vZGUgPiBzcGFuOjphZnRlciB7CiAgICAgY29udGVudDogIiA9ICIgdmFyKC0t Y29uc29sZS1zYXZlZC1yZXN1bHQtcHJlZml4KSAiMCI7CiAgICAgY29sb3I6IHZhcigtLWNvbnNv bGUtc2Vjb25kYXJ5LXRleHQtY29sb3IpOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICB3 aGl0ZS1zcGFjZTogcHJlOwogfQogCi0udHJlZS1vdXRsaW5lLmRvbS5zaG93LWxhc3Qtc2VsZWN0 ZWQ6Zm9jdXMgbGkubGFzdC1zZWxlY3RlZCA+IHNwYW46OmFmdGVyIHsKKy50cmVlLW91dGxpbmUu ZG9tOmZvY3VzIGxpLmluc3BlY3RlZC1ub2RlLnNlbGVjdGVkID4gc3Bhbjo6YWZ0ZXIgewogICAg IGNvbG9yOiB2YXIoLS1zZWxlY3RlZC1zZWNvbmRhcnktdGV4dC1jb2xvcik7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVP dXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZU91dGxpbmUuanMKaW5kZXggYTkzMmM2ZDA4YzIuLjQwMDU2NGZiMDQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGlu ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlT3V0bGluZS5qcwpAQCAtMzAsNyArMzAsNyBAQAogCiBXSS5ET01UcmVlT3V0bGluZSA9IGNs YXNzIERPTVRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKIHsKLSAgICBjb25zdHJ1 Y3Rvcih7c2VsZWN0YWJsZSwgb21pdFJvb3RET01Ob2RlLCBleGNsdWRlUmV2ZWFsRWxlbWVudENv bnRleHRNZW51LCBzaG93TGFzdFNlbGVjdGVkfSA9IHt9KQorICAgIGNvbnN0cnVjdG9yKHtzZWxl Y3RhYmxlLCBvbWl0Um9vdERPTU5vZGUsIGV4Y2x1ZGVSZXZlYWxFbGVtZW50Q29udGV4dE1lbnUs IHNob3dJbnNwZWN0ZWROb2RlfSA9IHt9KQogICAgIHsKICAgICAgICAgc3VwZXIoc2VsZWN0YWJs ZSk7CiAKQEAgLTQ2LDkgKzQ2LDYgQEAgV0kuRE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVl T3V0bGluZSBleHRlbmRzIFdJLlRyZWVPdXRsaW5lCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJkb20iLCBXSS5TeW50YXhIaWdobGlnaHRlZFN0eWxlQ2xhc3NOYW1lKTsKICAg ICAgICAgdGhpcy5lbGVtZW50LmRpciA9ICJsdHIiOwogCi0gICAgICAgIGlmIChzaG93TGFzdFNl bGVjdGVkKQotICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInNob3ctbGFz dC1zZWxlY3RlZCIpOwotCiAgICAgICAgIHRoaXMuX2luY2x1ZGVSb290RE9NTm9kZSA9ICFvbWl0 Um9vdERPTU5vZGU7CiAgICAgICAgIHRoaXMuX2V4Y2x1ZGVSZXZlYWxFbGVtZW50Q29udGV4dE1l bnUgPSBleGNsdWRlUmV2ZWFsRWxlbWVudENvbnRleHRNZW51OwogICAgICAgICB0aGlzLl9yb290 RE9NTm9kZSA9IG51bGw7CkBAIC02NCw2ICs2MSw5IEBAIFdJLkRPTVRyZWVPdXRsaW5lID0gY2xh c3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5UcmVlT3V0bGluZQogICAgICAgICB0aGlzLl9o aWRlRWxlbWVudHNLZXlib2FyZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1bHQgPSBm YWxzZTsKIAogICAgICAgICBXSS5zZXR0aW5ncy5zaG93U2hhZG93RE9NLmFkZEV2ZW50TGlzdGVu ZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9zaG93U2hhZG93RE9NU2V0dGluZ0No YW5nZWQsIHRoaXMpOworCisgICAgICAgIGlmIChzaG93SW5zcGVjdGVkTm9kZSkKKyAgICAgICAg ICAgIFdJLmRvbU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01NYW5hZ2VyLkV2ZW50Lklu c3BlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9oYW5kbGVJbnNwZWN0ZWROb2RlQ2hhbmdlZCwgdGhp cyk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC02NjAsNiArNjYwLDIxIEBAIFdJLkRPTVRy ZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5UcmVlT3V0bGluZQog ICAgICAgICAgICAgdGhpcy5zZWxlY3RET01Ob2RlKG5vZGVUb1NlbGVjdCk7CiAgICAgfQogCisg ICAgX2hhbmRsZUluc3BlY3RlZE5vZGVDaGFuZ2VkKGV2ZW50KQorICAgIHsKKyAgICAgICAgbGV0 IHtsYXN0SW5zcGVjdGVkTm9kZX0gPSBldmVudC5kYXRhOworCisgICAgICAgIGlmIChsYXN0SW5z cGVjdGVkTm9kZSkgeworICAgICAgICAgICAgbGV0IGxhc3RJbnNwZWN0ZWROb2RlVHJlZUVsZW1l bnQgPSB0aGlzLmZpbmRUcmVlRWxlbWVudChsYXN0SW5zcGVjdGVkTm9kZSk7CisgICAgICAgICAg ICBpZiAobGFzdEluc3BlY3RlZE5vZGVUcmVlRWxlbWVudCkKKyAgICAgICAgICAgICAgICBsYXN0 SW5zcGVjdGVkTm9kZVRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QucmVtb3Zl KCJpbnNwZWN0ZWQtbm9kZSIpOworICAgICAgICB9CisKKyAgICAgICAgbGV0IGluc3BlY3RlZE5v ZGVUcmVlRWxlbWVudCA9IHRoaXMuZmluZFRyZWVFbGVtZW50KFdJLmRvbU1hbmFnZXIuaW5zcGVj dGVkTm9kZSk7CisgICAgICAgIGlmIChpbnNwZWN0ZWROb2RlVHJlZUVsZW1lbnQpCisgICAgICAg ICAgICBpbnNwZWN0ZWROb2RlVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNzTGlzdC5h ZGQoImluc3BlY3RlZC1ub2RlIik7CisgICAgfQorCiAgICAgX2hpZGVFbGVtZW50cyhldmVudCwg a2V5Ym9hcmRTaG9ydGN1dCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fZWRpdGFibGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVl T3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Ry ZWVPdXRsaW5lLmpzCmluZGV4IDkwNmNjMzIwY2JiLi4wODZmNzk1MWIzMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxp bmUuanMKQEAgLTU1LDcgKzU1LDYgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGlu ZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl9zZWxlY3RhYmxlID0gc2VsZWN0YWJs ZTsKIAogICAgICAgICB0aGlzLl9jYWNoZWROdW1iZXJPZkRlc2NlbmRlbnRzID0gMDsKLSAgICAg ICAgdGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50ID0gbnVsbDsKIAogICAgICAgICBs ZXQgY29tcGFyYXRvciA9IChhLCBiKSA9PiB7CiAgICAgICAgICAgICBmdW5jdGlvbiBnZXRMZXZl bCh0cmVlRWxlbWVudCkgewpAQCAtNzk5LDE3ICs3OTgsNiBAQCBXSS5UcmVlT3V0bGluZSA9IGNs YXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0cmVlRWxlbWVu dC5zZWxlY3Qob21pdEZvY3VzKTsKICAgICAgICAgfQogCi0gICAgICAgIGxldCBzZWxlY3RlZFRy ZWVFbGVtZW50ID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50OwotICAgICAgICBpZiAoc2VsZWN0 ZWRUcmVlRWxlbWVudCAhPT0gdGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50KSB7Ci0g ICAgICAgICAgICBpZiAodGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50ICYmIHRoaXMu X3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQpCi0gICAgICAgICAg ICAgICAgdGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5j bGFzc0xpc3QucmVtb3ZlKCJsYXN0LXNlbGVjdGVkIik7Ci0KLSAgICAgICAgICAgIHRoaXMuX3By ZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudCA9IHNlbGVjdGVkVHJlZUVsZW1lbnQ7Ci0KLSAgICAg ICAgICAgIGlmICh0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQgJiYgdGhpcy5fcHJl dmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudCkKLSAgICAgICAgICAgICAg ICB0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNz TGlzdC5hZGQoImxhc3Qtc2VsZWN0ZWQiKTsKLSAgICAgICAgfQotCiAgICAgICAgIHRoaXMuX2Rp c3BhdGNoU2VsZWN0aW9uRGlkQ2hhbmdlRXZlbnQoKTsKIAogICAgICAgICB0aGlzLl9wcm9jZXNz aW5nU2VsZWN0aW9uQ2hhbmdlID0gZmFsc2U7Cg== 381326 2019-10-18 14:17:56 -0700 2019-10-18 15:28:05 -0700 Patch 203155.diff text/plain 8241 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE2MjFjMzVjMjM0Li45MjRlODIwZjQ1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMTAtMTggIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVs ZW1lbnRzOiAkMCBpcyBzaG93biBmb3IgdGhlIHdyb25nIG5vZGUgd2hlbiBzZWxlY3RpbmcgZWxl bWVudHMgaW4gYSB1c2VyIGFnZW50IHNoYWRvdyB0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDMxNTUKKworICAgICAgICBSZXZpZXdlZCBieSBN YXR0IEJha2VyLgorCisgICAgICAgIFJhdGhlciB0aGFuIG5haXZlbHkgdXNpbmcgdGhlIGxhc3Qg c2VsZWN0ZWQgbm9kZSAoZnJvbSBgV0kuVHJlZU91dGxpbmVgKSwgd2Ugc2hvdWxkIHdhaXQKKyAg ICAgICAgdG8gc2VlIGlmIHRoZSBpbnNwZWN0ZWQgcGFnZSdzIERPTSBhZ2VudCBhbGxvd3MgdGhl IHNlbGVjdGVkIG5vZGUgdG8gYmUgdXNlZCBhcyB0aGUKKyAgICAgICAgaW5zcGVjdGVkIG5vZGUs IGFuZCBpZiBzbyB0aGVuIHRvIHNob3cgdGhlIGAkMGAuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanM6CisgICAgICAgIChXSS5ET01NYW5hZ2VyLnBy b3RvdHlwZS5zZXRJbnNwZWN0ZWROb2RlKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3 KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzOgorICAg ICAgICAoV0kuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oYW5kbGVJbnNwZWN0ZWROb2RlQ2hh bmdlZCk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxp bmUuY3NzOgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb20gbGkuaW5zcGVjdGVkLW5vZGUgPiBz cGFuOjphZnRlcik6IEFkZGVkLgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb206Zm9jdXMgbGku aW5zcGVjdGVkLW5vZGUuc2VsZWN0ZWQgPiBzcGFuOjphZnRlcik6IEFkZGVkLgorICAgICAgICAo LnRyZWUtb3V0bGluZS5kb20uc2hvdy1sYXN0LXNlbGVjdGVkIGxpLmxhc3Qtc2VsZWN0ZWQgPiBz cGFuOjphZnRlcik6IERlbGV0ZWQuCisgICAgICAgICgudHJlZS1vdXRsaW5lLmRvbS5zaG93LWxh c3Qtc2VsZWN0ZWQ6Zm9jdXMgbGkubGFzdC1zZWxlY3RlZCA+IHNwYW46OmFmdGVyKTogRGVsZXRl ZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanM6CisgICAg ICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuc2VsZWN0aW9uQ29udHJvbGxlclNlbGVjdGlv bkRpZENoYW5nZSk6CisKIDIwMTktMTAtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVsZW1lbnRzOiBzZWxlY3Rpb24gc2hvdWxk bid0IGJlIGRpbW1lZCBieSBzaGFkb3cgdHJlZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCmlu ZGV4IDg1NmQ0ODJiMzlmLi43MzUyZTViNjZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpz CkBAIC01ODUsOSArNTg1LDEwIEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICAgICAg cmV0dXJuOwogCisgICAgICAgICAgICBsZXQgbGFzdEluc3BlY3RlZE5vZGUgPSB0aGlzLl9pbnNw ZWN0ZWROb2RlOwogICAgICAgICAgICAgdGhpcy5faW5zcGVjdGVkTm9kZSA9IG5vZGU7CiAKLSAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkRPTU1hbmFnZXIuRXZl bnQuSW5zcGVjdGVkTm9kZUNoYW5nZWQpOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV0kuRE9NTWFuYWdlci5FdmVudC5JbnNwZWN0ZWROb2RlQ2hhbmdlZCwge2xh c3RJbnNwZWN0ZWROb2RlfSk7CiAgICAgICAgIH07CiAKICAgICAgICAgbGV0IHRhcmdldCA9IFdJ LmFzc3VtaW5nTWFpblRhcmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4 IDJmZDdmYjJlZDg4Li44YjY5ZWQxZTNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5q cwpAQCAtNjcsNyArNjcsNyBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVl Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgiZG9tLXRyZWUiKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VXYXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNl KTsKIAotICAgICAgICB0aGlzLl9kb21UcmVlT3V0bGluZSA9IG5ldyBXSS5ET01UcmVlT3V0bGlu ZSh7b21pdFJvb3RET01Ob2RlOiB0cnVlLCBleGNsdWRlUmV2ZWFsRWxlbWVudENvbnRleHRNZW51 OiB0cnVlLCBzaG93TGFzdFNlbGVjdGVkOiB0cnVlfSk7CisgICAgICAgIHRoaXMuX2RvbVRyZWVP dXRsaW5lID0gbmV3IFdJLkRPTVRyZWVPdXRsaW5lKHtvbWl0Um9vdERPTU5vZGU6IHRydWUsIGV4 Y2x1ZGVSZXZlYWxFbGVtZW50Q29udGV4dE1lbnU6IHRydWUsIHNob3dJbnNwZWN0ZWROb2RlOiB0 cnVlfSk7CiAgICAgICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLmFsbG93c0VtcHR5U2VsZWN0aW9u ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLmFsbG93c011bHRpcGxlU2Vs ZWN0aW9uID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0 ZW5lcihXSS5UcmVlT3V0bGluZS5FdmVudC5FbGVtZW50QWRkZWQsIHRoaXMuX2RvbVRyZWVFbGVt ZW50QWRkZWQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCmluZGV4IDc4NjEzODMwMTRj Li5hMmQxYjBmNzlhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwpAQCAtNzQsMTQgKzc0LDE0 IEBACiAgICAgei1pbmRleDogMTsKIH0KIAotLnRyZWUtb3V0bGluZS5kb20uc2hvdy1sYXN0LXNl bGVjdGVkIGxpLmxhc3Qtc2VsZWN0ZWQgPiBzcGFuOjphZnRlciB7CisudHJlZS1vdXRsaW5lLmRv bSBsaS5pbnNwZWN0ZWQtbm9kZSA+IHNwYW46OmFmdGVyIHsKICAgICBjb250ZW50OiAiID0gIiB2 YXIoLS1jb25zb2xlLXNhdmVkLXJlc3VsdC1wcmVmaXgpICIwIjsKICAgICBjb2xvcjogdmFyKC0t Y29uc29sZS1zZWNvbmRhcnktdGV4dC1jb2xvcik7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwog ICAgIHdoaXRlLXNwYWNlOiBwcmU7CiB9CiAKLS50cmVlLW91dGxpbmUuZG9tLnNob3ctbGFzdC1z ZWxlY3RlZDpmb2N1cyBsaS5sYXN0LXNlbGVjdGVkID4gc3Bhbjo6YWZ0ZXIgeworLnRyZWUtb3V0 bGluZS5kb206Zm9jdXMgbGkuaW5zcGVjdGVkLW5vZGUuc2VsZWN0ZWQgPiBzcGFuOjphZnRlciB7 CiAgICAgY29sb3I6IHZhcigtLXNlbGVjdGVkLXNlY29uZGFyeS10ZXh0LWNvbG9yKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlT3V0bGluZS5qcwppbmRleCBhOTMyYzZkMDhjMi4uNDAwNTY0ZmIwNDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVP dXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVPdXRsaW5lLmpzCkBAIC0zMCw3ICszMCw3IEBACiAKIFdJLkRPTVRyZWVPdXRsaW5l ID0gY2xhc3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5UcmVlT3V0bGluZQogewotICAgIGNv bnN0cnVjdG9yKHtzZWxlY3RhYmxlLCBvbWl0Um9vdERPTU5vZGUsIGV4Y2x1ZGVSZXZlYWxFbGVt ZW50Q29udGV4dE1lbnUsIHNob3dMYXN0U2VsZWN0ZWR9ID0ge30pCisgICAgY29uc3RydWN0b3Io e3NlbGVjdGFibGUsIG9taXRSb290RE9NTm9kZSwgZXhjbHVkZVJldmVhbEVsZW1lbnRDb250ZXh0 TWVudSwgc2hvd0luc3BlY3RlZE5vZGV9ID0ge30pCiAgICAgewogICAgICAgICBzdXBlcihzZWxl Y3RhYmxlKTsKIApAQCAtNDYsOSArNDYsNiBAQCBXSS5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERP TVRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKICAgICAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImRvbSIsIFdJLlN5bnRheEhpZ2hsaWdodGVkU3R5bGVDbGFzc05hbWUp OwogICAgICAgICB0aGlzLmVsZW1lbnQuZGlyID0gImx0ciI7CiAKLSAgICAgICAgaWYgKHNob3dM YXN0U2VsZWN0ZWQpCi0gICAgICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgic2hv dy1sYXN0LXNlbGVjdGVkIik7Ci0KICAgICAgICAgdGhpcy5faW5jbHVkZVJvb3RET01Ob2RlID0g IW9taXRSb290RE9NTm9kZTsKICAgICAgICAgdGhpcy5fZXhjbHVkZVJldmVhbEVsZW1lbnRDb250 ZXh0TWVudSA9IGV4Y2x1ZGVSZXZlYWxFbGVtZW50Q29udGV4dE1lbnU7CiAgICAgICAgIHRoaXMu X3Jvb3RET01Ob2RlID0gbnVsbDsKQEAgLTY0LDYgKzYxLDkgQEAgV0kuRE9NVHJlZU91dGxpbmUg PSBjbGFzcyBET01UcmVlT3V0bGluZSBleHRlbmRzIFdJLlRyZWVPdXRsaW5lCiAgICAgICAgIHRo aXMuX2hpZGVFbGVtZW50c0tleWJvYXJkU2hvcnRjdXQuaW1wbGljaXRseVByZXZlbnRzRGVmYXVs dCA9IGZhbHNlOwogCiAgICAgICAgIFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00uYWRkRXZlbnRM aXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dTaGFkb3dET01TZXR0 aW5nQ2hhbmdlZCwgdGhpcyk7CisKKyAgICAgICAgaWYgKHNob3dJbnNwZWN0ZWROb2RlKQorICAg ICAgICAgICAgV0kuZG9tTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU1hbmFnZXIuRXZl bnQuSW5zcGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2hhbmRsZUluc3BlY3RlZE5vZGVDaGFuZ2Vk LCB0aGlzKTsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTY2MCw2ICs2NjAsMjEgQEAgV0ku RE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVlT3V0bGluZSBleHRlbmRzIFdJLlRyZWVPdXRs aW5lCiAgICAgICAgICAgICB0aGlzLnNlbGVjdERPTU5vZGUobm9kZVRvU2VsZWN0KTsKICAgICB9 CiAKKyAgICBfaGFuZGxlSW5zcGVjdGVkTm9kZUNoYW5nZWQoZXZlbnQpCisgICAgeworICAgICAg ICBsZXQge2xhc3RJbnNwZWN0ZWROb2RlfSA9IGV2ZW50LmRhdGE7CisKKyAgICAgICAgaWYgKGxh c3RJbnNwZWN0ZWROb2RlKSB7CisgICAgICAgICAgICBsZXQgbGFzdEluc3BlY3RlZE5vZGVUcmVl RWxlbWVudCA9IHRoaXMuZmluZFRyZWVFbGVtZW50KGxhc3RJbnNwZWN0ZWROb2RlKTsKKyAgICAg ICAgICAgIGlmIChsYXN0SW5zcGVjdGVkTm9kZVRyZWVFbGVtZW50KQorICAgICAgICAgICAgICAg IGxhc3RJbnNwZWN0ZWROb2RlVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNzTGlzdC5y ZW1vdmUoImluc3BlY3RlZC1ub2RlIik7CisgICAgICAgIH0KKworICAgICAgICBsZXQgaW5zcGVj dGVkTm9kZVRyZWVFbGVtZW50ID0gdGhpcy5maW5kVHJlZUVsZW1lbnQoV0kuZG9tTWFuYWdlci5p bnNwZWN0ZWROb2RlKTsKKyAgICAgICAgaWYgKGluc3BlY3RlZE5vZGVUcmVlRWxlbWVudCkKKyAg ICAgICAgICAgIGluc3BlY3RlZE5vZGVUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuY2xhc3NM aXN0LmFkZCgiaW5zcGVjdGVkLW5vZGUiKTsKKyAgICB9CisKICAgICBfaGlkZUVsZW1lbnRzKGV2 ZW50LCBrZXlib2FyZFNob3J0Y3V0KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9lZGl0YWJs ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVHJlZU91dGxpbmUuanMKaW5kZXggOTA2Y2MzMjBjYmIuLjA4NmY3OTUxYjMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGlu ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVl T3V0bGluZS5qcwpAQCAtNTUsNyArNTUsNiBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVP dXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX3NlbGVjdGFibGUgPSBzZWxl Y3RhYmxlOwogCiAgICAgICAgIHRoaXMuX2NhY2hlZE51bWJlck9mRGVzY2VuZGVudHMgPSAwOwot ICAgICAgICB0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQgPSBudWxsOwogCiAgICAg ICAgIGxldCBjb21wYXJhdG9yID0gKGEsIGIpID0+IHsKICAgICAgICAgICAgIGZ1bmN0aW9uIGdl dExldmVsKHRyZWVFbGVtZW50KSB7CkBAIC03OTksMTcgKzc5OCw2IEBAIFdJLlRyZWVPdXRsaW5l ID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIHRyZWVF bGVtZW50LnNlbGVjdChvbWl0Rm9jdXMpOwogICAgICAgICB9CiAKLSAgICAgICAgbGV0IHNlbGVj dGVkVHJlZUVsZW1lbnQgPSB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQ7Ci0gICAgICAgIGlmIChz ZWxlY3RlZFRyZWVFbGVtZW50ICE9PSB0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQp IHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQgJiYg dGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudCkKLSAgICAg ICAgICAgICAgICB0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVt ZW50LmNsYXNzTGlzdC5yZW1vdmUoImxhc3Qtc2VsZWN0ZWQiKTsKLQotICAgICAgICAgICAgdGhp cy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50ID0gc2VsZWN0ZWRUcmVlRWxlbWVudDsKLQot ICAgICAgICAgICAgaWYgKHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudCAmJiB0aGlz Ll9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50KQotICAgICAgICAg ICAgICAgIHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgibGFzdC1zZWxlY3RlZCIpOwotICAgICAgICB9Ci0KICAgICAgICAgdGhp cy5fZGlzcGF0Y2hTZWxlY3Rpb25EaWRDaGFuZ2VFdmVudCgpOwogCiAgICAgICAgIHRoaXMuX3By b2Nlc3NpbmdTZWxlY3Rpb25DaGFuZ2UgPSBmYWxzZTsK