197330 2019-04-26 15:50:19 -0700 Web Inspector: DOM: dragging a node to the console should log the node 2019-05-03 19:46:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1530837 0 hi 2019-04-26 15:50:19 -0700 . 1531010 1 368414 hi 2019-04-27 16:44:58 -0700 Created attachment 368414 Patch For some reason, the drop doesn't work on anything that isn't normally editable :( 1532017 2 368414 timothy 2019-05-01 12:37:12 -0700 Comment on attachment 368414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368414&action=review > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:636 > + let text = domNode.nodeType() === Node.ELEMENT_NODE ? WI.UIString("Selected Element") : WI.UIString("Selected Node"); "Selected Node/Element" => "Dropped Node/Element"? > Source/WebInspectorUI/UserInterface/Views/QuickConsole.js:189 > + let text = domNode.nodeType() === Node.ELEMENT_NODE ? WI.UIString("Selected Element") : WI.UIString("Selected Node"); Ditto. 1533127 3 369035 hi 2019-05-03 19:05:06 -0700 Created attachment 369035 Patch 1533141 4 369035 commit-queue 2019-05-03 19:45:13 -0700 Comment on attachment 369035 Patch Clearing flags on attachment: 369035 Committed r244946: <https://trac.webkit.org/changeset/244946> 1533142 5 commit-queue 2019-05-03 19:45:15 -0700 All reviewed patches have been landed. Closing bug. 1533143 6 webkit-bug-importer 2019-05-03 19:46:24 -0700 <rdar://problem/50465496> 368414 2019-04-27 16:44:58 -0700 2019-05-03 19:05:05 -0700 Patch bug-197330-20190427164457.patch text/plain 7542 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJjODEyNzEwMjFiOThjNTg3Mjk2ZjI3ZDc0Nzdh NTUxOWVjN2RjMGEuLjQ2NDkzNDAwOGFiZmI1NWY2ODdlMWViN2YwNjVmYTE2MTc4ODdhNTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA0LTI3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IGRyYWdnaW5nIGEgbm9kZSB0byB0aGUgY29uc29sZSBzaG91bGQgbG9nIHRoZSBub2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTczMzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXSS5ET01UcmVlT3V0bGlu ZS5wcm90b3R5cGUuX29uZHJhZ3N0YXJ0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcpOgorICAgICAg ICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVEcmFnT3Zlcik6IEFkZGVkLgor ICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVEcm9wKTogQWRkZWQu CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanM6CisgICAgICAg IChXSS5RdWlja0NvbnNvbGUpOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5f aGFuZGxlRHJhZ092ZXIpOiBBZGRlZC4KKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5 cGUuX2hhbmRsZURyb3ApOiBBZGRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv R2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgRHJpdmUtYnk6IHVw ZGF0ZSB0aGUgZm9ybWF0IHRvIGJlIG1vcmUgdW5pcXVlLgorCiAyMDE5LTA0LTI2ICBKZXNzaWUg QmVybGluICA8amJlcmxpbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBuZXcgbWFjIHRhcmdl dCBudW1iZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCmluZGV4IDdhMDkxMzkwY2MzOGViMWY3Njkx ZjA3MGMwMjY5YWQ0YWU2YzM4Y2UuLjY2OGY4ZWFhYTU5Y2VjZmNhMGIwMTI0Nzg0NzU1YTBkZGFh MzM3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCkBAIC00ODUsNiArNDg1LDkgQEAgV0kuRE9N VHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVlT3V0bGluZSBleHRlbmRzIFdJLlRyZWVPdXRsaW5l CiAgICAgICAgIGlmICghdHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK KyAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLmVmZmVjdEFsbG93ZWQgPSAiY29weU1vdmUiOwor ICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuc2V0RGF0YShET01UcmVlT3V0bGluZS5ET01Ob2Rl SWREcmFnVHlwZSwgdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QuaWQpOworCiAgICAgICAg IGlmICghdGhpcy5faXNWYWxpZERyYWdTb3VyY2VPclRhcmdldCh0cmVlRWxlbWVudCkpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTQ5Miw3ICs0OTUsNiBAQCBXSS5ET01UcmVlT3V0 bGluZSA9IGNsYXNzIERPTVRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuc2V0RGF0 YSgidGV4dC9wbGFpbiIsIHRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC50ZXh0Q29udGVudCk7 Ci0gICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHlNb3ZlIjsK ICAgICAgICAgdGhpcy5fbm9kZUJlaW5nRHJhZ2dlZCA9IHRyZWVFbGVtZW50LnJlcHJlc2VudGVk T2JqZWN0OwogCiAgICAgICAgIFdJLmRvbU1hbmFnZXIuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsK QEAgLTY0OCwzICs2NTAsNSBAQCBXSS5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERPTVRyZWVPdXRs aW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKIFdJLkRPTVRyZWVPdXRsaW5lLkV2ZW50ID0gewog ICAgIFNlbGVjdGVkTm9kZUNoYW5nZWQ6ICJkb20tdHJlZS1vdXRsaW5lLXNlbGVjdGVkLW5vZGUt Y2hhbmdlZCIKIH07CisKK1dJLkRPTVRyZWVPdXRsaW5lLkRPTU5vZGVJZERyYWdUeXBlID0gIndl Yi1pbnNwZWN0b3IvZG9tLW5vZGUtaWQiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxTdHls ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggZjA5YTk1YzA0OTdjNDBlN2ZmMzBjMWZiM2Zh ZjIwMTI3NWJjMGI3Yy4uYTEwMDA0NTEyYTlkZDFlYWE0OTg0ODFjYTc4ZWVhMWEwOGRmZGYwZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2Vu ZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpz CkBAIC00NjMsNCArNDYzLDQgQEAgV0kuR2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5O b0ZpbHRlck1hdGNoSW5TZWN0aW9uQ2xhc3NOYW1lID0gImZpbHRlci1zZWMKIFdJLkdlbmVyYWxT dHlsZURldGFpbHNTaWRlYmFyUGFuZWwuTm9GaWx0ZXJNYXRjaEluUHJvcGVydHlDbGFzc05hbWUg PSAiZmlsdGVyLXByb3BlcnR5LW5vbi1tYXRjaGluZyI7CiAKIFdJLkdlbmVyYWxTdHlsZURldGFp bHNTaWRlYmFyUGFuZWwuVG9nZ2xlZENsYXNzZXNTeW1ib2wgPSBTeW1ib2woImNzcy1zdHlsZS1k ZXRhaWxzLXNpZGViYXItcGFuZWwtdG9nZ2xlZC1jbGFzc2VzLXN5bWJvbCIpOwotV0kuR2VuZXJh bFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5Ub2dnbGVkQ2xhc3Nlc0RyYWdUeXBlID0gInRleHQv Y2xhc3NuYW1lIjsKK1dJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuVG9nZ2xlZENs YXNzZXNEcmFnVHlwZSA9ICJ3ZWItaW5zcGVjdG9yL2Nzcy1jbGFzcyI7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCmluZGV4IGZlZWJkNGJiYzIwMzhjYjM1MDgyMmFjMTM4YmZhMDNjMzdmMGNhMzEuLjEy MGFkMGM1MTJmZDFmYzNlYWJjMzA2MGNiMjBjMTE2YzM5NjM5NTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCkBAIC00Nyw2ICs0Nyw4IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLm1lc3NhZ2VzRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fa2V5RG93bi5iaW5kKHRoaXMp KTsKICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJl c3MiLCB0aGlzLl9rZXlQcmVzcy5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5tZXNzYWdlc0Vs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ3N0YXJ0IiwgdGhpcy5fb25kcmFnc3RhcnQuYmlu ZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImRyYWdvdmVyIiwgdGhpcy5faGFuZGxlRHJhZ092ZXIuYmluZCh0aGlzKSk7CisgICAg ICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyb3AiLCB0aGlzLl9o YW5kbGVEcm9wLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5tZXNzYWdlc0VsZW1lbnQpOwogCiAgICAgICAgIHRoaXMucHJvbXB0ID0gV0kucXVpY2tD b25zb2xlLnByb21wdDsKQEAgLTYxOCw2ICs2MjAsMjYgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBj bGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIH0KICAg ICB9CiAKKyAgICBfaGFuZGxlRHJhZ092ZXIoZXZlbnQpCisgICAgeworICAgICAgICBpZiAoZXZl bnQuZGF0YVRyYW5zZmVyLnR5cGVzLmluY2x1ZGVzKFdJLkRPTVRyZWVPdXRsaW5lLkRPTU5vZGVJ ZERyYWdUeXBlKSkKKyAgICAgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5kcm9wRWZmZWN0ID0g ImNvcHkiOworICAgIH0KKworICAgIF9oYW5kbGVEcm9wKGV2ZW50KQorICAgIHsKKyAgICAgICAg bGV0IGRvbU5vZGVJZCA9IGV2ZW50LmRhdGFUcmFuc2Zlci5nZXREYXRhKFdJLkRPTVRyZWVPdXRs aW5lLkRPTU5vZGVJZERyYWdUeXBlKTsKKyAgICAgICAgaWYgKGRvbU5vZGVJZCkgeworICAgICAg ICAgICAgbGV0IGRvbU5vZGUgPSBXSS5kb21NYW5hZ2VyLm5vZGVGb3JJZChkb21Ob2RlSWQpOwor ICAgICAgICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKGRvbU5vZGUsIFdJLlJ1bnRp bWVNYW5hZ2VyLkNvbnNvbGVPYmplY3RHcm91cCkKKyAgICAgICAgICAgIC50aGVuKChyZW1vdGVP YmplY3QpID0+IHsKKyAgICAgICAgICAgICAgICBsZXQgdGV4dCA9IGRvbU5vZGUubm9kZVR5cGUo KSA9PT0gTm9kZS5FTEVNRU5UX05PREUgPyBXSS5VSVN0cmluZygiU2VsZWN0ZWQgRWxlbWVudCIp IDogV0kuVUlTdHJpbmcoIlNlbGVjdGVkIE5vZGUiKTsKKyAgICAgICAgICAgICAgICBjb25zdCBh ZGRTcGVjaWFsVXNlckxvZ0NsYXNzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBXSS5jb25zb2xl TG9nVmlld0NvbnRyb2xsZXIuYXBwZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3VsdCh0ZXh0 LCByZW1vdGVPYmplY3QsIGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3MpOworICAgICAgICAgICAgfSk7 CisgICAgICAgIH0KKyAgICB9CisKICAgICBoYW5kbGVFdmVudChldmVudCkKICAgICB7CiAgICAg ICAgIHN3aXRjaCAoZXZlbnQudHlwZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCmluZGV4IDUxODdiMzA3 NGMxNjIyM2M5MDQ4OTFjNjkzNTBmNjU2OGNiMzQ1NjguLjZmYTE5ZmNhZDRjYjBiNmJiYjM4MTg2 OTVmZGVkOTgwOGYxNjc5YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKQEAgLTQ2LDYgKzQ2LDggQEAg V0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogCiAg ICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJxdWljay1jb25zb2xlIik7CiAgICAg ICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5k bGVNb3VzZURvd24uYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJkcmFnb3ZlciIsIHRoaXMuX2hhbmRsZURyYWdPdmVyLmJpbmQodGhpcykpOworICAg ICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJvcCIsIHRoaXMuX2hhbmRsZURy b3AuYmluZCh0aGlzKSk7CiAKICAgICAgICAgdGhpcy5wcm9tcHQgPSBuZXcgV0kuQ29uc29sZVBy b21wdChudWxsLCAidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0 aGlzLnByb21wdCk7CkBAIC0xNzEsNiArMTczLDI2IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNz IFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5wcm9tcHQuZm9jdXMo KTsKICAgICB9CiAKKyAgICBfaGFuZGxlRHJhZ092ZXIoZXZlbnQpCisgICAgeworICAgICAgICBp ZiAoZXZlbnQuZGF0YVRyYW5zZmVyLnR5cGVzLmluY2x1ZGVzKFdJLkRPTVRyZWVPdXRsaW5lLkRP TU5vZGVJZERyYWdUeXBlKSkKKyAgICAgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5kcm9wRWZm ZWN0ID0gImNvcHkiOworICAgIH0KKworICAgIF9oYW5kbGVEcm9wKGV2ZW50KQorICAgIHsKKyAg ICAgICAgbGV0IGRvbU5vZGVJZCA9IGV2ZW50LmRhdGFUcmFuc2Zlci5nZXREYXRhKFdJLkRPTVRy ZWVPdXRsaW5lLkRPTU5vZGVJZERyYWdUeXBlKTsKKyAgICAgICAgaWYgKGRvbU5vZGVJZCkgewor ICAgICAgICAgICAgbGV0IGRvbU5vZGUgPSBXSS5kb21NYW5hZ2VyLm5vZGVGb3JJZChkb21Ob2Rl SWQpOworICAgICAgICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKGRvbU5vZGUsIFdJ LlJ1bnRpbWVNYW5hZ2VyLkNvbnNvbGVPYmplY3RHcm91cCkKKyAgICAgICAgICAgIC50aGVuKChy ZW1vdGVPYmplY3QpID0+IHsKKyAgICAgICAgICAgICAgICBsZXQgdGV4dCA9IGRvbU5vZGUubm9k ZVR5cGUoKSA9PT0gTm9kZS5FTEVNRU5UX05PREUgPyBXSS5VSVN0cmluZygiU2VsZWN0ZWQgRWxl bWVudCIpIDogV0kuVUlTdHJpbmcoIlNlbGVjdGVkIE5vZGUiKTsKKyAgICAgICAgICAgICAgICBj b25zdCBhZGRTcGVjaWFsVXNlckxvZ0NsYXNzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBXSS5j b25zb2xlTG9nVmlld0NvbnRyb2xsZXIuYXBwZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3Vs dCh0ZXh0LCByZW1vdGVPYmplY3QsIGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3MpOworICAgICAgICAg ICAgfSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBfZXhlY3V0aW9uQ29udGV4dFBhdGhDb21w b25lbnRzVG9EaXNwbGF5KCkKICAgICB7CiAgICAgICAgIC8vIElmIHdlIGFyZSBpbiB0aGUgZGVi dWdnZXIgdGhlIGNvbnNvbGUgd2lsbCB1c2UgdGhlIGFjdGl2ZSBjYWxsIGZyYW1lLCBkb24ndCBz aG93IHRoZSBzZWxlY3Rvci4K 369035 2019-05-03 19:05:06 -0700 2019-05-03 19:45:13 -0700 Patch bug-197330-20190503190505.patch text/plain 8808 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk3MjA2Yzg5NmIxMGRkZjNhZDk1OGI2OGIzZjhi Y2UzZTgwODU3MTMuLmM4NGI5MTgwOTVhMjE0ZGMzN2ZkZDQ4NzhjNDNjZTlmZTlmNDkwYzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA1LTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IGRyYWdnaW5nIGEgbm9kZSB0byB0aGUgY29uc29sZSBzaG91bGQgbG9nIHRoZSBub2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTczMzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV0kuRE9NVHJlZU91dGxp bmUucHJvdG90eXBlLl9vbmRyYWdzdGFydCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3KToKKyAgICAg ICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlRHJhZ092ZXIpOiBBZGRlZC4K KyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlRHJvcCk6IEFkZGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAg ICAoV0kuUXVpY2tDb25zb2xlKToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUu X2hhbmRsZURyYWdPdmVyKTogQWRkZWQuCisgICAgICAgIChXSS5RdWlja0NvbnNvbGUucHJvdG90 eXBlLl9oYW5kbGVEcm9wKTogQWRkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0dlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIERyaXZlLWJ5OiB1 cGRhdGUgdGhlIGZvcm1hdCB0byBiZSBtb3JlIHVuaXF1ZS4KKworICAgICAgICAqIExvY2FsaXph dGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAxOS0wNS0wMyAgRGV2aW4g Um91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRE9N OiByZW5hbWUgImxvdyBwb3dlciIgdG8gImRpc3BsYXkgY29tcG9zaXRlZCIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDUwYjIzYzJhOGI3ZGNlNDUyYzYzNWM2NDFkNDI5MmRj NmVlYmE1NGQuLjUwNDY2MTY5ZTFmZDFhOGZhNDNhNWRiNDU0N2MyNGRkMTM5YzkwZjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMzQ4LDYgKzM0OCw4IEBAIGxvY2FsaXpl ZFN0cmluZ3NbIkRvbWFpbiJdID0gIkRvbWFpbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEb25lIl0g PSAiRG9uZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEb3dubG9hZCJdID0gIkRvd25sb2FkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkRvd25sb2FkIFdlYiBBcmNoaXZlIl0gPSAiRG93bmxvYWQgV2ViIEFy Y2hpdmUiOworbG9jYWxpemVkU3RyaW5nc1siRHJvcHBlZCBFbGVtZW50Il0gPSAiRHJvcHBlZCBF bGVtZW50IjsKK2xvY2FsaXplZFN0cmluZ3NbIkRyb3BwZWQgTm9kZSJdID0gIkRyb3BwZWQgTm9k ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEdXBsaWNhdGUgcHJvcGVydHkiXSA9ICJEdXBsaWNhdGUg cHJvcGVydHkiOwogbG9jYWxpemVkU3RyaW5nc1siRHVyYXRpb24iXSA9ICJEdXJhdGlvbiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJEdXJhdGlvbjogJXMiXSA9ICJEdXJhdGlvbjogJXMiOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91 dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlT3V0bGluZS5qcwppbmRleCA3YTA5MTM5MGNjMzhlYjFmNzY5MWYwNzBjMDI2OWFkNGFlNmMz OGNlLi42NjhmOGVhYWE1OWNlY2ZjYTBiMDEyNDc4NDc1NWEwZGRhYTMzN2RkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGlu ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlT3V0bGluZS5qcwpAQCAtNDg1LDYgKzQ4NSw5IEBAIFdJLkRPTVRyZWVPdXRsaW5lID0gY2xh c3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5UcmVlT3V0bGluZQogICAgICAgICBpZiAoIXRy ZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgICAgIGV2ZW50LmRh dGFUcmFuc2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHlNb3ZlIjsKKyAgICAgICAgZXZlbnQuZGF0 YVRyYW5zZmVyLnNldERhdGEoRE9NVHJlZU91dGxpbmUuRE9NTm9kZUlkRHJhZ1R5cGUsIHRyZWVF bGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LmlkKTsKKwogICAgICAgICBpZiAoIXRoaXMuX2lzVmFs aWREcmFnU291cmNlT3JUYXJnZXQodHJlZUVsZW1lbnQpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCkBAIC00OTIsNyArNDk1LDYgQEAgV0kuRE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01U cmVlT3V0bGluZSBleHRlbmRzIFdJLlRyZWVPdXRsaW5lCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLnNldERhdGEoInRleHQvcGxhaW4iLCB0 cmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQudGV4dENvbnRlbnQpOwotICAgICAgICBldmVudC5k YXRhVHJhbnNmZXIuZWZmZWN0QWxsb3dlZCA9ICJjb3B5TW92ZSI7CiAgICAgICAgIHRoaXMuX25v ZGVCZWluZ0RyYWdnZWQgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKIAogICAgICAg ICBXSS5kb21NYW5hZ2VyLmhpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CkBAIC02NDgsMyArNjUwLDUg QEAgV0kuRE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVlT3V0bGluZSBleHRlbmRzIFdJLlRy ZWVPdXRsaW5lCiBXSS5ET01UcmVlT3V0bGluZS5FdmVudCA9IHsKICAgICBTZWxlY3RlZE5vZGVD aGFuZ2VkOiAiZG9tLXRyZWUtb3V0bGluZS1zZWxlY3RlZC1ub2RlLWNoYW5nZWQiCiB9OworCitX SS5ET01UcmVlT3V0bGluZS5ET01Ob2RlSWREcmFnVHlwZSA9ICJ3ZWItaW5zcGVjdG9yL2RvbS1u b2RlLWlkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBh bmVsLmpzCmluZGV4IGYwOWE5NWMwNDk3YzQwZTdmZjMwYzFmYjNmYWYyMDEyNzViYzBiN2MuLmEx MDAwNDUxMmE5ZGQxZWFhNDk4NDgxY2E3OGVlYTFhMDhkZmRmMGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxTdHlsZURldGFpbHNT aWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvR2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNDYzLDQgKzQ2Myw0 IEBAIFdJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuTm9GaWx0ZXJNYXRjaEluU2Vj dGlvbkNsYXNzTmFtZSA9ICJmaWx0ZXItc2VjCiBXSS5HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJh clBhbmVsLk5vRmlsdGVyTWF0Y2hJblByb3BlcnR5Q2xhc3NOYW1lID0gImZpbHRlci1wcm9wZXJ0 eS1ub24tbWF0Y2hpbmciOwogCiBXSS5HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLlRv Z2dsZWRDbGFzc2VzU3ltYm9sID0gU3ltYm9sKCJjc3Mtc3R5bGUtZGV0YWlscy1zaWRlYmFyLXBh bmVsLXRvZ2dsZWQtY2xhc3Nlcy1zeW1ib2wiKTsKLVdJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRl YmFyUGFuZWwuVG9nZ2xlZENsYXNzZXNEcmFnVHlwZSA9ICJ0ZXh0L2NsYXNzbmFtZSI7CitXSS5H ZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLlRvZ2dsZWRDbGFzc2VzRHJhZ1R5cGUgPSAi d2ViLWluc3BlY3Rvci9jc3MtY2xhc3MiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwppbmRleCBmZWVi ZDRiYmMyMDM4Y2IzNTA4MjJhYzEzOGJmYTAzYzM3ZjBjYTMxLi4zNTkyNGFlMzg2YjA0N2VhZDUx MDExNjJmNjNlNDUxZGNhMDI4YjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAtNDcsNiAr NDcsOCBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29udGVudFZpZXcKICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigia2V5ZG93biIsIHRoaXMuX2tleURvd24uYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMu bWVzc2FnZXNFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleXByZXNzIiwgdGhpcy5fa2V5UHJl c3MuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImRyYWdzdGFydCIsIHRoaXMuX29uZHJhZ3N0YXJ0LmJpbmQodGhpcyksIHRydWUpOwor ICAgICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcmFnb3ZlciIs IHRoaXMuX2hhbmRsZURyYWdPdmVyLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLm1lc3NhZ2Vz RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcm9wIiwgdGhpcy5faGFuZGxlRHJvcC5iaW5kKHRo aXMpKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMubWVzc2FnZXNFbGVt ZW50KTsKIAogICAgICAgICB0aGlzLnByb21wdCA9IFdJLnF1aWNrQ29uc29sZS5wcm9tcHQ7CkBA IC02MTgsNiArNjIwLDMyIEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB9CiAgICAgfQogCisgICAgX2hhbmRs ZURyYWdPdmVyKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKGV2ZW50LmRhdGFUcmFuc2Zlci50 eXBlcy5pbmNsdWRlcyhXSS5ET01UcmVlT3V0bGluZS5ET01Ob2RlSWREcmFnVHlwZSkpIHsKKyAg ICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICBldmVudC5kYXRh VHJhbnNmZXIuZHJvcEVmZmVjdCA9ICJjb3B5IjsKKyAgICAgICAgfQorICAgIH0KKworICAgIF9o YW5kbGVEcm9wKGV2ZW50KQorICAgIHsKKyAgICAgICAgbGV0IGRvbU5vZGVJZCA9IGV2ZW50LmRh dGFUcmFuc2Zlci5nZXREYXRhKFdJLkRPTVRyZWVPdXRsaW5lLkRPTU5vZGVJZERyYWdUeXBlKTsK KyAgICAgICAgaWYgKGRvbU5vZGVJZCkgeworICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1 bHQoKTsKKworICAgICAgICAgICAgbGV0IGRvbU5vZGUgPSBXSS5kb21NYW5hZ2VyLm5vZGVGb3JJ ZChkb21Ob2RlSWQpOworICAgICAgICAgICAgV0kuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKGRv bU5vZGUsIFdJLlJ1bnRpbWVNYW5hZ2VyLkNvbnNvbGVPYmplY3RHcm91cCkKKyAgICAgICAgICAg IC50aGVuKChyZW1vdGVPYmplY3QpID0+IHsKKyAgICAgICAgICAgICAgICBsZXQgdGV4dCA9IGRv bU5vZGUubm9kZVR5cGUoKSA9PT0gTm9kZS5FTEVNRU5UX05PREUgPyBXSS5VSVN0cmluZygiRHJv cHBlZCBFbGVtZW50IikgOiBXSS5VSVN0cmluZygiRHJvcHBlZCBOb2RlIik7CisgICAgICAgICAg ICAgICAgY29uc3QgYWRkU3BlY2lhbFVzZXJMb2dDbGFzcyA9IHRydWU7CisgICAgICAgICAgICAg ICAgV0kuY29uc29sZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4ZWN1dGlvbldp dGhSZXN1bHQodGV4dCwgcmVtb3RlT2JqZWN0LCBhZGRTcGVjaWFsVXNlckxvZ0NsYXNzKTsKKwor ICAgICAgICAgICAgICAgIHRoaXMucHJvbXB0LmZvY3VzKCk7CisgICAgICAgICAgICB9KTsKKyAg ICAgICAgfQorICAgIH0KKwogICAgIGhhbmRsZUV2ZW50KGV2ZW50KQogICAgIHsKICAgICAgICAg c3dpdGNoIChldmVudC50eXBlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKaW5kZXggNTE4N2IzMDc0YzE2 MjIzYzkwNDg5MWM2OTM1MGY2NTY4Y2IzNDU2OC4uMDFlZWEzZDgyOGIwYTYxMjQwODE1ODgyNmE0 MjAwYjcwZTM5ZTU1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwpAQCAtNDYsNiArNDYsOCBAQCBXSS5R dWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAg ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInF1aWNrLWNvbnNvbGUiKTsKICAgICAgICAg dGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2hhbmRsZU1v dXNlRG93bi5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImRyYWdvdmVyIiwgdGhpcy5faGFuZGxlRHJhZ092ZXIuYmluZCh0aGlzKSk7CisgICAgICAg IHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcm9wIiwgdGhpcy5faGFuZGxlRHJvcC5i aW5kKHRoaXMpLCB0cnVlKTsgLy8gRW5zdXJlIHRoYXQgZHJvcHBpbmcgYSBET00gbm9kZSBkb2Vz bid0IGNvcHkgdGV4dC4KIAogICAgICAgICB0aGlzLnByb21wdCA9IG5ldyBXSS5Db25zb2xlUHJv bXB0KG51bGwsICJ0ZXh0L2phdmFzY3JpcHQiKTsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRo aXMucHJvbXB0KTsKQEAgLTE3MSw2ICsxNzMsMzIgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3Mg UXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLnByb21wdC5mb2N1cygp OwogICAgIH0KIAorICAgIF9oYW5kbGVEcmFnT3ZlcihldmVudCkKKyAgICB7CisgICAgICAgIGlm IChldmVudC5kYXRhVHJhbnNmZXIudHlwZXMuaW5jbHVkZXMoV0kuRE9NVHJlZU91dGxpbmUuRE9N Tm9kZUlkRHJhZ1R5cGUpKSB7CisgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwor ICAgICAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLmRyb3BFZmZlY3QgPSAiY29weSI7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICBfaGFuZGxlRHJvcChldmVudCkKKyAgICB7CisgICAgICAgIGxl dCBkb21Ob2RlSWQgPSBldmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YShXSS5ET01UcmVlT3V0bGlu ZS5ET01Ob2RlSWREcmFnVHlwZSk7CisgICAgICAgIGlmIChkb21Ob2RlSWQpIHsKKyAgICAgICAg ICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisKKyAgICAgICAgICAgIGxldCBkb21Ob2RlID0g V0kuZG9tTWFuYWdlci5ub2RlRm9ySWQoZG9tTm9kZUlkKTsKKyAgICAgICAgICAgIFdJLlJlbW90 ZU9iamVjdC5yZXNvbHZlTm9kZShkb21Ob2RlLCBXSS5SdW50aW1lTWFuYWdlci5Db25zb2xlT2Jq ZWN0R3JvdXApCisgICAgICAgICAgICAudGhlbigocmVtb3RlT2JqZWN0KSA9PiB7CisgICAgICAg ICAgICAgICAgbGV0IHRleHQgPSBkb21Ob2RlLm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9O T0RFID8gV0kuVUlTdHJpbmcoIkRyb3BwZWQgRWxlbWVudCIpIDogV0kuVUlTdHJpbmcoIkRyb3Bw ZWQgTm9kZSIpOworICAgICAgICAgICAgICAgIGNvbnN0IGFkZFNwZWNpYWxVc2VyTG9nQ2xhc3Mg PSB0cnVlOworICAgICAgICAgICAgICAgIFdJLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBl bmRJbW1lZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgYWRkU3Bl Y2lhbFVzZXJMb2dDbGFzcyk7CisKKyAgICAgICAgICAgICAgICB0aGlzLnByb21wdC5mb2N1cygp OworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBfZXhlY3V0aW9uQ29u dGV4dFBhdGhDb21wb25lbnRzVG9EaXNwbGF5KCkKICAgICB7CiAgICAgICAgIC8vIElmIHdlIGFy ZSBpbiB0aGUgZGVidWdnZXIgdGhlIGNvbnNvbGUgd2lsbCB1c2UgdGhlIGFjdGl2ZSBjYWxsIGZy YW1lLCBkb24ndCBzaG93IHRoZSBzZWxlY3Rvci4K