199594 2019-07-08 15:32:55 -0700 Web Inspector: Elements: always show all navigation bar items, but disable those that wouldn't work 2019-07-12 16:17:29 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 199555 1 hi hi commit-queue hi inspector-bugzilla-changes ross.kirsling webkit-bug-importer oldest_to_newest 1551002 0 hi 2019-07-08 15:32:55 -0700 Instead of only showing icons for functionality that is supported by the inspected target, we should always show all of the icons and just disable the ones that wouldn't work. 1552144 1 373934 hi 2019-07-11 11:53:43 -0700 Created attachment 373934 Patch 1552524 2 373934 ross.kirsling 2019-07-12 14:17:59 -0700 Comment on attachment 373934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373934&action=review > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:36 > + this._compositingBordersButtonNavigationItem.enabled = InspectorBackend.domains.Page; Did you mean to drop the existing condition? > this._compositingBordersButtonNavigationItem.enabled = InspectorBackend.domains.Page && !!InspectorBackend.domains.Page.getCompositingBordersVisible; 1552530 3 373934 hi 2019-07-12 14:36:46 -0700 Comment on attachment 373934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373934&action=review >> Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:36 >> + this._compositingBordersButtonNavigationItem.enabled = InspectorBackend.domains.Page; > > Did you mean to drop the existing condition? No, but I do need to add a `!!`. The idea is that we only want to enable this button if the target has a `PageAgent`. `Page.getCompositingBordersVisible` exists for all supported iOS inspection targets, so we don't need a more specific compatibility check than that. 1552531 4 ross.kirsling 2019-07-12 14:38:59 -0700 (In reply to Devin Rousso from comment #3) > Comment on attachment 373934 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373934&action=review > > >> Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:36 > >> + this._compositingBordersButtonNavigationItem.enabled = InspectorBackend.domains.Page; > > > > Did you mean to drop the existing condition? > > No, but I do need to add a `!!`. The idea is that we only want to enable > this button if the target has a `PageAgent`. > `Page.getCompositingBordersVisible` exists for all supported iOS inspection > targets, so we don't need a more specific compatibility check than that. Ahh, I'm now seeing the correspondence with your // COMPATIBILITY comments. :) 1552532 5 373934 ross.kirsling 2019-07-12 14:40:52 -0700 Comment on attachment 373934 Patch r=me with that tiny update then :) 1552535 6 374037 hi 2019-07-12 14:46:04 -0700 Created attachment 374037 Patch 1552587 7 374037 commit-queue 2019-07-12 16:09:58 -0700 Comment on attachment 374037 Patch Clearing flags on attachment: 374037 Committed r247405: <https://trac.webkit.org/changeset/247405> 1552589 8 commit-queue 2019-07-12 16:09:59 -0700 All reviewed patches have been landed. Closing bug. 1552594 9 webkit-bug-importer 2019-07-12 16:17:29 -0700 <rdar://problem/53032515> 373934 2019-07-11 11:53:43 -0700 2019-07-12 14:46:02 -0700 Patch bug-199594-20190711115342.patch text/plain 16740 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZhNjkyZGM1ZTljOTYzMDA5OTlhOWZlNWE5OTlj MGZlMTc0ZWQzM2QuLmI5YjM4Yzg1MTNkMGMxMjg5NGNlNjI1ZTg0NTQzZjU5YjI1ZWVjMmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA3LTExICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogYWx3YXlzIHNob3cgYWxsIG5hdmlnYXRpb24gYmFyIGl0ZW1zLCBidXQgZGlzYWJs ZSB0aG9zZSB0aGF0IHdvdWxkbid0IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5OTU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlb3JkZXIgdGhlIG5hdmlnYXRpb24gaXRlbXMgb2YgdGhlIEVs ZW1lbnRzIHRhYiAobGVmdCB0byByaWdodCk6CisgICAgICAgICAtIFNob3cgcnVsZXJzCisgICAg ICAgICAtIEZvcmNlIHByaW50IG1lZGlhIHN0eWxlcworICAgICAgICAgLSBGb3JjZSBEYXJrIEFw cGVhcmFuY2UgLyBGb3JjZSBMaWdodCBBcHBlYXJhbmNlCisgICAgICAgICAtIFNob3cgY29tcG9z aXRpbmcgYm9yZGVycworICAgICAgICAgLSBFbmFibGUgcGFpbnQgZmxhc2hpbmcKKyAgICAgICAg IC0gU2hvdyBzaGFkb3cgRE9NIG5vZGVzCisgICAgICAgIFRoaXMgd2F5LCAicmVsYXRlZCIgKGUu Zy4gcHJpbnQgc3R5bGVzIGFuZCBkYXJrL2xpZ2h0IGFwcGVhcmFuY2UgYm90aCByZWxhdGUgdG8g Q1NTIG1lZGlhKQorICAgICAgICB0b2dnbGVzIGFyZSBncm91cGVkIGNsb3NlciB0b2dldGhlci4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkRPTVRyZWVDb250 ZW50Vmlldy5wcm90b3R5cGUuZ2V0IG5hdmlnYXRpb25JdGVtcyk6CisgICAgICAgIChXSS5ET01U cmVlQ29udGVudFZpZXcucHJvdG90eXBlLl9kZWZhdWx0QXBwZWFyYW5jZURpZENoYW5nZSk6Cisg ICAgICAgIChXSS5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLl90b2dnbGVBcHBlYXJhbmNl KToKKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKwogMjAxOS0wNy0xMSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzOiBVbmNhdWdodCBFeGNlcHRpb246IFJlcXVlc3Qg d2l0aCBpZCA9IDIgZmFpbGVkLiB7ImNvZGUiOi0zMjYwMSwibWVzc2FnZSI6IidQYWdlJyBkb21h aW4gd2FzIG5vdCBmb3VuZCIsImRhdGEiOlt7ImNvZGUiOi0zMjYwMSwibWVzc2FnZSI6IidQYWdl JyBkb21haW4gd2FzIG5vdCBmb3VuZCJ9XX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IDIwZmI3NmFjYmM3MzVhNGEzYTY3MDllMTYyYjc5ZDI3OTUxYTc1MzMuLjJlMzUwZDll NmI5YTI0NzNlNDcxOWU5MDNmMGRhZWRmMzRjYmMxMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwpAQCAtNDk0LDcgKzQ5NCw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkZvbnQiXSA9 ICJGb250IjsKIGxvY2FsaXplZFN0cmluZ3NbIkZvbnRzIl0gPSAiRm9udHMiOwogbG9jYWxpemVk U3RyaW5nc1siRm9yY2UgRGFyayBBcHBlYXJhbmNlIl0gPSAiRm9yY2UgRGFyayBBcHBlYXJhbmNl IjsKIGxvY2FsaXplZFN0cmluZ3NbIkZvcmNlIExpZ2h0IEFwcGVhcmFuY2UiXSA9ICJGb3JjZSBM aWdodCBBcHBlYXJhbmNlIjsKLWxvY2FsaXplZFN0cmluZ3NbIkZvcmNlIFByaW50IE1lZGlhIFN0 eWxlcyJdID0gIkZvcmNlIFByaW50IE1lZGlhIFN0eWxlcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJG b3JjZSBwcmludCBtZWRpYSBzdHlsZXMiXSA9ICJGb3JjZSBwcmludCBtZWRpYSBzdHlsZXMiOwog LyogTGF5b3V0IHBoYXNlIHJlY29yZHMgdGhhdCB3ZXJlIGltcGVyYXRpdmUgKGZvcmNlZCkgKi8K IGxvY2FsaXplZFN0cmluZ3NbIkZvcmNlZCBMYXlvdXQiXSA9ICJGb3JjZWQgTGF5b3V0IjsKIC8q IEEgY29udGV4dCBtZW51IGl0ZW0gdG8gZm9yY2UgKG92ZXJyaWRlKSBhIERPTSBub2RlJ3MgcHNl dWRvLWNsYXNzZXMgKi8KQEAgLTU1NCw4ICs1NTQsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRl IENvbnNvbGUgKCVzKSJdID0gIkhpZGUgQ29uc29sZSAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkhpZGUgRWxlbWVudHMiXSA9ICJIaWRlIEVsZW1lbnRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhp ZGUgR3JpZCJdID0gIkhpZGUgR3JpZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIFBhdGgiXSA9 ICJIaWRlIFBhdGgiOwotbG9jYWxpemVkU3RyaW5nc1siSGlkZSBSdWxlcnMiXSA9ICJIaWRlIFJ1 bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIGNvbXBvc2l0aW5nIGJvcmRlcnMiXSA9ICJI aWRlIGNvbXBvc2l0aW5nIGJvcmRlcnMiOworbG9jYWxpemVkU3RyaW5nc1siSGlkZSBydWxlcnMi XSA9ICJIaWRlIHJ1bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHNoYWRvdyBET00gbm9k ZXMiXSA9ICJIaWRlIHNoYWRvdyBET00gbm9kZXMiOwogbG9jYWxpemVkU3RyaW5nc1siSGlkZSB0 aGUgZGV0YWlscyBzaWRlYmFyICglcykiXSA9ICJIaWRlIHRoZSBkZXRhaWxzIHNpZGViYXIgKCVz KSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSJd ID0gIkhpZGUgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIjsKQEAgLTk3NSw3ICs5NzUsNiBA QCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IEdyaWQiXSA9ICJTaG93IEdyaWQiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBKdW1wIHRvIEVmZmVjdGl2ZSBQcm9wZXJ0eSBCdXR0b24iXSA9ICJTaG93 IEp1bXAgdG8gRWZmZWN0aXZlIFByb3BlcnR5IEJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJT aG93IFBhdGgiXSA9ICJTaG93IFBhdGgiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5p bmcgKCVkKSJdID0gIlNob3cgUmVtYWluaW5nICglZCkiOwotbG9jYWxpemVkU3RyaW5nc1siU2hv dyBSdWxlcnMiXSA9ICJTaG93IFJ1bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNjb3Bl IENoYWluIG9uIHBhdXNlIl0gPSAiU2hvdyBTY29wZSBDaGFpbiBvbiBwYXVzZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJTaG93IGFsbCBhY3Rpb25zIl0gPSAiU2hvdyBhbGwgYWN0aW9ucyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IGFsbCByZXNvdXJjZXMiXSA9ICJTaG93IGFsbCByZXNvdXJjZXMi OwpAQCAtOTg5LDYgKzk4OCw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgb25seSBmb3Igc2Vs ZWN0ZWQgbm9kZSJdID0gIlNob3cgb25seSBmb3Igc2VsZWN0ZWQgbm9kZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHBhZ2UgbG9hZCB0aW1pbmciXSA9ICJTaG93IHBhZ2UgbG9hZCB0aW1pbmci OwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBwYWdlIHJlc291cmNlcyJdID0gIlNob3cgcGFnZSBy ZXNvdXJjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBi b3JkZXIgbGluZXMiXSA9ICJTaG93IHBhZ2UgcnVsZXJzIGFuZCBub2RlIGJvcmRlciBsaW5lcyI7 Citsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHJ1bGVycyJdID0gIlNob3cgcnVsZXJzIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlNob3cgc2hhZG93IERPTSBub2RlcyJdID0gIlNob3cgc2hhZG93IERPTSBu b2RlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSJd ID0gIlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0aGUgbmF2aWdhdGlvbiBz aWRlYmFyICglcykiOwpAQCAtMTE3Myw4ICsxMTczLDggQEAgbG9jYWxpemVkU3RyaW5nc1siVW5z dXBwb3J0ZWQgcHJvcGVydHkgdmFsdWUiXSA9ICJVbnN1cHBvcnRlZCBwcm9wZXJ0eSB2YWx1ZSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJVbnRpdGxlZCJdID0gIlVudGl0bGVkIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlVzYWdlOiAlcyJdID0gIlVzYWdlOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJVc2Ug RGVmYXVsdCBBcHBlYXJhbmNlIl0gPSAiVXNlIERlZmF1bHQgQXBwZWFyYW5jZSI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJVc2UgRGVmYXVsdCBNZWRpYSBTdHlsZXMiXSA9ICJVc2UgRGVmYXVsdCBNZWRp YSBTdHlsZXMiOwogbG9jYWxpemVkU3RyaW5nc1siVXNlIE1vY2sgQ2FwdHVyZSBEZXZpY2VzIl0g PSAiVXNlIE1vY2sgQ2FwdHVyZSBEZXZpY2VzIjsKK2xvY2FsaXplZFN0cmluZ3NbIlVzZSBkZWZh dWx0IG1lZGlhIHN0eWxlcyJdID0gIlVzZSBkZWZhdWx0IG1lZGlhIHN0eWxlcyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJVc2UgdGhlIHJlc291cmNlIGNhY2hlIHdoZW4gbG9hZGluZyByZXNvdXJjZXMi XSA9ICJVc2UgdGhlIHJlc291cmNlIGNhY2hlIHdoZW4gbG9hZGluZyByZXNvdXJjZXMiOwogbG9j YWxpemVkU3RyaW5nc1siVXNlciBBZ2VudCJdID0gIlVzZXIgQWdlbnQiOwogbG9jYWxpemVkU3Ry aW5nc1siVXNlciBBZ2VudCBTdHlsZXNoZWV0Il0gPSAiVXNlciBBZ2VudCBTdHlsZXNoZWV0IjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcwppbmRleCAxOTE2ZDc0YTI4YWMwNDkzYjhlZDFm NjdlM2MwYmZjOWZlNzFhYzE1Li43OWNiYjUxZDU0ZTg5OGEwY2YwMjgxODVmOGE4MzU5NGYzNmFi Y2ZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC0zMSwyMSArMzEsMTggQEAg V0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29udGVudFZpZXcKIAogICAgICAgICBzdXBlcihyZXByZXNlbnRlZE9iamVjdCk7CiAKLSAg ICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlKSB7Ci0gICAgICAgICAgICB0 aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3Rp dmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJsYXllci1ib3JkZXJzIiwgV0kuVUlTdHJpbmcoIlNo b3cgY29tcG9zaXRpbmcgYm9yZGVycyIpLCBXSS5VSVN0cmluZygiSGlkZSBjb21wb3NpdGluZyBi b3JkZXJzIiksICJJbWFnZXMvTGF5ZXJCb3JkZXJzLnN2ZyIsIDEzLCAxMyk7Ci0gICAgICAgICAg ICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExp c3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2ds ZUNvbXBvc2l0aW5nQm9yZGVycywgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9jb21wb3NpdGlu Z0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gISFJbnNwZWN0b3JCYWNrZW5k LmRvbWFpbnMuUGFnZS5nZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlOwotICAgICAgICAgICAg dGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVBy aW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKLSAgICAg ICAgfQorICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRl bSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJsYXllci1ib3JkZXJzIiwg V0kuVUlTdHJpbmcoIlNob3cgY29tcG9zaXRpbmcgYm9yZGVycyIpLCBXSS5VSVN0cmluZygiSGlk ZSBjb21wb3NpdGluZyBib3JkZXJzIiksICJJbWFnZXMvTGF5ZXJCb3JkZXJzLnN2ZyIsIDEzLCAx Myk7CisgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVt LmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwg dGhpcy5fdG9nZ2xlQ29tcG9zaXRpbmdCb3JkZXJzLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fY29t cG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IEluc3BlY3RvckJh Y2tlbmQuZG9tYWlucy5QYWdlOworICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0 b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5W aXNpYmlsaXR5UHJpb3JpdHkuTG93OwogCi0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmRv bWFpbnMuUGFnZSkgewotICAgICAgICAgICAgV0kuc2V0dGluZ3Muc2hvd1BhaW50UmVjdHMuYWRk RXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dQYWludFJl Y3RzU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwotICAgICAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGlu Z0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0 ZW0oInBhaW50LWZsYXNoaW5nIiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBwYWludCBmbGFzaGluZyIp LCBXSS5VSVN0cmluZygiRGlzYWJsZSBwYWludCBmbGFzaGluZyIpLCAiSW1hZ2VzL1BhaW50LnN2 ZyIsIDE2LCAxNik7Ci0gICAgICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdh dGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5D bGlja2VkLCB0aGlzLl90b2dnbGVQYWludEZsYXNoaW5nLCB0aGlzKTsKLSAgICAgICAgICAgIHRo aXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gISFJbnNwZWN0 b3JCYWNrZW5kLmRvbWFpbnMuUGFnZS5zZXRTaG93UGFpbnRSZWN0czsKLSAgICAgICAgICAgIHRo aXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSBJbnNwZWN0 b3JCYWNrZW5kLmRvbWFpbnMuUGFnZS5zZXRTaG93UGFpbnRSZWN0cyAmJiBXSS5zZXR0aW5ncy5z aG93UGFpbnRSZWN0cy52YWx1ZTsKLSAgICAgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0 b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5W aXNpYmlsaXR5UHJpb3JpdHkuTG93OwotICAgICAgICB9CisgICAgICAgIC8vIENPTVBBVElCSUxJ VFkgKGlPUyA5KQorICAgICAgICBXSS5zZXR0aW5ncy5zaG93UGFpbnRSZWN0cy5hZGRFdmVudExp c3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgdGhpcy5fc2hvd1BhaW50UmVjdHNTZXR0 aW5nQ2hhbmdlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZp Z2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJwYWludC1m bGFzaGluZyIsIFdJLlVJU3RyaW5nKCJFbmFibGUgcGFpbnQgZmxhc2hpbmciKSwgV0kuVUlTdHJp bmcoIkRpc2FibGUgcGFpbnQgZmxhc2hpbmciKSwgIkltYWdlcy9QYWludC5zdmciLCAxNiwgMTYp OworICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZl bnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90 b2dnbGVQYWludEZsYXNoaW5nLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1 dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuUGFn ZSAmJiAhIUluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlLnNldFNob3dQYWludFJlY3RzOwor ICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVk ID0gSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLlBhZ2UgJiYgSW5zcGVjdG9yQmFja2VuZC5kb21h aW5zLlBhZ2Uuc2V0U2hvd1BhaW50UmVjdHMgJiYgV0kuc2V0dGluZ3Muc2hvd1BhaW50UmVjdHMu dmFsdWU7CisgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS52 aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHku TG93OwogCiAgICAgICAgIFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00uYWRkRXZlbnRMaXN0ZW5l cihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dTaGFkb3dET01TZXR0aW5nQ2hh bmdlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3Nob3dzU2hhZG93RE9NQnV0dG9uTmF2aWdhdGlv bkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvd3Mtc2hhZG93 LURPTSIsIFdJLlVJU3RyaW5nKCJTaG93IHNoYWRvdyBET00gbm9kZXMiKSwgV0kuVUlTdHJpbmco IkhpZGUgc2hhZG93IERPTSBub2RlcyIpLCAiSW1hZ2VzL1NoYWRvd0RPTS5zdmciLCAxMywgMTMp OwpAQCAtNTMsMjEgKzUwLDE5IEBAIFdJLkRPTVRyZWVDb250ZW50VmlldyA9IGNsYXNzIERPTVRy ZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX3Nob3dz U2hhZG93RE9NQnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2 aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fc2hvd1No YWRvd0RPTVNldHRpbmdDaGFuZ2VkKCk7CiAKLSAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQu ZG9tYWlucy5QYWdlKSB7Ci0gICAgICAgICAgICB0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0b25O YXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJwcmlu dC1zdHlsZXMiLCBXSS5VSVN0cmluZygiRm9yY2UgUHJpbnQgTWVkaWEgU3R5bGVzIiksIFdJLlVJ U3RyaW5nKCJVc2UgRGVmYXVsdCBNZWRpYSBTdHlsZXMiKSwgIkltYWdlcy9QcmludGVyLnN2ZyIs IDE2LCAxNik7Ci0gICAgICAgICAgICB0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0 aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNs aWNrZWQsIHRoaXMuX3RvZ2dsZVByaW50U3R5bGVzLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMu X3Nob3dQcmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9 IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7Ci0gICAgICAgICAgICB0 aGlzLl9zaG93UHJpbnRTdHlsZXNDaGFuZ2VkKCk7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5f c2hvd1ByaW50U3R5bGVzQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0 b25OYXZpZ2F0aW9uSXRlbSgicHJpbnQtc3R5bGVzIiwgV0kuVUlTdHJpbmcoIkZvcmNlIHByaW50 IG1lZGlhIHN0eWxlcyIpLCBXSS5VSVN0cmluZygiVXNlIGRlZmF1bHQgbWVkaWEgc3R5bGVzIiks ICJJbWFnZXMvUHJpbnRlci5zdmciLCAxNiwgMTYpOworICAgICAgICB0aGlzLl9zaG93UHJpbnRT dHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmln YXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZVByaW50U3R5bGVzLCB0aGlzKTsK KyAgICAgICAgdGhpcy5fc2hvd1ByaW50U3R5bGVzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxl ZCA9ICEhSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLlBhZ2U7CisgICAgICAgIHRoaXMuX3Nob3dQ cmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5h dmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CisgICAgICAgIHRoaXMuX3Nob3dQ cmludFN0eWxlc0NoYW5nZWQoKTsKIAotICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTEu MykKLSAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlICYmIEluc3BlY3Rv ckJhY2tlbmQuZG9tYWlucy5QYWdlLnNldFNob3dSdWxlcnMpIHsKLSAgICAgICAgICAgIFdJLnNl dHRpbmdzLnNob3dSdWxlcnMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIHRoaXMuX3Nob3dSdWxlcnNDaGFuZ2VkLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX3No b3dSdWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmln YXRpb25JdGVtKCJzaG93LXJ1bGVycyIsIFdJLlVJU3RyaW5nKCJTaG93IFJ1bGVycyIpLCBXSS5V SVN0cmluZygiSGlkZSBSdWxlcnMiKSwgIkltYWdlcy9SdWxlcnMuc3ZnIiwgMTYsIDE2KTsKLSAg ICAgICAgICAgIHRoaXMuX3Nob3dSdWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExp c3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2ds ZVNob3dSdWxlcnMsIHRoaXMpOwotICAgICAgICAgICAgdGhpcy5fc2hvd1J1bGVyc0J1dHRvbk5h dmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2li aWxpdHlQcmlvcml0eS5Mb3c7Ci0gICAgICAgICAgICB0aGlzLl9zaG93UnVsZXJzQ2hhbmdlZCgp OwotICAgICAgICB9CisgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMikKKyAgICAgICAg V0kuc2V0dGluZ3Muc2hvd1J1bGVycy5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQu Q2hhbmdlZCwgdGhpcy5fc2hvd1J1bGVyc0NoYW5nZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9z aG93UnVsZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZp Z2F0aW9uSXRlbSgic2hvdy1ydWxlcnMiLCBXSS5VSVN0cmluZygiU2hvdyBydWxlcnMiKSwgV0ku VUlTdHJpbmcoIkhpZGUgcnVsZXJzIiksICJJbWFnZXMvUnVsZXJzLnN2ZyIsIDE2LCAxNik7Cisg ICAgICAgIHRoaXMuX3Nob3dSdWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3Rl bmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZVNo b3dSdWxlcnMsIHRoaXMpOworICAgICAgICB0aGlzLl9zaG93UnVsZXJzQnV0dG9uTmF2aWdhdGlv bkl0ZW0uZW5hYmxlZCA9IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlICYmICEhSW5zcGVj dG9yQmFja2VuZC5kb21haW5zLlBhZ2Uuc2V0U2hvd1J1bGVyczsKKyAgICAgICAgdGhpcy5fc2hv d1J1bGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmln YXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CisgICAgICAgIHRoaXMuX3Nob3dSdWxl cnNDaGFuZ2VkKCk7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImRvbS10 cmVlIik7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX21vdXNlV2FzQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CkBAIC05NSw4ICs5MCw3IEBA IFdJLkRPTVRyZWVDb250ZW50VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRHdXR0ZXJFbmFibGVkID0g ZmFsc2U7CiAgICAgICAgIHRoaXMuX3BlbmRpbmdCcmVha3BvaW50Tm9kZUlkZW50aWZpZXJzID0g bmV3IFNldDsKIAotICAgICAgICBpZiAoV0kuY3NzTWFuYWdlci5jYW5Gb3JjZUFwcGVhcmFuY2Uo KSkKLSAgICAgICAgICAgIHRoaXMuX2RlZmF1bHRBcHBlYXJhbmNlRGlkQ2hhbmdlKCk7CisgICAg ICAgIHRoaXMuX2RlZmF1bHRBcHBlYXJhbmNlRGlkQ2hhbmdlKCk7CiAKICAgICAgICAgaWYgKFdJ LmRvbURlYnVnZ2VyTWFuYWdlci5zdXBwb3J0ZWQpIHsKICAgICAgICAgICAgIFdJLmRlYnVnZ2Vy TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5CcmVha3Bv aW50c0VuYWJsZWREaWRDaGFuZ2UsIHRoaXMuX2JyZWFrcG9pbnRzRW5hYmxlZERpZENoYW5nZSwg dGhpcyk7CkBAIC0xMTUsMjYgKzEwOSwxNCBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFz cyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgZ2V0IG5h dmlnYXRpb25JdGVtcygpCiAgICAgewotICAgICAgICBsZXQgaXRlbXMgPSBbXTsKLQotICAgICAg ICBpZiAodGhpcy5fc2hvd1ByaW50U3R5bGVzQnV0dG9uTmF2aWdhdGlvbkl0ZW0pCi0gICAgICAg ICAgICBpdGVtcy5wdXNoKHRoaXMuX3Nob3dQcmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVt KTsKLQotICAgICAgICBpdGVtcy5wdXNoKHRoaXMuX3Nob3dzU2hhZG93RE9NQnV0dG9uTmF2aWdh dGlvbkl0ZW0pOwotCi0gICAgICAgIGlmICh0aGlzLl9mb3JjZUFwcGVhcmFuY2VCdXR0b25OYXZp Z2F0aW9uSXRlbSkKLSAgICAgICAgICAgIGl0ZW1zLnB1c2godGhpcy5fZm9yY2VBcHBlYXJhbmNl QnV0dG9uTmF2aWdhdGlvbkl0ZW0pOwotCi0gICAgICAgIGlmICh0aGlzLl9zaG93UnVsZXJzQnV0 dG9uTmF2aWdhdGlvbkl0ZW0pCi0gICAgICAgICAgIGl0ZW1zLnVuc2hpZnQodGhpcy5fc2hvd1J1 bGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtKTsKLQotICAgICAgICBpZiAodGhpcy5fY29tcG9zaXRp bmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0pCi0gICAgICAgICAgICBpdGVtcy5wdXNoKHRo aXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtKTsKLQotICAgICAgICBp ZiAodGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtKQotICAgICAgICAgICAg aXRlbXMucHVzaCh0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0pOwotCi0g ICAgICAgIHJldHVybiBpdGVtczsKKyAgICAgICAgcmV0dXJuIFsKKyAgICAgICAgICAgIHRoaXMu X3Nob3dSdWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSwKKyAgICAgICAgICAgIHRoaXMuX3Nob3dQ cmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtLAorICAgICAgICAgICAgdGhpcy5fZm9yY2VB cHBlYXJhbmNlQnV0dG9uTmF2aWdhdGlvbkl0ZW0sCisgICAgICAgICAgICB0aGlzLl9jb21wb3Np dGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSwKKyAgICAgICAgICAgIHRoaXMuX3BhaW50 Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbSwKKyAgICAgICAgICAgIHRoaXMuX3Nob3dzU2hh ZG93RE9NQnV0dG9uTmF2aWdhdGlvbkl0ZW0sCisgICAgICAgIF07CiAgICAgfQogCiAgICAgZ2V0 IGRvbVRyZWVPdXRsaW5lKCkKQEAgLTY2OCwyMyArNjUwLDE3IEBAIFdJLkRPTVRyZWVDb250ZW50 VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAK ICAgICBfZGVmYXVsdEFwcGVhcmFuY2VEaWRDaGFuZ2UoKQogICAgIHsKLSAgICAgICAgbGV0IGRl ZmF1bHRBcHBlYXJhbmNlID0gV0kuY3NzTWFuYWdlci5kZWZhdWx0QXBwZWFyYW5jZTsKLSAgICAg ICAgaWYgKCFkZWZhdWx0QXBwZWFyYW5jZSkgewotICAgICAgICAgICAgdGhpcy5fbGFzdEtub3du RGVmYXVsdEFwcGVhcmFuY2UgPSBudWxsOwotICAgICAgICAgICAgdGhpcy5fZm9yY2VBcHBlYXJh bmNlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBudWxsOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXcuRXZlbnQuTmF2aWdhdGlvbkl0ZW1zRGlk Q2hhbmdlKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIERv bid0IHVwZGF0ZSB0aGUgbmF2aWdhdGlvbiBpdGVtIGlmIHRoZXJlIGlzIGN1cnJlbnRseSBhIGZv cmNlZCBhcHBlYXJhbmNlLgogICAgICAgICAvLyBUaGUgdXNlciB3aWxsIG5lZWQgdG8gdG9nZ2xl IGl0IG9mZiB0byB1cGRhdGUgaXQgYmFzZWQgb24gdGhlIG5ldyBkZWZhdWx0IGFwcGVhcmFuY2Uu Ci0gICAgICAgIGlmIChXSS5jc3NNYW5hZ2VyLmZvcmNlZEFwcGVhcmFuY2UgJiYgdGhpcy5fZm9y Y2VBcHBlYXJhbmNlQnV0dG9uTmF2aWdhdGlvbkl0ZW0pCisgICAgICAgIGlmIChXSS5jc3NNYW5h Z2VyLmZvcmNlZEFwcGVhcmFuY2UpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhp cy5fZm9yY2VBcHBlYXJhbmNlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBudWxsOwogCisgICAgICAg IGxldCBkZWZhdWx0QXBwZWFyYW5jZSA9IFdJLmNzc01hbmFnZXIuZGVmYXVsdEFwcGVhcmFuY2U7 CiAgICAgICAgIHN3aXRjaCAoZGVmYXVsdEFwcGVhcmFuY2UpIHsKICAgICAgICAgY2FzZSBXSS5D U1NNYW5hZ2VyLkFwcGVhcmFuY2UuTGlnaHQ6CisgICAgICAgIGNhc2UgbnVsbDogLy8gaWYgdGhl cmUgaXMgbm8gZGVmYXVsdCBhcHBlYXJhbmNlLCB0aGUgbmF2aWdhdGlvbiBpdGVtIHdpbGwgYmUg ZGlzYWJsZWQKICAgICAgICAgICAgIHRoaXMuX2ZvcmNlQXBwZWFyYW5jZUJ1dHRvbk5hdmlnYXRp b25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImFwcGVhcmFuY2Ui LCBXSS5VSVN0cmluZygiRm9yY2UgRGFyayBBcHBlYXJhbmNlIiksIFdJLlVJU3RyaW5nKCJVc2Ug RGVmYXVsdCBBcHBlYXJhbmNlIiksICJJbWFnZXMvQXBwZWFyYW5jZS5zdmciLCAxNiwgMTYpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgV0kuQ1NTTWFuYWdlci5BcHBlYXJhbmNl LkRhcms6CkBAIC02OTIsMTYgKzY2OCwxMSBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFz cyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXRoaXMuX2ZvcmNlQXBwZWFyYW5jZUJ1 dHRvbk5hdmlnYXRpb25JdGVtKSB7Ci0gICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3du IGRlZmF1bHQgYXBwZWFyYW5jZSBuYW1lOiIsIGRlZmF1bHRBcHBlYXJhbmNlKTsKLSAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkNvbnRlbnRWaWV3LkV2ZW50Lk5h dmlnYXRpb25JdGVtc0RpZENoYW5nZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K LQogICAgICAgICB0aGlzLl9sYXN0S25vd25EZWZhdWx0QXBwZWFyYW5jZSA9IGRlZmF1bHRBcHBl YXJhbmNlOwogCiAgICAgICAgIHRoaXMuX2ZvcmNlQXBwZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25J dGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tl ZCwgdGhpcy5fdG9nZ2xlQXBwZWFyYW5jZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2ZvcmNlQXBw ZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmln YXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CisgICAgICAgIHRoaXMuX2ZvcmNlQXBw ZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSBXSS5jc3NNYW5hZ2VyLmNhbkZv cmNlQXBwZWFyYW5jZSgpOwogICAgICAgICB0aGlzLl9mb3JjZUFwcGVhcmFuY2VCdXR0b25OYXZp Z2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSAhIVdJLmNzc01hbmFnZXIuZm9yY2VkQXBwZWFyYW5jZTsK IAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlldy5F dmVudC5OYXZpZ2F0aW9uSXRlbXNEaWRDaGFuZ2UpOwpAQCAtNzA5LDYgKzY4MCw4IEBAIFdJLkRP TVRyZWVDb250ZW50VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWV3CiAKICAgICBfdG9nZ2xlQXBwZWFyYW5jZShldmVudCkKICAgICB7CisgICAgICAg IGNvbnNvbGUuYXNzZXJ0KFdJLmNzc01hbmFnZXIuY2FuRm9yY2VBcHBlYXJhbmNlKCkpOworCiAg ICAgICAgIC8vIFVzZSB0aGUgbGFzdCBrbm93biBkZWZhdWx0IGFwcGVhcmFuY2UsIHNpbmNlIHRo YXQgaXMgdGhlIGFwcGVhcmFuY2UgdGhpcyBuYXZpZ2F0aW9uIGl0ZW0gd2FzIGdlbmVyYXRlZCBm b3IuCiAgICAgICAgIGxldCBhcHBlYXJhbmNlVG9Gb3JjZSA9IG51bGw7CiAgICAgICAgIHN3aXRj aCAodGhpcy5fbGFzdEtub3duRGVmYXVsdEFwcGVhcmFuY2UpIHsK 374037 2019-07-12 14:46:04 -0700 2019-07-12 16:09:58 -0700 Patch bug-199594-20190712144603.patch text/plain 16741 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZhNjkyZGM1ZTljOTYzMDA5OTlhOWZlNWE5OTlj MGZlMTc0ZWQzM2QuLjQ1ZjhiMmYxNTE0YjVlYjhjY2M4MmEwYjRjYzNjZjRhOWYwY2JjNWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA3LTEyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogYWx3YXlzIHNob3cgYWxsIG5hdmlnYXRpb24gYmFyIGl0ZW1zLCBidXQgZGlzYWJs ZSB0aG9zZSB0aGF0IHdvdWxkbid0IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5OTU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2ly c2xpbmcuCisKKyAgICAgICAgUmVvcmRlciB0aGUgbmF2aWdhdGlvbiBpdGVtcyBvZiB0aGUgRWxl bWVudHMgdGFiIChsZWZ0IHRvIHJpZ2h0KToKKyAgICAgICAgIC0gU2hvdyBydWxlcnMKKyAgICAg ICAgIC0gRm9yY2UgcHJpbnQgbWVkaWEgc3R5bGVzCisgICAgICAgICAtIEZvcmNlIERhcmsgQXBw ZWFyYW5jZSAvIEZvcmNlIExpZ2h0IEFwcGVhcmFuY2UKKyAgICAgICAgIC0gU2hvdyBjb21wb3Np dGluZyBib3JkZXJzCisgICAgICAgICAtIEVuYWJsZSBwYWludCBmbGFzaGluZworICAgICAgICAg LSBTaG93IHNoYWRvdyBET00gbm9kZXMKKyAgICAgICAgVGhpcyB3YXksICJyZWxhdGVkIiAoZS5n LiBwcmludCBzdHlsZXMgYW5kIGRhcmsvbGlnaHQgYXBwZWFyYW5jZSBib3RoIHJlbGF0ZSB0byBD U1MgbWVkaWEpCisgICAgICAgIHRvZ2dsZXMgYXJlIGdyb3VwZWQgY2xvc2VyIHRvZ2V0aGVyLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5ET01UcmVlQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuRE9NVHJlZUNvbnRl bnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdJLkRPTVRy ZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX2RlZmF1bHRBcHBlYXJhbmNlRGlkQ2hhbmdlKToKKyAg ICAgICAgKFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX3RvZ2dsZUFwcGVhcmFuY2Up OgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz OgorCiAyMDE5LTA3LTExICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBMYXllcnM6IFVuY2F1Z2h0IEV4Y2VwdGlvbjogUmVxdWVzdCB3 aXRoIGlkID0gMiBmYWlsZWQuIHsiY29kZSI6LTMyNjAxLCJtZXNzYWdlIjoiJ1BhZ2UnIGRvbWFp biB3YXMgbm90IGZvdW5kIiwiZGF0YSI6W3siY29kZSI6LTMyNjAxLCJtZXNzYWdlIjoiJ1BhZ2Un IGRvbWFpbiB3YXMgbm90IGZvdW5kIn1dfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK aW5kZXggMjBmYjc2YWNiYzczNWE0YTNhNjcwOWUxNjJiNzlkMjc5NTFhNzUzMy4uMmUzNTBkOWU2 YjlhMjQ3M2U0NzE5ZTkwM2YwZGFlZGYzNGNiYzEyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC00OTQsNyArNDk0LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siRm9udCJdID0g IkZvbnQiOwogbG9jYWxpemVkU3RyaW5nc1siRm9udHMiXSA9ICJGb250cyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJGb3JjZSBEYXJrIEFwcGVhcmFuY2UiXSA9ICJGb3JjZSBEYXJrIEFwcGVhcmFuY2Ui OwogbG9jYWxpemVkU3RyaW5nc1siRm9yY2UgTGlnaHQgQXBwZWFyYW5jZSJdID0gIkZvcmNlIExp Z2h0IEFwcGVhcmFuY2UiOwotbG9jYWxpemVkU3RyaW5nc1siRm9yY2UgUHJpbnQgTWVkaWEgU3R5 bGVzIl0gPSAiRm9yY2UgUHJpbnQgTWVkaWEgU3R5bGVzIjsKK2xvY2FsaXplZFN0cmluZ3NbIkZv cmNlIHByaW50IG1lZGlhIHN0eWxlcyJdID0gIkZvcmNlIHByaW50IG1lZGlhIHN0eWxlcyI7CiAv KiBMYXlvdXQgcGhhc2UgcmVjb3JkcyB0aGF0IHdlcmUgaW1wZXJhdGl2ZSAoZm9yY2VkKSAqLwog bG9jYWxpemVkU3RyaW5nc1siRm9yY2VkIExheW91dCJdID0gIkZvcmNlZCBMYXlvdXQiOwogLyog QSBjb250ZXh0IG1lbnUgaXRlbSB0byBmb3JjZSAob3ZlcnJpZGUpIGEgRE9NIG5vZGUncyBwc2V1 ZG8tY2xhc3NlcyAqLwpAQCAtNTU0LDggKzU1NCw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUg Q29uc29sZSAoJXMpIl0gPSAiSGlkZSBDb25zb2xlICglcykiOwogbG9jYWxpemVkU3RyaW5nc1si SGlkZSBFbGVtZW50cyJdID0gIkhpZGUgRWxlbWVudHMiOwogbG9jYWxpemVkU3RyaW5nc1siSGlk ZSBHcmlkIl0gPSAiSGlkZSBHcmlkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgUGF0aCJdID0g IkhpZGUgUGF0aCI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIFJ1bGVycyJdID0gIkhpZGUgUnVs ZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgY29tcG9zaXRpbmcgYm9yZGVycyJdID0gIkhp ZGUgY29tcG9zaXRpbmcgYm9yZGVycyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHJ1bGVycyJd ID0gIkhpZGUgcnVsZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgc2hhZG93IERPTSBub2Rl cyJdID0gIkhpZGUgc2hhZG93IERPTSBub2RlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHRo ZSBkZXRhaWxzIHNpZGViYXIgKCVzKSJdID0gIkhpZGUgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMp IjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0g PSAiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiOwpAQCAtOTc1LDcgKzk3NSw2IEBA IGxvY2FsaXplZFN0cmluZ3NbIlNob3cgR3JpZCJdID0gIlNob3cgR3JpZCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IEp1bXAgdG8gRWZmZWN0aXZlIFByb3BlcnR5IEJ1dHRvbiJdID0gIlNob3cg SnVtcCB0byBFZmZlY3RpdmUgUHJvcGVydHkgQnV0dG9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgUGF0aCJdID0gIlNob3cgUGF0aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFJlbWFpbmlu ZyAoJWQpIl0gPSAiU2hvdyBSZW1haW5pbmcgKCVkKSI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93 IFJ1bGVycyJdID0gIlNob3cgUnVsZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgU2NvcGUg Q2hhaW4gb24gcGF1c2UiXSA9ICJTaG93IFNjb3BlIENoYWluIG9uIHBhdXNlIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlNob3cgYWxsIGFjdGlvbnMiXSA9ICJTaG93IGFsbCBhY3Rpb25zIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlNob3cgYWxsIHJlc291cmNlcyJdID0gIlNob3cgYWxsIHJlc291cmNlcyI7 CkBAIC05ODksNiArOTg4LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siU2hvdyBvbmx5IGZvciBzZWxl Y3RlZCBub2RlIl0gPSAiU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBub2RlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlNob3cgcGFnZSBsb2FkIHRpbWluZyJdID0gIlNob3cgcGFnZSBsb2FkIHRpbWluZyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHBhZ2UgcmVzb3VyY2VzIl0gPSAiU2hvdyBwYWdlIHJl c291cmNlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHBhZ2UgcnVsZXJzIGFuZCBub2RlIGJv cmRlciBsaW5lcyJdID0gIlNob3cgcGFnZSBydWxlcnMgYW5kIG5vZGUgYm9yZGVyIGxpbmVzIjsK K2xvY2FsaXplZFN0cmluZ3NbIlNob3cgcnVsZXJzIl0gPSAiU2hvdyBydWxlcnMiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyBzaGFkb3cgRE9NIG5vZGVzIl0gPSAiU2hvdyBzaGFkb3cgRE9NIG5v ZGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIl0g PSAiU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siU2hv dyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiXSA9ICJTaG93IHRoZSBuYXZpZ2F0aW9uIHNp ZGViYXIgKCVzKSI7CkBAIC0xMTczLDggKzExNzMsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJVbnN1 cHBvcnRlZCBwcm9wZXJ0eSB2YWx1ZSJdID0gIlVuc3VwcG9ydGVkIHByb3BlcnR5IHZhbHVlIjsK IGxvY2FsaXplZFN0cmluZ3NbIlVudGl0bGVkIl0gPSAiVW50aXRsZWQiOwogbG9jYWxpemVkU3Ry aW5nc1siVXNhZ2U6ICVzIl0gPSAiVXNhZ2U6ICVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlVzZSBE ZWZhdWx0IEFwcGVhcmFuY2UiXSA9ICJVc2UgRGVmYXVsdCBBcHBlYXJhbmNlIjsKLWxvY2FsaXpl ZFN0cmluZ3NbIlVzZSBEZWZhdWx0IE1lZGlhIFN0eWxlcyJdID0gIlVzZSBEZWZhdWx0IE1lZGlh IFN0eWxlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJVc2UgTW9jayBDYXB0dXJlIERldmljZXMiXSA9 ICJVc2UgTW9jayBDYXB0dXJlIERldmljZXMiOworbG9jYWxpemVkU3RyaW5nc1siVXNlIGRlZmF1 bHQgbWVkaWEgc3R5bGVzIl0gPSAiVXNlIGRlZmF1bHQgbWVkaWEgc3R5bGVzIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlVzZSB0aGUgcmVzb3VyY2UgY2FjaGUgd2hlbiBsb2FkaW5nIHJlc291cmNlcyJd ID0gIlVzZSB0aGUgcmVzb3VyY2UgY2FjaGUgd2hlbiBsb2FkaW5nIHJlc291cmNlcyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJVc2VyIEFnZW50Il0gPSAiVXNlciBBZ2VudCI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJVc2VyIEFnZW50IFN0eWxlc2hlZXQiXSA9ICJVc2VyIEFnZW50IFN0eWxlc2hlZXQiOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDE5MTZkNzRhMjhhYzA0OTNiOGVkMWY2 N2UzYzBiZmM5ZmU3MWFjMTUuLmM1ZmYwMzc1NzI4NWYwYmY5OTA0MjNjZTVjMmM4ZjYzZmY5NDQx NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMKQEAgLTMxLDIxICszMSwxOCBAQCBX SS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db250ZW50VmlldwogCiAgICAgICAgIHN1cGVyKHJlcHJlc2VudGVkT2JqZWN0KTsKIAotICAg ICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLlBhZ2UpIHsKLSAgICAgICAgICAgIHRo aXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2 YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImxheWVyLWJvcmRlcnMiLCBXSS5VSVN0cmluZygiU2hv dyBjb21wb3NpdGluZyBib3JkZXJzIiksIFdJLlVJU3RyaW5nKCJIaWRlIGNvbXBvc2l0aW5nIGJv cmRlcnMiKSwgIkltYWdlcy9MYXllckJvcmRlcnMuc3ZnIiwgMTMsIDEzKTsKLSAgICAgICAgICAg IHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fdG9nZ2xl Q29tcG9zaXRpbmdCb3JkZXJzLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5n Qm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSAhIUluc3BlY3RvckJhY2tlbmQu ZG9tYWlucy5QYWdlLmdldENvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGU7Ci0gICAgICAgICAgICB0 aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJp b3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwotICAgICAg ICB9CisgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVt ID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImxheWVyLWJvcmRlcnMiLCBX SS5VSVN0cmluZygiU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIiksIFdJLlVJU3RyaW5nKCJIaWRl IGNvbXBvc2l0aW5nIGJvcmRlcnMiKSwgIkltYWdlcy9MYXllckJvcmRlcnMuc3ZnIiwgMTMsIDEz KTsKKyAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0u YWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLl90b2dnbGVDb21wb3NpdGluZ0JvcmRlcnMsIHRoaXMpOworICAgICAgICB0aGlzLl9jb21w b3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gISFJbnNwZWN0b3JC YWNrZW5kLmRvbWFpbnMuUGFnZTsKKyAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0 dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0u VmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKIAotICAgICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5k b21haW5zLlBhZ2UpIHsKLSAgICAgICAgICAgIFdJLnNldHRpbmdzLnNob3dQYWludFJlY3RzLmFk ZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9zaG93UGFpbnRS ZWN0c1NldHRpbmdDaGFuZ2VkLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hp bmdCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25J dGVtKCJwYWludC1mbGFzaGluZyIsIFdJLlVJU3RyaW5nKCJFbmFibGUgcGFpbnQgZmxhc2hpbmci KSwgV0kuVUlTdHJpbmcoIkRpc2FibGUgcGFpbnQgZmxhc2hpbmciKSwgIkltYWdlcy9QYWludC5z dmciLCAxNiwgMTYpOwotICAgICAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmln YXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQu Q2xpY2tlZCwgdGhpcy5fdG9nZ2xlUGFpbnRGbGFzaGluZywgdGhpcyk7Ci0gICAgICAgICAgICB0 aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9ICEhSW5zcGVj dG9yQmFja2VuZC5kb21haW5zLlBhZ2Uuc2V0U2hvd1BhaW50UmVjdHM7Ci0gICAgICAgICAgICB0 aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gSW5zcGVj dG9yQmFja2VuZC5kb21haW5zLlBhZ2Uuc2V0U2hvd1BhaW50UmVjdHMgJiYgV0kuc2V0dGluZ3Mu c2hvd1BhaW50UmVjdHMudmFsdWU7Ci0gICAgICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0 dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0u VmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKLSAgICAgICAgfQorICAgICAgICAvLyBDT01QQVRJQklM SVRZIChpT1MgOSkKKyAgICAgICAgV0kuc2V0dGluZ3Muc2hvd1BhaW50UmVjdHMuYWRkRXZlbnRM aXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dQYWludFJlY3RzU2V0 dGluZ0NoYW5nZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2 aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgicGFpbnQt Zmxhc2hpbmciLCBXSS5VSVN0cmluZygiRW5hYmxlIHBhaW50IGZsYXNoaW5nIiksIFdJLlVJU3Ry aW5nKCJEaXNhYmxlIHBhaW50IGZsYXNoaW5nIiksICJJbWFnZXMvUGFpbnQuc3ZnIiwgMTYsIDE2 KTsKKyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2 ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5f dG9nZ2xlUGFpbnRGbGFzaGluZywgdGhpcyk7CisgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdC dXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLlBh Z2UgJiYgISFJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuUGFnZS5zZXRTaG93UGFpbnRSZWN0czsK KyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRl ZCA9IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlICYmIEluc3BlY3RvckJhY2tlbmQuZG9t YWlucy5QYWdlLnNldFNob3dQYWludFJlY3RzICYmIFdJLnNldHRpbmdzLnNob3dQYWludFJlY3Rz LnZhbHVlOworICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0u dmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5 LkxvdzsKIAogICAgICAgICBXSS5zZXR0aW5ncy5zaG93U2hhZG93RE9NLmFkZEV2ZW50TGlzdGVu ZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9zaG93U2hhZG93RE9NU2V0dGluZ0No YW5nZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9zaG93c1NoYWRvd0RPTUJ1dHRvbk5hdmlnYXRp b25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3dzLXNoYWRv dy1ET00iLCBXSS5VSVN0cmluZygiU2hvdyBzaGFkb3cgRE9NIG5vZGVzIiksIFdJLlVJU3RyaW5n KCJIaWRlIHNoYWRvdyBET00gbm9kZXMiKSwgIkltYWdlcy9TaGFkb3dET00uc3ZnIiwgMTMsIDEz KTsKQEAgLTUzLDIxICs1MCwxOSBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01U cmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9zaG93 c1NoYWRvd0RPTUJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5h dmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX3Nob3dT aGFkb3dET01TZXR0aW5nQ2hhbmdlZCgpOwogCi0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5k LmRvbWFpbnMuUGFnZSkgewotICAgICAgICAgICAgdGhpcy5fc2hvd1ByaW50U3R5bGVzQnV0dG9u TmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgicHJp bnQtc3R5bGVzIiwgV0kuVUlTdHJpbmcoIkZvcmNlIFByaW50IE1lZGlhIFN0eWxlcyIpLCBXSS5V SVN0cmluZygiVXNlIERlZmF1bHQgTWVkaWEgU3R5bGVzIiksICJJbWFnZXMvUHJpbnRlci5zdmci LCAxNiwgMTYpOwotICAgICAgICAgICAgdGhpcy5fc2hvd1ByaW50U3R5bGVzQnV0dG9uTmF2aWdh dGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5D bGlja2VkLCB0aGlzLl90b2dnbGVQcmludFN0eWxlcywgdGhpcyk7Ci0gICAgICAgICAgICB0aGlz Ll9zaG93UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkg PSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwotICAgICAgICAgICAg dGhpcy5fc2hvd1ByaW50U3R5bGVzQ2hhbmdlZCgpOwotICAgICAgICB9CisgICAgICAgIHRoaXMu X3Nob3dQcmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0 dG9uTmF2aWdhdGlvbkl0ZW0oInByaW50LXN0eWxlcyIsIFdJLlVJU3RyaW5nKCJGb3JjZSBwcmlu dCBtZWRpYSBzdHlsZXMiKSwgV0kuVUlTdHJpbmcoIlVzZSBkZWZhdWx0IG1lZGlhIHN0eWxlcyIp LCAiSW1hZ2VzL1ByaW50ZXIuc3ZnIiwgMTYsIDE2KTsKKyAgICAgICAgdGhpcy5fc2hvd1ByaW50 U3R5bGVzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZp Z2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dnbGVQcmludFN0eWxlcywgdGhpcyk7 CisgICAgICAgIHRoaXMuX3Nob3dQcmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJs ZWQgPSAhIUluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5QYWdlOworICAgICAgICB0aGlzLl9zaG93 UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5O YXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworICAgICAgICB0aGlzLl9zaG93 UHJpbnRTdHlsZXNDaGFuZ2VkKCk7CiAKLSAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDEx LjMpCi0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuUGFnZSAmJiBJbnNwZWN0 b3JCYWNrZW5kLmRvbWFpbnMuUGFnZS5zZXRTaG93UnVsZXJzKSB7Ci0gICAgICAgICAgICBXSS5z ZXR0aW5ncy5zaG93UnVsZXJzLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFu Z2VkLCB0aGlzLl9zaG93UnVsZXJzQ2hhbmdlZCwgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9z aG93UnVsZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZp Z2F0aW9uSXRlbSgic2hvdy1ydWxlcnMiLCBXSS5VSVN0cmluZygiU2hvdyBSdWxlcnMiKSwgV0ku VUlTdHJpbmcoIkhpZGUgUnVsZXJzIiksICJJbWFnZXMvUnVsZXJzLnN2ZyIsIDE2LCAxNik7Ci0g ICAgICAgICAgICB0aGlzLl9zaG93UnVsZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRM aXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dn bGVTaG93UnVsZXJzLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX3Nob3dSdWxlcnNCdXR0b25O YXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNp YmlsaXR5UHJpb3JpdHkuTG93OwotICAgICAgICAgICAgdGhpcy5fc2hvd1J1bGVyc0NoYW5nZWQo KTsKLSAgICAgICAgfQorICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTIpCisgICAgICAg IFdJLnNldHRpbmdzLnNob3dSdWxlcnMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50 LkNoYW5nZWQsIHRoaXMuX3Nob3dSdWxlcnNDaGFuZ2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5f c2hvd1J1bGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2 aWdhdGlvbkl0ZW0oInNob3ctcnVsZXJzIiwgV0kuVUlTdHJpbmcoIlNob3cgcnVsZXJzIiksIFdJ LlVJU3RyaW5nKCJIaWRlIHJ1bGVycyIpLCAiSW1hZ2VzL1J1bGVycy5zdmciLCAxNiwgMTYpOwor ICAgICAgICB0aGlzLl9zaG93UnVsZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0 ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dnbGVT aG93UnVsZXJzLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fc2hvd1J1bGVyc0J1dHRvbk5hdmlnYXRp b25JdGVtLmVuYWJsZWQgPSBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuUGFnZSAmJiAhIUluc3Bl Y3RvckJhY2tlbmQuZG9tYWlucy5QYWdlLnNldFNob3dSdWxlcnM7CisgICAgICAgIHRoaXMuX3No b3dSdWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZp Z2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworICAgICAgICB0aGlzLl9zaG93UnVs ZXJzQ2hhbmdlZCgpOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJkb20t dHJlZSIpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9tb3VzZVdhc0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwpAQCAtOTUsOCArOTAsNyBA QCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9icmVha3BvaW50R3V0dGVyRW5hYmxlZCA9 IGZhbHNlOwogICAgICAgICB0aGlzLl9wZW5kaW5nQnJlYWtwb2ludE5vZGVJZGVudGlmaWVycyA9 IG5ldyBTZXQ7CiAKLSAgICAgICAgaWYgKFdJLmNzc01hbmFnZXIuY2FuRm9yY2VBcHBlYXJhbmNl KCkpCi0gICAgICAgICAgICB0aGlzLl9kZWZhdWx0QXBwZWFyYW5jZURpZENoYW5nZSgpOworICAg ICAgICB0aGlzLl9kZWZhdWx0QXBwZWFyYW5jZURpZENoYW5nZSgpOwogCiAgICAgICAgIGlmIChX SS5kb21EZWJ1Z2dlck1hbmFnZXIuc3VwcG9ydGVkKSB7CiAgICAgICAgICAgICBXSS5kZWJ1Z2dl ck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtw b2ludHNFbmFibGVkRGlkQ2hhbmdlLCB0aGlzLl9icmVha3BvaW50c0VuYWJsZWREaWRDaGFuZ2Us IHRoaXMpOwpAQCAtMTE1LDI2ICsxMDksMTQgQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0gY2xh c3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgIGdldCBu YXZpZ2F0aW9uSXRlbXMoKQogICAgIHsKLSAgICAgICAgbGV0IGl0ZW1zID0gW107Ci0KLSAgICAg ICAgaWYgKHRoaXMuX3Nob3dQcmludFN0eWxlc0J1dHRvbk5hdmlnYXRpb25JdGVtKQotICAgICAg ICAgICAgaXRlbXMucHVzaCh0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRl bSk7Ci0KLSAgICAgICAgaXRlbXMucHVzaCh0aGlzLl9zaG93c1NoYWRvd0RPTUJ1dHRvbk5hdmln YXRpb25JdGVtKTsKLQotICAgICAgICBpZiAodGhpcy5fZm9yY2VBcHBlYXJhbmNlQnV0dG9uTmF2 aWdhdGlvbkl0ZW0pCi0gICAgICAgICAgICBpdGVtcy5wdXNoKHRoaXMuX2ZvcmNlQXBwZWFyYW5j ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKTsKLQotICAgICAgICBpZiAodGhpcy5fc2hvd1J1bGVyc0J1 dHRvbk5hdmlnYXRpb25JdGVtKQotICAgICAgICAgICBpdGVtcy51bnNoaWZ0KHRoaXMuX3Nob3dS dWxlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSk7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2NvbXBvc2l0 aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtKQotICAgICAgICAgICAgaXRlbXMucHVzaCh0 aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbSk7Ci0KLSAgICAgICAg aWYgKHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbSkKLSAgICAgICAgICAg IGl0ZW1zLnB1c2godGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtKTsKLQot ICAgICAgICByZXR1cm4gaXRlbXM7CisgICAgICAgIHJldHVybiBbCisgICAgICAgICAgICB0aGlz Ll9zaG93UnVsZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sCisgICAgICAgICAgICB0aGlzLl9zaG93 UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRlbSwKKyAgICAgICAgICAgIHRoaXMuX2ZvcmNl QXBwZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtLAorICAgICAgICAgICAgdGhpcy5fY29tcG9z aXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sCisgICAgICAgICAgICB0aGlzLl9wYWlu dEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0sCisgICAgICAgICAgICB0aGlzLl9zaG93c1No YWRvd0RPTUJ1dHRvbk5hdmlnYXRpb25JdGVtLAorICAgICAgICBdOwogICAgIH0KIAogICAgIGdl dCBkb21UcmVlT3V0bGluZSgpCkBAIC02NjgsMjMgKzY1MCwxNyBAQCBXSS5ET01UcmVlQ29udGVu dFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmlldwog CiAgICAgX2RlZmF1bHRBcHBlYXJhbmNlRGlkQ2hhbmdlKCkKICAgICB7Ci0gICAgICAgIGxldCBk ZWZhdWx0QXBwZWFyYW5jZSA9IFdJLmNzc01hbmFnZXIuZGVmYXVsdEFwcGVhcmFuY2U7Ci0gICAg ICAgIGlmICghZGVmYXVsdEFwcGVhcmFuY2UpIHsKLSAgICAgICAgICAgIHRoaXMuX2xhc3RLbm93 bkRlZmF1bHRBcHBlYXJhbmNlID0gbnVsbDsKLSAgICAgICAgICAgIHRoaXMuX2ZvcmNlQXBwZWFy YW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbnVsbDsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkNvbnRlbnRWaWV3LkV2ZW50Lk5hdmlnYXRpb25JdGVtc0Rp ZENoYW5nZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAgICAgICAvLyBE b24ndCB1cGRhdGUgdGhlIG5hdmlnYXRpb24gaXRlbSBpZiB0aGVyZSBpcyBjdXJyZW50bHkgYSBm b3JjZWQgYXBwZWFyYW5jZS4KICAgICAgICAgLy8gVGhlIHVzZXIgd2lsbCBuZWVkIHRvIHRvZ2ds ZSBpdCBvZmYgdG8gdXBkYXRlIGl0IGJhc2VkIG9uIHRoZSBuZXcgZGVmYXVsdCBhcHBlYXJhbmNl LgotICAgICAgICBpZiAoV0kuY3NzTWFuYWdlci5mb3JjZWRBcHBlYXJhbmNlICYmIHRoaXMuX2Zv cmNlQXBwZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtKQorICAgICAgICBpZiAoV0kuY3NzTWFu YWdlci5mb3JjZWRBcHBlYXJhbmNlKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRo aXMuX2ZvcmNlQXBwZWFyYW5jZUJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbnVsbDsKIAorICAgICAg ICBsZXQgZGVmYXVsdEFwcGVhcmFuY2UgPSBXSS5jc3NNYW5hZ2VyLmRlZmF1bHRBcHBlYXJhbmNl OwogICAgICAgICBzd2l0Y2ggKGRlZmF1bHRBcHBlYXJhbmNlKSB7CiAgICAgICAgIGNhc2UgV0ku Q1NTTWFuYWdlci5BcHBlYXJhbmNlLkxpZ2h0OgorICAgICAgICBjYXNlIG51bGw6IC8vIGlmIHRo ZXJlIGlzIG5vIGRlZmF1bHQgYXBwZWFyYW5jZSwgdGhlIG5hdmlnYXRpb24gaXRlbSB3aWxsIGJl IGRpc2FibGVkCiAgICAgICAgICAgICB0aGlzLl9mb3JjZUFwcGVhcmFuY2VCdXR0b25OYXZpZ2F0 aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJhcHBlYXJhbmNl IiwgV0kuVUlTdHJpbmcoIkZvcmNlIERhcmsgQXBwZWFyYW5jZSIpLCBXSS5VSVN0cmluZygiVXNl IERlZmF1bHQgQXBwZWFyYW5jZSIpLCAiSW1hZ2VzL0FwcGVhcmFuY2Uuc3ZnIiwgMTYsIDE2KTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdJLkNTU01hbmFnZXIuQXBwZWFyYW5j ZS5EYXJrOgpAQCAtNjkyLDE2ICs2NjgsMTEgQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0gY2xh c3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCF0aGlzLl9mb3JjZUFwcGVhcmFuY2VC dXR0b25OYXZpZ2F0aW9uSXRlbSkgewotICAgICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93 biBkZWZhdWx0IGFwcGVhcmFuY2UgbmFtZToiLCBkZWZhdWx0QXBwZWFyYW5jZSk7Ci0gICAgICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlldy5FdmVudC5O YXZpZ2F0aW9uSXRlbXNEaWRDaGFuZ2UpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9 Ci0KICAgICAgICAgdGhpcy5fbGFzdEtub3duRGVmYXVsdEFwcGVhcmFuY2UgPSBkZWZhdWx0QXBw ZWFyYW5jZTsKIAogICAgICAgICB0aGlzLl9mb3JjZUFwcGVhcmFuY2VCdXR0b25OYXZpZ2F0aW9u SXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNr ZWQsIHRoaXMuX3RvZ2dsZUFwcGVhcmFuY2UsIHRoaXMpOwogICAgICAgICB0aGlzLl9mb3JjZUFw cGVhcmFuY2VCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZp Z2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworICAgICAgICB0aGlzLl9mb3JjZUFw cGVhcmFuY2VCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gV0kuY3NzTWFuYWdlci5jYW5G b3JjZUFwcGVhcmFuY2UoKTsKICAgICAgICAgdGhpcy5fZm9yY2VBcHBlYXJhbmNlQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gISFXSS5jc3NNYW5hZ2VyLmZvcmNlZEFwcGVhcmFuY2U7 CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXcu RXZlbnQuTmF2aWdhdGlvbkl0ZW1zRGlkQ2hhbmdlKTsKQEAgLTcwOSw2ICs2ODAsOCBAQCBXSS5E T01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50VmlldwogCiAgICAgX3RvZ2dsZUFwcGVhcmFuY2UoZXZlbnQpCiAgICAgeworICAgICAg ICBjb25zb2xlLmFzc2VydChXSS5jc3NNYW5hZ2VyLmNhbkZvcmNlQXBwZWFyYW5jZSgpKTsKKwog ICAgICAgICAvLyBVc2UgdGhlIGxhc3Qga25vd24gZGVmYXVsdCBhcHBlYXJhbmNlLCBzaW5jZSB0 aGF0IGlzIHRoZSBhcHBlYXJhbmNlIHRoaXMgbmF2aWdhdGlvbiBpdGVtIHdhcyBnZW5lcmF0ZWQg Zm9yLgogICAgICAgICBsZXQgYXBwZWFyYW5jZVRvRm9yY2UgPSBudWxsOwogICAgICAgICBzd2l0 Y2ggKHRoaXMuX2xhc3RLbm93bkRlZmF1bHRBcHBlYXJhbmNlKSB7Cg==