192109 2018-11-28 15:16:12 -0800 Web Inspector: Styles: enable selection of multiple properties by default 2018-11-28 17:11:23 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1482687 0 nvasilyev 2018-11-28 15:16:12 -0800 Keep the feature enabled and remove the experimental setting. 1482689 1 webkit-bug-importer 2018-11-28 15:16:54 -0800 <rdar://problem/46323565> 1482717 2 355937 nvasilyev 2018-11-28 15:41:38 -0800 Created attachment 355937 Patch 1482730 3 355937 hi 2018-11-28 16:11:54 -0800 Comment on attachment 355937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355937&action=review r=me > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.css:53 > +.spreadsheet-style-declaration-editor :matches(.name, .value):not(.editing) { Is this rule actually needed? Can we remove it? > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.css:64 > +.spreadsheet-style-declaration-editor :matches(.name, .value):not(.editing) { This rule is a duplicate of (53), so please remove it. 1482734 4 355937 nvasilyev 2018-11-28 16:16:55 -0800 Comment on attachment 355937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355937&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.css:53 >> +.spreadsheet-style-declaration-editor :matches(.name, .value):not(.editing) { > > Is this rule actually needed? Can we remove it? It's still needed. Start editing name or value, focus another window, and then focus Web Inspector again. >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.css:64 >> +.spreadsheet-style-declaration-editor :matches(.name, .value):not(.editing) { > > This rule is a duplicate of (53), so please remove it. Huh, must have been from a bad merge before. 1482736 5 355941 nvasilyev 2018-11-28 16:22:31 -0800 Created attachment 355941 Patch 1482748 6 commit-queue 2018-11-28 17:10:33 -0800 The commit-queue encountered the following flaky tests while processing attachment 355941: webgl/1.0.2/conformance/more/functions/copyTexImage2D.html bug 192125 (author: roger_fong@apple.com) The commit-queue is continuing to process your patch. 1482749 7 355941 commit-queue 2018-11-28 17:11:21 -0800 Comment on attachment 355941 Patch Clearing flags on attachment: 355941 Committed r238649: <https://trac.webkit.org/changeset/238649> 1482750 8 commit-queue 2018-11-28 17:11:23 -0800 All reviewed patches have been landed. Closing bug. 355937 2018-11-28 15:41:38 -0800 2018-11-28 16:22:31 -0800 Patch patch.txt text/plain 11781 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUzYTBmMDExYTFmLi4zZDhkNTQ1ZTJlMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMTEtMjggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBlbmFibGUgc2VsZWN0aW9uIG9mIG11bHRpcGxlIHByb3BlcnRpZXMgYnkgZGVm YXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTky MTA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjMyMzU2NT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0 aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9j cmVhdGVFeHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOgorICAgICAgICBSZW1vdmUgdGhlIGNoZWNr Ym94LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxl RGVjbGFyYXRpb25FZGl0b3IuY3NzOgorICAgICAgICAoLnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xh cmF0aW9uLWVkaXRvciAucHJvcGVydHkpOgorICAgICAgICAoLnNwcmVhZHNoZWV0LXN0eWxlLWRl Y2xhcmF0aW9uLWVkaXRvciA6bWF0Y2hlcygubmFtZSwgLnZhbHVlKTpub3QoLmVkaXRpbmcpKToK KyAgICAgICAgKC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5 LnNlbGVjdGVkKToKKyAgICAgICAgKC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0 b3IgLnByb3BlcnR5LnNlbGVjdGVkOmZvY3VzKToKKyAgICAgICAgKC5tdWx0aXBsZS1wcm9wZXJ0 aWVzLXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9w ZXJ0eSk6IERlbGV0ZWQuCisgICAgICAgICgubXVsdGlwbGUtcHJvcGVydGllcy1zZWxlY3Rpb24g LnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xhcmF0aW9uLWVkaXRvciA6bWF0Y2hlcygubmFtZSwgLnZh bHVlKTpub3QoLmVkaXRpbmcpKTogRGVsZXRlZC4KKyAgICAgICAgKC5tdWx0aXBsZS1wcm9wZXJ0 aWVzLXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9w ZXJ0eS5zZWxlY3RlZCk6IERlbGV0ZWQuCisgICAgICAgICgubXVsdGlwbGUtcHJvcGVydGllcy1z ZWxlY3Rpb24gLnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVydHku c2VsZWN0ZWQ6Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICBSZW1vdmUgYC5tdWx0aXBsZS1wcm9w ZXJ0aWVzLXNlbGVjdGlvbmAgY2xhc3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qczoKKyAgICAgICAgKFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5wcm90b3R5cGUuaW5pdGlhbExheW91 dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVj bGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uU2VjdGlvbik6CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25TZWN0aW9uLnByb3RvdHlwZS5faGFuZGxlTW91c2VEb3duKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5wcm90b3R5cGUuX2NyZWF0ZUlubGluZVN3YXRjaCk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qczoKKyAg ICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkKToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0 VGV4dEZpZWxkLnByb3RvdHlwZS5faGFuZGxlRm9jdXMpOiBEZWxldGVkLgorCiAyMDE4LTExLTI4 ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZW1vdmUgdW51c2VkIERhdGFHcmlkIGFuZCBUcmVlT3V0bGluZSBjb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5k ZXggOTZiY2VhMWI2OTAuLjg2ODE0ZWVlOTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0xMjksNyArMTI5LDYgQEAg V0kuc2V0dGluZ3MgPSB7CiAgICAgem9vbUZhY3RvcjogbmV3IFdJLlNldHRpbmcoInpvb20tZmFj dG9yIiwgMSksCiAKICAgICAvLyBFeHBlcmltZW50YWwKLSAgICBleHBlcmltZW50YWxFbmFibGVN dWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb246IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwt ZW5hYmxlLW11bHRpcGxlLXByb3BlcnRpZXMtc2VsZWN0aW9uIiwgZmFsc2UpLAogICAgIGV4cGVy aW1lbnRhbEVuYWJsZUNvbXB1dGVkU3R5bGVDYXNjYWRlczogbmV3IFdJLlNldHRpbmcoImV4cGVy aW1lbnRhbC1lbmFibGUtY29tcHV0ZWQtc3R5bGUtY2FzY2FkZXMiLCBmYWxzZSksCiAgICAgZXhw ZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVu YWJsZS1sYXllcnMtdGFiIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZU5ld1RhYkJh cjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtbmV3LXRhYi1iYXIiLCBmYWxz ZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBiOWM4ZTllMDVh Yi4uNDBhMzZlODQ1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpA QCAtMjQ0LDcgKzI0NCw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0 aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgaWYg KHdpbmRvdy5DU1NBZ2VudCkgewogICAgICAgICAgICAgbGV0IGdyb3VwID0gZXhwZXJpbWVudGFs U2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJTdHlsZXMgU2lkZWJhcjoiKSk7Ci0g ICAgICAgICAgICBncm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJs ZU11bHRpcGxlUHJvcGVydGllc1NlbGVjdGlvbiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBTZWxlY3Rp b24gb2YgTXVsdGlwbGUgUHJvcGVydGllcyIpKTsKICAgICAgICAgICAgIGdyb3VwLmFkZFNldHRp bmcoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2NhZGVzLCBX SS5VSVN0cmluZygiRW5hYmxlIENvbXB1dGVkIFN0eWxlIENhc2NhZGVzIikpOwogICAgICAgICAg ICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwogICAgICAgICB9CkBA IC0yODYsNyArMjg1LDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRp bmdzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIH0p OwogICAgICAgICB9CiAKLSAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVy aW1lbnRhbEVuYWJsZU11bHRpcGxlUHJvcGVydGllc1NlbGVjdGlvbik7CiAgICAgICAgIGxpc3Rl bkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVDb21wdXRlZFN0eWxlQ2Fz Y2FkZXMpOwogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFs RW5hYmxlTGF5ZXJzVGFiKTsKICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4 cGVyaW1lbnRhbEVuYWJsZUF1ZGl0VGFiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVk aXRvci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuY3NzCmluZGV4IGMwMmNmYzk4MWZhLi5h OWI2MTEzNzA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmNzcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0 eWxlRGVjbGFyYXRpb25FZGl0b3IuY3NzCkBAIC0zOCw5ICszOCw2IEBACiAuc3ByZWFkc2hlZXQt c3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eSB7CiAgICAgcGFkZGluZy1yaWdodDog dmFyKC0tY3NzLWRlY2xhcmF0aW9uLWhvcml6b250YWwtcGFkZGluZyk7CiAgICAgcGFkZGluZy1s ZWZ0OiBjYWxjKHZhcigtLWNzcy1kZWNsYXJhdGlvbi1ob3Jpem9udGFsLXBhZGRpbmcpICsgMTdw eCk7Ci19Ci0KLS5tdWx0aXBsZS1wcm9wZXJ0aWVzLXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5 bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eSB7CiAgICAgYm9yZGVyLWxlZnQ6IDFweCBz b2xpZCB0cmFuc3BhcmVudDsKICAgICBvdXRsaW5lOiBub25lOwogfQpAQCAtNTMsNyArNTAsNyBA QAogICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKIH0KIAotLm11bHRpcGxlLXByb3BlcnRp ZXMtc2VsZWN0aW9uIC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgOm1hdGNo ZXMoLm5hbWUsIC52YWx1ZSk6bm90KC5lZGl0aW5nKSB7Cisuc3ByZWFkc2hlZXQtc3R5bGUtZGVj bGFyYXRpb24tZWRpdG9yIDptYXRjaGVzKC5uYW1lLCAudmFsdWUpOm5vdCguZWRpdGluZykgewog ICAgIG91dGxpbmU6IG5vbmU7CiB9CiAKQEAgLTY0LDcgKzYxLDcgQEAKICAgICBwYWRkaW5nLWJv dHRvbTogMCAhaW1wb3J0YW50OwogfQogCi0ubXVsdGlwbGUtcHJvcGVydGllcy1zZWxlY3Rpb24g LnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xhcmF0aW9uLWVkaXRvciA6bWF0Y2hlcygubmFtZSwgLnZh bHVlKTpub3QoLmVkaXRpbmcpIHsKKy5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0 b3IgOm1hdGNoZXMoLm5hbWUsIC52YWx1ZSk6bm90KC5lZGl0aW5nKSB7CiAgICAgb3V0bGluZTog bm9uZTsKIH0KIApAQCAtMTM2LDExICsxMzMsMTEgQEAKICAgICAtd2Via2l0LWNsaXAtcGF0aDog cG9seWdvbigwJSA1MCUsIDZweCAwJSwgMTAwJSAwJSwgMTAwJSAxMDAlLCA2cHggMTAwJSk7CiB9 CiAKLS5tdWx0aXBsZS1wcm9wZXJ0aWVzLXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVj bGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eS5zZWxlY3RlZCB7Cisuc3ByZWFkc2hlZXQtc3R5bGUt ZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eS5zZWxlY3RlZCB7CiAgICAgYmFja2dyb3VuZC1j b2xvcjogdmFyKC0tYmFja2dyb3VuZC1jb2xvci1zZWxlY3RlZCk7CiB9CiAKLS5tdWx0aXBsZS1w cm9wZXJ0aWVzLXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9y IC5wcm9wZXJ0eS5zZWxlY3RlZDpmb2N1cyB7Cisuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRp b24tZWRpdG9yIC5wcm9wZXJ0eS5zZWxlY3RlZDpmb2N1cyB7CiAgICAgYm9yZGVyLWxlZnQtY29s b3I6IHZhcigtLWJvcmRlci1jb2xvci1zZWxlY3RlZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVE ZWNsYXJhdGlvbkVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcwppbmRleCA5OGIz ZDE5ZmI1NC4uZjNiZTQxZDBiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRz aGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKQEAgLTY4LDggKzY4LDcgQEAgV0kuU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAgICAgIHRoaXMuZm9jdXNlZCA9IGZhbHNlOwogICAg ICAgICB9LCB0cnVlKTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5h YmxlTXVsdGlwbGVQcm9wZXJ0aWVzU2VsZWN0aW9uLnZhbHVlKQotICAgICAgICAgICAgdGhpcy5l bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJp bmQodGhpcykpOworICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93 biIsIHRoaXMuX2hhbmRsZUtleURvd24uYmluZCh0aGlzKSk7CiAgICAgfQogCiAgICAgbGF5b3V0 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25TZWN0aW9uLmpzCmluZGV4IGM0YjM1ZjVhOTNkLi4xOGMzMTExMzliMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpz CkBAIC0zMiwxNCArMzIsOCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uUwogICAgICAgICBsZXQg ZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlY3Rpb24iKTsKICAgICAgICAgZWxl bWVudC5jbGFzc0xpc3QuYWRkKCJzcHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24iKTsKIAotICAg ICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTXVsdGlwbGVQcm9wZXJ0aWVz U2VsZWN0aW9uLnZhbHVlKQotICAgICAgICAgICAgZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJtdWx0 aXBsZS1wcm9wZXJ0aWVzLXNlbGVjdGlvbiIpOwotCiAgICAgICAgIHN1cGVyKGVsZW1lbnQpOwog Ci0gICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVNdWx0aXBsZVByb3Bl cnRpZXNTZWxlY3Rpb24udmFsdWUpCi0gICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQo Im11bHRpcGxlLXByb3BlcnRpZXMtc2VsZWN0aW9uIik7Ci0KICAgICAgICAgdGhpcy5fZGVsZWdh dGUgPSBkZWxlZ2F0ZSB8fCBudWxsOwogICAgICAgICB0aGlzLl9zdHlsZSA9IHN0eWxlOwogICAg ICAgICB0aGlzLl9wcm9wZXJ0aWVzRWRpdG9yID0gbnVsbDsKQEAgLTM5MCw5ICszODQsNiBAQCBX SS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uUwogICAgIHsKICAgICAgICAgdGhpcy5fd2FzRWRpdGluZyA9 IHRoaXMuX3Byb3BlcnRpZXNFZGl0b3IuZWRpdGluZyB8fCBkb2N1bWVudC5hY3RpdmVFbGVtZW50 ID09PSB0aGlzLl9zZWxlY3RvckVsZW1lbnQ7CiAKLSAgICAgICAgaWYgKCFXSS5zZXR0aW5ncy5l eHBlcmltZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24udmFsdWUpCi0gICAg ICAgICAgICByZXR1cm47Ci0KICAgICAgICAgbGV0IHByb3BlcnR5RWxlbWVudCA9IGV2ZW50LnRh cmdldC5jbG9zZXN0KCIucHJvcGVydHkiKTsKICAgICAgICAgaWYgKCFwcm9wZXJ0eUVsZW1lbnQp CiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVy dHkuanMKaW5kZXggYzA4NmYzMjVjNTkuLjM1MWU4NmVmM2NjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVy dHkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCkBAIC01NSw3ICs1NSw3IEBAIFdJLlNwcmVhZHNoZWV0 U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICBwcm9wZXJ0eS5hZGRFdmVudExpc3RlbmVyKFdJLkNTU1Byb3BlcnR5 LkV2ZW50Lk92ZXJyaWRkZW5TdGF0dXNDaGFuZ2VkLCB0aGlzLnVwZGF0ZVN0YXR1cywgdGhpcyk7 CiAgICAgICAgIHByb3BlcnR5LmFkZEV2ZW50TGlzdGVuZXIoV0kuQ1NTUHJvcGVydHkuRXZlbnQu Q2hhbmdlZCwgdGhpcy51cGRhdGVTdGF0dXMsIHRoaXMpOwogCi0gICAgICAgIGlmIChXSS5zZXR0 aW5ncy5leHBlcmltZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24udmFsdWUg JiYgdGhpcy5faXNFZGl0YWJsZSgpKSB7CisgICAgICAgIGlmICh0aGlzLl9pc0VkaXRhYmxlKCkp IHsKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQudGFiSW5kZXggPSAtMTsKIAogICAgICAgICAg ICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwgKGV2ZW50KSA9PiB7CkBA IC00NzIsMTMgKzQ3MiwxMCBAQCBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgPSBjbGFzcyBT cHJlYWRzaGVldFN0eWxlUHJvcGVydHkgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdG9rZW5F bGVtZW50LmFwcGVuZChzd2F0Y2guZWxlbWVudCwgaW5uZXJFbGVtZW50KTsKIAogICAgICAgICAv LyBQcmV2ZW50IHRoZSB2YWx1ZSBmcm9tIGVkaXRpbmcgd2hlbiBjbGlja2luZyBvbiB0aGUgc3dh dGNoLgotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTXVsdGlwbGVQ cm9wZXJ0aWVzU2VsZWN0aW9uLnZhbHVlKSB7Ci0gICAgICAgICAgICBzd2F0Y2guZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIChldmVudCkgPT4gewotICAgICAgICAgICAgICAgIGlm ICh0aGlzLl9zd2F0Y2hBY3RpdmUpCi0gICAgICAgICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsK LSAgICAgICAgICAgIH0pOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHN3YXRjaC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIChldmVudCkgPT4geyBldmVudC5zdG9w KCk7IH0pOworICAgICAgICBzd2F0Y2guZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IChldmVudCkgPT4geworICAgICAgICAgICAgaWYgKHRoaXMuX3N3YXRjaEFjdGl2ZSkKKyAgICAg ICAgICAgICAgICBldmVudC5zdG9wKCk7CisgICAgICAgIH0pOwogCiAgICAgICAgIHJldHVybiB0 b2tlbkVsZW1lbnQ7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwppbmRl eCBlYTQzMmNkYThkNC4uMDJiNzRiZDg0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZp ZWxkLmpzCkBAIC00MCwxMiArNDAsOCBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNz IFNwcmVhZHNoZWV0VGV4dEZpZWxkCiAKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJzcHJlYWRzaGVldC10ZXh0LWZpZWxkIik7CiAKLSAgICAgICAgaWYgKFdJLnNldHRpbmdz LmV4cGVyaW1lbnRhbEVuYWJsZU11bHRpcGxlUHJvcGVydGllc1NlbGVjdGlvbi52YWx1ZSkgewot ICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl9oYW5kbGVNb3VzZURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgICAgICAgICB0aGlz Ll9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGFuZGxlQ2xpY2suYmlu ZCh0aGlzKSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX2hhbmRsZUZvY3VzLmJpbmQodGhpcykpOwotCisg ICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5f aGFuZGxlTW91c2VEb3duLmJpbmQodGhpcyksIHRydWUpOworICAgICAgICB0aGlzLl9lbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGFuZGxlQ2xpY2suYmluZCh0aGlzKSk7 CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiYmx1ciIsIHRoaXMuX2hh bmRsZUJsdXIuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigia2V5ZG93biIsIHRoaXMuX2hhbmRsZUtleURvd24uYmluZCh0aGlzKSk7CiAgICAgICAg IHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiaW5wdXQiLCB0aGlzLl9oYW5kbGVJbnB1 dC5iaW5kKHRoaXMpKTsKQEAgLTIxMywxMSArMjA5LDYgQEAgV0kuU3ByZWFkc2hlZXRUZXh0Rmll bGQgPSBjbGFzcyBTcHJlYWRzaGVldFRleHRGaWVsZAogICAgICAgICAgICAgZXZlbnQuc3RvcFBy b3BhZ2F0aW9uKCk7CiAgICAgfQogCi0gICAgX2hhbmRsZUZvY3VzKGV2ZW50KQotICAgIHsKLSAg ICAgICAgdGhpcy5zdGFydEVkaXRpbmcoKTsKLSAgICB9Ci0KICAgICBfaGFuZGxlQmx1cihldmVu dCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fZWRpdGluZykK 355941 2018-11-28 16:22:31 -0800 2018-11-28 17:11:21 -0800 Patch patch.txt text/plain 11810 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUzYTBmMDExYTFmLi4xOGNkNmUyZTk3NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMTEtMjggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBlbmFibGUgc2VsZWN0aW9uIG9mIG11bHRpcGxlIHByb3BlcnRpZXMgYnkgZGVm YXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTky MTA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjMyMzU2NT4KKworICAgICAgICBSZXZpZXdl ZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGlu Zy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3Jl YXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKyAgICAgICAgUmVtb3ZlIHRoZSBjaGVja2Jv eC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uRWRpdG9yLmNzczoKKyAgICAgICAgKC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJh dGlvbi1lZGl0b3IgLnByb3BlcnR5KToKKyAgICAgICAgKC5zcHJlYWRzaGVldC1zdHlsZS1kZWNs YXJhdGlvbi1lZGl0b3IgOm1hdGNoZXMoLm5hbWUsIC52YWx1ZSk6bm90KC5lZGl0aW5nKSk6Cisg ICAgICAgICguc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eS5z ZWxlY3RlZCk6CisgICAgICAgICguc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9y IC5wcm9wZXJ0eS5zZWxlY3RlZDpmb2N1cyk6CisgICAgICAgICgubXVsdGlwbGUtcHJvcGVydGll cy1zZWxlY3Rpb24gLnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVy dHkpOiBEZWxldGVkLgorICAgICAgICAoLm11bHRpcGxlLXByb3BlcnRpZXMtc2VsZWN0aW9uIC5z cHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgOm1hdGNoZXMoLm5hbWUsIC52YWx1 ZSk6bm90KC5lZGl0aW5nKSk6IERlbGV0ZWQuCisgICAgICAgICgubXVsdGlwbGUtcHJvcGVydGll cy1zZWxlY3Rpb24gLnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVy dHkuc2VsZWN0ZWQpOiBEZWxldGVkLgorICAgICAgICAoLm11bHRpcGxlLXByb3BlcnRpZXMtc2Vs ZWN0aW9uIC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5LnNl bGVjdGVkOmZvY3VzKTogRGVsZXRlZC4KKyAgICAgICAgUmVtb3ZlIGAubXVsdGlwbGUtcHJvcGVy dGllcy1zZWxlY3Rpb25gIGNsYXNzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanM6CisgICAgICAgIChXSS5TcHJl YWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IucHJvdG90eXBlLmluaXRpYWxMYXlvdXQp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uU2VjdGlvbi5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24pOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5wcm90b3R5cGUuX2hhbmRsZU1vdXNlRG93bik6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanM6CisgICAgICAgIChXSS5TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkucHJvdG90eXBlLl9jcmVhdGVJbmxpbmVTd2F0Y2gpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanM6CisgICAg ICAgIChXSS5TcHJlYWRzaGVldFRleHRGaWVsZCk6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFRl eHRGaWVsZC5wcm90b3R5cGUuX2hhbmRsZUZvY3VzKTogRGVsZXRlZC4KKwogMjAxOC0xMS0yOCAg TWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIHVudXNlZCBEYXRhR3JpZCBhbmQgVHJlZU91dGxpbmUgY29kZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4 IDk2YmNlYTFiNjkwLi44NjgxNGVlZTk4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwpAQCAtMTI5LDcgKzEyOSw2IEBAIFdJ LnNldHRpbmdzID0gewogICAgIHpvb21GYWN0b3I6IG5ldyBXSS5TZXR0aW5nKCJ6b29tLWZhY3Rv ciIsIDEpLAogCiAgICAgLy8gRXhwZXJpbWVudGFsCi0gICAgZXhwZXJpbWVudGFsRW5hYmxlTXVs dGlwbGVQcm9wZXJ0aWVzU2VsZWN0aW9uOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVu YWJsZS1tdWx0aXBsZS1wcm9wZXJ0aWVzLXNlbGVjdGlvbiIsIGZhbHNlKSwKICAgICBleHBlcmlt ZW50YWxFbmFibGVDb21wdXRlZFN0eWxlQ2FzY2FkZXM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmlt ZW50YWwtZW5hYmxlLWNvbXB1dGVkLXN0eWxlLWNhc2NhZGVzIiwgZmFsc2UpLAogICAgIGV4cGVy aW1lbnRhbEVuYWJsZUxheWVyc1RhYjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFi bGUtbGF5ZXJzLXRhYiIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVOZXdUYWJCYXI6 IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLW5ldy10YWItYmFyIiwgZmFsc2Up LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKaW5kZXggYjljOGU5ZTA1YWIu LjQwYTM2ZTg0NWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKQEAg LTI0NCw3ICsyNDQsNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGlu Z3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogCiAgICAgICAgIGlmICh3 aW5kb3cuQ1NTQWdlbnQpIHsKICAgICAgICAgICAgIGxldCBncm91cCA9IGV4cGVyaW1lbnRhbFNl dHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiU3R5bGVzIFNpZGViYXI6IikpOwotICAg ICAgICAgICAgZ3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVN dWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24sIFdJLlVJU3RyaW5nKCJFbmFibGUgU2VsZWN0aW9u IG9mIE11bHRpcGxlIFByb3BlcnRpZXMiKSk7CiAgICAgICAgICAgICBncm91cC5hZGRTZXR0aW5n KFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUNvbXB1dGVkU3R5bGVDYXNjYWRlcywgV0ku VUlTdHJpbmcoIkVuYWJsZSBDb21wdXRlZCBTdHlsZSBDYXNjYWRlcyIpKTsKICAgICAgICAgICAg IGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQpAQCAt Mjg2LDcgKzI4NSw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5n c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgICAgICB9KTsK ICAgICAgICAgfQogCi0gICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmlt ZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24pOwogICAgICAgICBsaXN0ZW5G b3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2Nh ZGVzKTsKICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVu YWJsZUxheWVyc1RhYik7CiAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBl cmltZW50YWxFbmFibGVBdWRpdFRhYik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0 b3IuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmNzcwppbmRleCBjMDJjZmM5ODFmYS4uMmYy MTU3MzhiMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5jc3MKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uRWRpdG9yLmNzcwpAQCAtMzgsOSArMzgsNiBAQAogLnNwcmVhZHNoZWV0LXN0 eWxlLWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVydHkgewogICAgIHBhZGRpbmctcmlnaHQ6IHZh cigtLWNzcy1kZWNsYXJhdGlvbi1ob3Jpem9udGFsLXBhZGRpbmcpOwogICAgIHBhZGRpbmctbGVm dDogY2FsYyh2YXIoLS1jc3MtZGVjbGFyYXRpb24taG9yaXpvbnRhbC1wYWRkaW5nKSArIDE3cHgp OwotfQotCi0ubXVsdGlwbGUtcHJvcGVydGllcy1zZWxlY3Rpb24gLnNwcmVhZHNoZWV0LXN0eWxl LWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVydHkgewogICAgIGJvcmRlci1sZWZ0OiAxcHggc29s aWQgdHJhbnNwYXJlbnQ7CiAgICAgb3V0bGluZTogbm9uZTsKIH0KQEAgLTUzLDcgKzUwLDcgQEAK ICAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xvcik7CiB9CiAKLS5tdWx0aXBsZS1wcm9wZXJ0aWVz LXNlbGVjdGlvbiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIDptYXRjaGVz KC5uYW1lLCAudmFsdWUpOm5vdCguZWRpdGluZykgeworLnNwcmVhZHNoZWV0LXN0eWxlLWRlY2xh cmF0aW9uLWVkaXRvciA6bWF0Y2hlcygubmFtZSwgLnZhbHVlKTpub3QoLmVkaXRpbmcpIHsKICAg ICBvdXRsaW5lOiBub25lOwogfQogCkBAIC02NCwxMCArNjEsNiBAQAogICAgIHBhZGRpbmctYm90 dG9tOiAwICFpbXBvcnRhbnQ7CiB9CiAKLS5tdWx0aXBsZS1wcm9wZXJ0aWVzLXNlbGVjdGlvbiAu c3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIDptYXRjaGVzKC5uYW1lLCAudmFs dWUpOm5vdCguZWRpdGluZykgewotICAgIG91dGxpbmU6IG5vbmU7Ci19Ci0KIC5zcHJlYWRzaGVl dC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnZhbHVlLmVkaXRpbmcgewogICAgIGRpc3BsYXk6 IGlubGluZS1ibG9jazsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CkBAIC0xMzYsMTEgKzEyOSwx MSBAQAogICAgIC13ZWJraXQtY2xpcC1wYXRoOiBwb2x5Z29uKDAlIDUwJSwgNnB4IDAlLCAxMDAl IDAlLCAxMDAlIDEwMCUsIDZweCAxMDAlKTsKIH0KIAotLm11bHRpcGxlLXByb3BlcnRpZXMtc2Vs ZWN0aW9uIC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5LnNl bGVjdGVkIHsKKy5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5 LnNlbGVjdGVkIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9y LXNlbGVjdGVkKTsKIH0KIAotLm11bHRpcGxlLXByb3BlcnRpZXMtc2VsZWN0aW9uIC5zcHJlYWRz aGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5LnNlbGVjdGVkOmZvY3VzIHsK Ky5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5LnNlbGVjdGVk OmZvY3VzIHsKICAgICBib3JkZXItbGVmdC1jb2xvcjogdmFyKC0tYm9yZGVyLWNvbG9yLXNlbGVj dGVkKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uRWRpdG9yLmpzCmluZGV4IDk4YjNkMTlmYjU0Li5mM2JlNDFkMGJiYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRv ci5qcwpAQCAtNjgsOCArNjgsNyBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25F ZGl0b3IgPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogICAgICAgICAg ICAgdGhpcy5mb2N1c2VkID0gZmFsc2U7CiAgICAgICAgIH0sIHRydWUpOwogCi0gICAgICAgIGlm IChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rp b24udmFsdWUpCi0gICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5 ZG93biIsIHRoaXMuX2hhbmRsZUtleURvd24uYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlS2V5RG93bi5iaW5k KHRoaXMpKTsKICAgICB9CiAKICAgICBsYXlvdXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKaW5kZXggYzRiMzVmNWE5 M2QuLjE4YzMxMTEzOWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0 Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKQEAgLTMyLDE0ICszMiw4IEBAIFdJLlNwcmVh ZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0 eWxlRGVjbGFyYXRpb25TCiAgICAgICAgIGxldCBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgic2VjdGlvbiIpOwogICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoInNwcmVhZHNo ZWV0LWNzcy1kZWNsYXJhdGlvbiIpOwogCi0gICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmlt ZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24udmFsdWUpCi0gICAgICAgICAg ICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoIm11bHRpcGxlLXByb3BlcnRpZXMtc2VsZWN0aW9uIik7 Ci0KICAgICAgICAgc3VwZXIoZWxlbWVudCk7CiAKLSAgICAgICAgaWYgKFdJLnNldHRpbmdzLmV4 cGVyaW1lbnRhbEVuYWJsZU11bHRpcGxlUHJvcGVydGllc1NlbGVjdGlvbi52YWx1ZSkKLSAgICAg ICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibXVsdGlwbGUtcHJvcGVydGllcy1zZWxlY3Rp b24iKTsKLQogICAgICAgICB0aGlzLl9kZWxlZ2F0ZSA9IGRlbGVnYXRlIHx8IG51bGw7CiAgICAg ICAgIHRoaXMuX3N0eWxlID0gc3R5bGU7CiAgICAgICAgIHRoaXMuX3Byb3BlcnRpZXNFZGl0b3Ig PSBudWxsOwpAQCAtMzkwLDkgKzM4NCw2IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TCiAgICAg ewogICAgICAgICB0aGlzLl93YXNFZGl0aW5nID0gdGhpcy5fcHJvcGVydGllc0VkaXRvci5lZGl0 aW5nIHx8IGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQgPT09IHRoaXMuX3NlbGVjdG9yRWxlbWVudDsK IAotICAgICAgICBpZiAoIVdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZU11bHRpcGxlUHJv cGVydGllc1NlbGVjdGlvbi52YWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBs ZXQgcHJvcGVydHlFbGVtZW50ID0gZXZlbnQudGFyZ2V0LmNsb3Nlc3QoIi5wcm9wZXJ0eSIpOwog ICAgICAgICBpZiAoIXByb3BlcnR5RWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCBjMDg2ZjMyNWM1OS4uMzUx ZTg2ZWYzY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKQEAg LTU1LDcgKzU1LDcgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHByb3BlcnR5LmFk ZEV2ZW50TGlzdGVuZXIoV0kuQ1NTUHJvcGVydHkuRXZlbnQuT3ZlcnJpZGRlblN0YXR1c0NoYW5n ZWQsIHRoaXMudXBkYXRlU3RhdHVzLCB0aGlzKTsKICAgICAgICAgcHJvcGVydHkuYWRkRXZlbnRM aXN0ZW5lcihXSS5DU1NQcm9wZXJ0eS5FdmVudC5DaGFuZ2VkLCB0aGlzLnVwZGF0ZVN0YXR1cywg dGhpcyk7CiAKLSAgICAgICAgaWYgKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZU11bHRp cGxlUHJvcGVydGllc1NlbGVjdGlvbi52YWx1ZSAmJiB0aGlzLl9pc0VkaXRhYmxlKCkpIHsKKyAg ICAgICAgaWYgKHRoaXMuX2lzRWRpdGFibGUoKSkgewogICAgICAgICAgICAgdGhpcy5fZWxlbWVu dC50YWJJbmRleCA9IC0xOwogCiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImJsdXIiLCAoZXZlbnQpID0+IHsKQEAgLTQ3MiwxMyArNDcyLDEwIEBAIFdJLlNwcmVh ZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICB0b2tlbkVsZW1lbnQuYXBwZW5kKHN3YXRjaC5lbGVtZW50 LCBpbm5lckVsZW1lbnQpOwogCiAgICAgICAgIC8vIFByZXZlbnQgdGhlIHZhbHVlIGZyb20gZWRp dGluZyB3aGVuIGNsaWNraW5nIG9uIHRoZSBzd2F0Y2guCi0gICAgICAgIGlmIChXSS5zZXR0aW5n cy5leHBlcmltZW50YWxFbmFibGVNdWx0aXBsZVByb3BlcnRpZXNTZWxlY3Rpb24udmFsdWUpIHsK LSAgICAgICAgICAgIHN3YXRjaC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2 ZW50KSA9PiB7Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX3N3YXRjaEFjdGl2ZSkKLSAgICAg ICAgICAgICAgICAgICAgZXZlbnQuc3RvcCgpOwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0g ZWxzZQotICAgICAgICAgICAgc3dhdGNoLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgKGV2ZW50KSA9PiB7IGV2ZW50LnN0b3AoKTsgfSk7CisgICAgICAgIHN3YXRjaC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICBp ZiAodGhpcy5fc3dhdGNoQWN0aXZlKQorICAgICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKKyAg ICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuIHRva2VuRWxlbWVudDsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVl dFRleHRGaWVsZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCmluZGV4IGVhNDMyY2RhOGQ0Li4wMmI3NGJkODRmZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRUZXh0RmllbGQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMKQEAgLTQwLDEyICs0MCw4IEBAIFdJ LlNwcmVhZHNoZWV0VGV4dEZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRUZXh0RmllbGQKIAogICAg ICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoInNwcmVhZHNoZWV0LXRleHQtZmllbGQi KTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTXVsdGlwbGVQ cm9wZXJ0aWVzU2VsZWN0aW9uLnZhbHVlKSB7Ci0gICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2hhbmRsZU1vdXNlRG93bi5iaW5kKHRo aXMpLCB0cnVlKTsKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi Y2xpY2siLCB0aGlzLl9oYW5kbGVDbGljay5iaW5kKHRoaXMpKTsKLSAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5f aGFuZGxlRm9jdXMuYmluZCh0aGlzKSk7Ci0KKyAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVNb3VzZURvd24uYmluZCh0aGlzKSwg dHJ1ZSk7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9oYW5kbGVDbGljay5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJibHVyIiwgdGhpcy5faGFuZGxlQmx1ci5iaW5kKHRoaXMpKTsKICAgICAg ICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxl S2V5RG93bi5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJpbnB1dCIsIHRoaXMuX2hhbmRsZUlucHV0LmJpbmQodGhpcykpOwpAQCAtMjEzLDExICsy MDksNiBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4dEZp ZWxkCiAgICAgICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKICAgICB9CiAKLSAgICBf aGFuZGxlRm9jdXMoZXZlbnQpCi0gICAgewotICAgICAgICB0aGlzLnN0YXJ0RWRpdGluZygpOwot ICAgIH0KLQogICAgIF9oYW5kbGVCbHVyKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlz Ll9lZGl0aW5nKQo=