91087 2012-07-12 06:20:22 -0700 Web Inspector: beautify find bar looks, simplify search update routines. 2012-07-12 08:54:38 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 667703 0 pfeldman 2012-07-12 06:20:22 -0700 This change updates the looks to the one on the screenshots and simplifies match count update routines. 667704 1 151935 pfeldman 2012-07-12 06:21:04 -0700 Created attachment 151935 [IMAGE] Screenshot with patch applied. 667708 2 151937 pfeldman 2012-07-12 06:24:30 -0700 Created attachment 151937 Patch 667728 3 151937 caseq 2012-07-12 06:43:29 -0700 Comment on attachment 151937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151937&action=review > Source/WebCore/inspector/front-end/SearchController.js:41 > + labelElement.textContent = "Find"; UIString? 667731 4 151937 vsevik 2012-07-12 06:50:10 -0700 Comment on attachment 151937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151937&action=review > Source/WebCore/inspector/front-end/SearchController.js:-249 > - if (!isEnterKey(event)) Incremental search works weirdly now - it jumps to the next occurrence each time you add a letter even if current occurrence matches new query. I believe this code was needed. 667732 5 151943 pfeldman 2012-07-12 07:05:28 -0700 Created attachment 151943 Patch 667778 6 151943 vsevik 2012-07-12 08:02:12 -0700 Comment on attachment 151943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151943&action=review > Source/WebCore/inspector/front-end/SearchController.js:240 > + _performSearch: function(query, forceSearch, isBackwardSearch) Please annotate all parameters. 667832 7 pfeldman 2012-07-12 08:54:38 -0700 Committed r122465: <http://trac.webkit.org/changeset/122465> 151935 2012-07-12 06:21:04 -0700 2012-07-12 06:21:04 -0700 [IMAGE] Screenshot with patch applied. Screen shot 2012-07-12 at 5.20.37 PM.png image/png 11339 pfeldman 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 151937 2012-07-12 06:24:30 -0700 2012-07-12 07:05:20 -0700 Patch bug-91087-20120712172428.patch text/plain 17106 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUxOGY1YjNkY2U1MGVm MGI5MzM1NGU4MjE2MTNkODM1NWVmZTI1MC4uMTA3OWE5ZmRiODRkZTM0OTIwNWE4ZmNiNmRlMDRi ODQzMWFiNzk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTEyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGJlYXV0aWZ5IGZpbmQgYmFyIGxvb2tzLCBzaW1wbGlmeSBzZWFyY2ggdXBkYXRlIHJvdXRp bmVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEw ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSB1cGRhdGVzIHRoZSBsb29rcyB0byB0aGUgb25lIG9uIHRoZSBzY3JlZW5zaG90cyBh bmQgc2ltcGxpZmllcyBtYXRjaCBjb3VudCB1cGRhdGUgcm91dGluZXMuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2VhcmNoQ29udHJvbGxlci5vbk1hdGNoZXNNb3VzZURvd24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJj aENvbnRyb2xsZXIucHJvdG90eXBlLmFjdGl2ZVBhbmVsQ2hhbmdlZC5wZXJmb3JtUGFuZWxTZWFy Y2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLmFj dGl2ZVBhbmVsQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxl ci5wcm90b3R5cGUuX3VwZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0b25TdGF0ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX3VwZGF0ZVNlYXJjaE1h dGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T ZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5fb25LZXlEb3duKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5fb25JbnB1dCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX29uTmV4dEJ1dHRvblNlYXJjaCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX29uUHJl dkJ1dHRvblNlYXJjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5w cm90b3R5cGUuX3BlcmZvcm1TZWFyY2gpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzczoKKyAgICAgICAgKCNzZWFyY2gpOgorICAgICAgICAoI3NlYXJjaDpmb2N1 cyk6CisgICAgICAgICgudG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbi1jb250cm9scyk6CisgICAg ICAgICgudG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbik6CisgICAgICAgICgudG9vbGJhci1zZWFy Y2gtbmF2aWdhdGlvbi5lbmFibGVkOmhvdmVyKToKKyAgICAgICAgKC50b29sYmFyLXNlYXJjaC1u YXZpZ2F0aW9uLmVuYWJsZWQsIC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLmVuYWJsZWQ6YWN0 aXZlKToKKyAgICAgICAgKC50b29sYmFyLXNlYXJjaCk6CisgICAgICAgICgudG9vbGJhci1zZWFy Y2gtY29udHJvbCk6CisgICAgICAgICguc2VhcmNoLXJlc3VsdHMtbWF0Y2hlcyk6CisgICAgICAg ICguaW5zcGVjdG9yLWZvb3Rlcik6CisKIDIwMTItMDctMTEgIEFybmF1ZCBSZW5ldmllciAgPGEu cmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBbR3RrXSBhbGxvdyBidWlsZGlu ZyB3aXRoIGNzcy1maWx0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMKaW5kZXggMTU2NWY0ZDI1NDI5MjE3OTk4NDAw ODk5ODdiMGEzMjhkMmQxMjg4My4uMDcwNjE4NDQ4MDViZmUyODcyNDkwYjc5MWY4MDc4YWQzMzAy OGQ3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWFy Y2hDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2VhcmNoQ29udHJvbGxlci5qcwpAQCAtMzUsMjcgKzM1LDM1IEBACiBXZWJJbnNwZWN0b3IuU2Vh cmNoQ29udHJvbGxlciA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5fZWxlbWVudC50ZXh0Q29udGVudCA9 ICJTZWFyY2g6IjsKKyAgICB0aGlzLl9lbGVtZW50LmNsYXNzTmFtZSA9ICJ0b29sYmFyLXNlYXJj aCI7CiAKLSAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0 ZUNoaWxkKCJpbnB1dCIpOworICAgIHZhciBsYWJlbEVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNy ZWF0ZUNoaWxkKCJzcGFuIik7CisgICAgbGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gIkZpbmQi OworCisgICAgdGhpcy5fc2VhcmNoQ29udHJvbEVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0 ZUNoaWxkKCJkaXYiLCAidG9vbGJhci1zZWFyY2gtY29udHJvbCIpOworCisgICAgdGhpcy5fc2Vh cmNoSW5wdXRFbGVtZW50ID0gdGhpcy5fc2VhcmNoQ29udHJvbEVsZW1lbnQuY3JlYXRlQ2hpbGQo ImlucHV0Iik7CiAgICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LmlkID0gInNlYXJjaCI7Ci0g ICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LnR5cGUgPSAic2VhcmNoIjsKLSAgICB0aGlzLl9z ZWFyY2hJbnB1dEVsZW1lbnQuaW5jcmVtZW50YWwgPSB0cnVlOwotICAgIHRoaXMuX3NlYXJjaElu cHV0RWxlbWVudC5yZXN1bHRzID0gMDsKIAotICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0 RWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLXNlYXJj aC1uYXZpZ2F0aW9uIHRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tbmV4dCBoaWRkZW4iKTsKLSAg ICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uTmV4dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgdGhpcy5fb25OZXh0QnV0dG9uU2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgCi0g ICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTZWFyY2ggTmV4dCIpOworICAgIGZ1bmN0aW9uIG9uTWF0Y2hlc01vdXNlRG93 bigpCisgICAgeworICAgICAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQuZm9jdXMoKTsKKyAg ICB9CisgICAgdGhpcy5fbWF0Y2hlc0VsZW1lbnQgPSB0aGlzLl9zZWFyY2hDb250cm9sRWxlbWVu dC5jcmVhdGVDaGlsZCgic3BhbiIsICJzZWFyY2gtcmVzdWx0cy1tYXRjaGVzIik7CisgICAgdGhp cy5fbWF0Y2hlc0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgb25NYXRjaGVz TW91c2VEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRp b25QcmV2RWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFy LXNlYXJjaC1uYXZpZ2F0aW9uIHRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tcHJldiBoaWRkZW4i KTsKKyAgICB2YXIgc2VhcmNoTmF2aWdhdGlvbkVsZW1lbnQgPSB0aGlzLl9zZWFyY2hDb250cm9s RWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tY29u dHJvbHMiKTsKKyAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uUHJldkVsZW1lbnQgPSBzZWFyY2hO YXZpZ2F0aW9uRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRvb2xiYXItc2VhcmNoLW5hdmln YXRpb24gdG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbi1wcmV2Iik7CiAgICAgdGhpcy5fc2VhcmNo TmF2aWdhdGlvblByZXZFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMu X29uUHJldkJ1dHRvblNlYXJjaC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5fc2VhcmNo TmF2aWdhdGlvblByZXZFbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWFy Y2ggUHJldmlvdXMiKTsKIAotICAgIHRoaXMuX21hdGNoZXNFbGVtZW50ID0gdGhpcy5fZWxlbWVu dC5jcmVhdGVDaGlsZCgic3BhbiIsICJzZWFyY2gtcmVzdWx0cy1tYXRjaGVzIik7CisgICAgdGhp cy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50ID0gc2VhcmNoTmF2aWdhdGlvbkVsZW1lbnQu Y3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uIHRvb2xiYXItc2Vh cmNoLW5hdmlnYXRpb24tbmV4dCIpOyAKKyAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uTmV4dEVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fb25OZXh0QnV0dG9uU2Vh cmNoLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uTmV4dEVs ZW1lbnQudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlYXJjaCBOZXh0Iik7CiAKLSAg ICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2VhcmNoIiwgdGhp cy5fb25TZWFyY2guYmluZCh0aGlzKSwgZmFsc2UpOyAvLyB3aGVuIHRoZSBzZWFyY2ggaXMgZW1w dGllZAogICAgIHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCB0aGlzLl9vblNlYXJjaEZpZWxkTWFudWFsRm9jdXMuYmluZCh0aGlzKSwgZmFsc2Up OyAvLyB3aGVuIHRoZSBzZWFyY2ggZmllbGQgaXMgbWFudWFsbHkgc2VsZWN0ZWQKICAgICB0aGlz Ll9zZWFyY2hJbnB1dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX29u S2V5RG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiaW5wdXQiLCB0aGlzLl9vbklucHV0LmJpbmQodGhpcyksIGZhbHNl KTsKIAogICAgIHZhciBjbG9zZUJ1dHRvbkVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0ZUNo aWxkKCJzcGFuIiwgImRyYXdlci1oZWFkZXItY2xvc2UtYnV0dG9uIik7CiAgICAgY2xvc2VCdXR0 b25FbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJcdTAwRDciKTsK QEAgLTgwLDE1ICs4OCw2IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJl bnRNYXRjaEluZGV4KHBhbmVsLmN1cnJlbnRTZWFyY2hNYXRjaGVzLCBjdXJyZW50TWF0Y2hJbmRl eCk7CiAgICAgfSwKIAotICAgIHVwZGF0ZVNlYXJjaExhYmVsOiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICB2YXIgcGFuZWxOYW1lID0gV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuY3VycmVu dFBhbmVsKCkgJiYgV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuY3VycmVudFBhbmVsKCkudG9v bGJhckl0ZW1MYWJlbDsKLSAgICAgICAgaWYgKCFwYW5lbE5hbWUpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIHZhciBuZXdMYWJlbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VhcmNo ICVzIiwgcGFuZWxOYW1lKTsKLSAgICAgICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LnNldEF0 dHJpYnV0ZSgicGxhY2Vob2xkZXIiLCBuZXdMYWJlbCk7Ci0gICAgfSwKLQogICAgIGNhbmNlbFNl YXJjaDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50 LnZhbHVlID0gIiI7CkBAIC0xNTAsOCArMTQ5LDYgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRy b2xsZXIucHJvdG90eXBlID0gewogCiAgICAgYWN0aXZlUGFuZWxDaGFuZ2VkOiBmdW5jdGlvbigp CiAgICAgewotICAgICAgICB0aGlzLnVwZGF0ZVNlYXJjaExhYmVsKCk7Ci0KICAgICAgICAgaWYg KCF0aGlzLl9jdXJyZW50UXVlcnkpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTE1OSw3ICsx NTYsNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmIChwYW5lbC5wZXJmb3JtU2VhcmNoKSB7CiAgICAgICAgICAgICBmdW5jdGlvbiBwZXJm b3JtUGFuZWxTZWFyY2goKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHRoaXMuX3Vw ZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KCk7CisgICAgICAgICAg ICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3VycmVudE1hdGNoSW5kZXgo MCwgLTEpOwogCiAgICAgICAgICAgICAgICAgcGFuZWwuY3VycmVudFF1ZXJ5ID0gdGhpcy5fY3Vy cmVudFF1ZXJ5OwogICAgICAgICAgICAgICAgIHBhbmVsLnBlcmZvcm1TZWFyY2godGhpcy5fY3Vy cmVudFF1ZXJ5KTsKQEAgLTE2OSw1NyArMTY2LDMwIEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250 cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHNldFRpbWVvdXQocGVyZm9ybVBhbmVs U2VhcmNoLmJpbmQodGhpcyksIDApOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8g VXBkYXRlIHRvIHNob3cgTm90IGZvdW5kIGZvciBwYW5lbHMgdGhhdCBjYW4ndCBiZSBzZWFyY2hl ZC4KLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRN YXRjaEluZGV4KCk7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnRB bmRDdXJyZW50TWF0Y2hJbmRleCgwLCAtMSk7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAgX3Vw ZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0b25TdGF0ZTogZnVuY3Rpb24oZW5hYmxlZCkKICAgICB7 CiAgICAgICAgIGlmIChlbmFibGVkKSB7Ci0gICAgICAgICAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0 aW9uUHJldkVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgICAgICB0 aGlzLl9zZWFyY2hOYXZpZ2F0aW9uTmV4dEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVu Iik7CisgICAgICAgICAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uUHJldkVsZW1lbnQuYWRkU3R5 bGVDbGFzcygiZW5hYmxlZCIpOworICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5l eHRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImVuYWJsZWQiKTsKICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25QcmV2RWxlbWVudC5hZGRTdHlsZUNsYXNz KCJoaWRkZW4iKTsKLSAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0RWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmln YXRpb25QcmV2RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJlbmFibGVkIik7CisgICAgICAgICAg ICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uTmV4dEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiZW5h YmxlZCIpOwogICAgICAgICB9CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7P251 bWJlcj19IG1hdGNoZXMKLSAgICAgKiBAcGFyYW0ge251bWJlcj19IGN1cnJlbnRNYXRjaEluZGV4 CisgICAgICogQHBhcmFtIHtudW1iZXJ9IG1hdGNoZXMKKyAgICAgKiBAcGFyYW0ge251bWJlcn0g Y3VycmVudE1hdGNoSW5kZXgKICAgICAgKi8KICAgICBfdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50 QW5kQ3VycmVudE1hdGNoSW5kZXg6IGZ1bmN0aW9uKG1hdGNoZXMsIGN1cnJlbnRNYXRjaEluZGV4 KQogICAgIHsKLSAgICAgICAgaWYgKG1hdGNoZXMgPT0gbnVsbCkgewotICAgICAgICAgICAgdGhp cy5fbWF0Y2hlc0VsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgICAgICAv LyBNYWtlIFNlYXJjaCBOYXYga2V5IG5vbi1hY2Nlc3NpYmxlIHdoZW4gdGhlcmUgaXMgbm8gYWN0 aXZlIHNlYXJjaC4KLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0 b25TdGF0ZShmYWxzZSk7IAotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAg ICAgaWYgKG1hdGNoZXMpIHsKLSAgICAgICAgICAgIGlmIChtYXRjaGVzID09PSAxKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKGN1cnJlbnRNYXRjaEluZGV4ID09PSAwKQotICAgICAgICAgICAgICAg ICAgICB2YXIgbWF0Y2hlc1N0cmluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiMSBvZiAxIG1h dGNoIik7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICB2YXIgbWF0 Y2hlc1N0cmluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiMSBtYXRjaCIpOwotICAgICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpZiAodHlwZW9mIGN1cnJlbnRNYXRjaEluZGV4 ID09PSAibnVtYmVyIikKLSAgICAgICAgICAgICAgICAgICAgdmFyIG1hdGNoZXNTdHJpbmcgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIG9mICVkIG1hdGNoZXMiLCBjdXJyZW50TWF0Y2hJbmRl eCArIDEsIG1hdGNoZXMpOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAg ICAgdmFyIG1hdGNoZXNTdHJpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIG1hdGNoZXMi LCBtYXRjaGVzKTsKLSAgICAgICAgICAgICAgICAvLyBNYWtlIHNlYXJjaCBuYXYga2V5IGFjY2Vz c2libGUgd2hlbiB0aGVyZSBhcmUgbW9yZSB0aGFuIDEgc2VhcmNoIHJlc3VsdHMgZm91bmQuICAg IAotICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0b25TdGF0 ZSh0cnVlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZh ciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOb3QgRm91bmQiKTsKLSAg ICAgICAgICAgIC8vIE1ha2Ugc2VhcmNoIG5hdiBrZXkgbm9uLWFjY2Vzc2libGUgd2hlbiB0aGVy ZSBpcyBubyBtYXRjaCBmb3VuZC4KLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE5hdmln YXRpb25CdXR0b25TdGF0ZShmYWxzZSk7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLl9tYXRj aGVzRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAgICAgdGhpcy5fbWF0 Y2hlc0VsZW1lbnQudGV4dENvbnRlbnQgPSBtYXRjaGVzU3RyaW5nOwotICAgICAgICBXZWJJbnNw ZWN0b3IudG9vbGJhci5yZXNpemUoKTsKKyAgICAgICAgaWYgKGN1cnJlbnRNYXRjaEluZGV4ID49 IDApCisgICAgICAgICAgICB0aGlzLl9tYXRjaGVzRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiJWQgb2YgJWQiLCBjdXJyZW50TWF0Y2hJbmRleCArIDEsIG1hdGNo ZXMpOworICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hOYXZpZ2F0aW9uQnV0dG9uU3RhdGUobWF0 Y2hlcyA+IDApOwogICAgIH0sCiAKICAgICBmb2N1c1NlYXJjaEZpZWxkOiBmdW5jdGlvbigpCkBA IC0yNDYsNjQgKzIxNiwzNCBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICBp ZiAoIWlzRW50ZXJLZXkoZXZlbnQpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg ICAgIC8vIFNlbGVjdCBhbGwgb2YgdGhlIHRleHQgc28gdGhlIHVzZXIgY2FuIGVhc2lseSB0eXBl IGFuIGVudGlyZWx5IG5ldyBxdWVyeS4KLSAgICAgICAgZXZlbnQudGFyZ2V0LnNlbGVjdCgpOwot Ci0gICAgICAgIC8vIE9ubHkgY2FsbCBwZXJmb3JtU2VhcmNoIGlmIHRoZSBFbnRlciBrZXkgd2Fz IHByZXNzZWQuIE90aGVyd2lzZSB0aGUgc2VhcmNoCi0gICAgICAgIC8vIHBlcmZvcm1hbmNlIGlz IHBvb3IgYmVjYXVzZSBvZiBzZWFyY2hpbmcgb24gZXZlcnkga2V5LiBUaGUgc2VhcmNoIGZpZWxk IGhhcwotICAgICAgICAvLyB0aGUgaW5jcmVtZW50YWwgYXR0cmlidXRlIHNldCwgc28gd2Ugc3Rp bGwgZ2V0IGluY3JlbWVudGFsIHNlYXJjaGVzLgotICAgICAgICB0aGlzLl9vblNlYXJjaChldmVu dCk7Ci0KLSAgICAgICAgLy8gQ2FsbCBwcmV2ZW50RGVmYXVsdCBzaW5jZSB0aGlzIHdhcyB0aGUg RW50ZXIga2V5LiBUaGlzIHByZXZlbnRzIGEgInNlYXJjaCIgZXZlbnQKLSAgICAgICAgLy8gZnJv bSBmaXJpbmcgZm9yIGtleSBkb3duLiBUaGlzIHN0b3BzIHBlcmZvcm1TZWFyY2ggZnJvbSBiZWlu ZyBjYWxsZWQgdHdpY2UgaW4gYSByb3cuCi0gICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7 CisgICAgICAgIGlmIChpc0VudGVyS2V5KGV2ZW50KSkKKyAgICAgICAgICAgIHRoaXMuX3BlcmZv cm1TZWFyY2goZXZlbnQudGFyZ2V0LnZhbHVlLCB0cnVlLCBldmVudC5zaGlmdEtleSk7CiAgICAg fSwKIAotICAgIF9vblNlYXJjaDogZnVuY3Rpb24oZXZlbnQpCisgICAgX29uSW5wdXQ6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGZvcmNlU2VhcmNoID0gZXZlbnQua2V5SWRl bnRpZmllciA9PT0gIkVudGVyIjsKLSAgICAgICAgdGhpcy5fcGVyZm9ybVNlYXJjaChldmVudC50 YXJnZXQudmFsdWUsIGZvcmNlU2VhcmNoLCBldmVudC5zaGlmdEtleSwgZmFsc2UpOworICAgICAg ICB0aGlzLl9wZXJmb3JtU2VhcmNoKGV2ZW50LnRhcmdldC52YWx1ZSwgZmFsc2UsIGZhbHNlKTsK ICAgICB9LAogCiAgICAgX29uTmV4dEJ1dHRvblNlYXJjaDogZnVuY3Rpb24oZXZlbnQpCiAgICAg ewogICAgICAgICAvLyBTaW11bGF0ZSBuZXh0IHNlYXJjaCBvbiBzZWFyY2gtbmF2aWdhdGlvbi1i dXR0b24gY2xpY2suCi0gICAgICAgIHRoaXMuX3BlcmZvcm1TZWFyY2godGhpcy5fc2VhcmNoSW5w dXRFbGVtZW50LnZhbHVlLCB0cnVlLCBmYWxzZSwgZmFsc2UpOworICAgICAgICB0aGlzLl9wZXJm b3JtU2VhcmNoKHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC52YWx1ZSwgdHJ1ZSwgZmFsc2UpOwog ICAgIH0sCiAKICAgICBfb25QcmV2QnV0dG9uU2VhcmNoOiBmdW5jdGlvbihldmVudCkKICAgICB7 CiAgICAgICAgIC8vIFNpbXVsYXRlIHByZXZpb3VzIHNlYXJjaCBvbiBzZWFyY2gtbmF2aWdhdGlv bi1idXR0b24gY2xpY2suCi0gICAgICAgIHRoaXMuX3BlcmZvcm1TZWFyY2godGhpcy5fc2VhcmNo SW5wdXRFbGVtZW50LnZhbHVlLCB0cnVlLCB0cnVlLCBmYWxzZSk7CisgICAgICAgIHRoaXMuX3Bl cmZvcm1TZWFyY2godGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LnZhbHVlLCB0cnVlLCB0cnVlKTsK ICAgICB9LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gZm9yY2VTZWFyY2gK ICAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBpc0JhY2t3YXJkU2VhcmNoCi0gICAgICogQHBhcmFt IHtib29sZWFuPX0gcmVwZWF0U2VhcmNoCiAgICAgICovCi0gICAgX3BlcmZvcm1TZWFyY2g6IGZ1 bmN0aW9uKHF1ZXJ5LCBmb3JjZVNlYXJjaCwgaXNCYWNrd2FyZFNlYXJjaCwgcmVwZWF0U2VhcmNo KQorICAgIF9wZXJmb3JtU2VhcmNoOiBmdW5jdGlvbihxdWVyeSwgZm9yY2VTZWFyY2gsIGlzQmFj a3dhcmRTZWFyY2gpCiAgICAgewotICAgICAgICB2YXIgaXNTaG9ydFNlYXJjaCA9IChxdWVyeS5s ZW5ndGggPCAzKTsKLQotICAgICAgICAvLyBDbGVhciBhIGxlZnRvdmVyIHNob3J0IHNlYXJjaCBm bGFnIGR1ZSB0byBhIG5vbi1jb25mbGljdGluZyBmb3JjZWQgc2VhcmNoLgotICAgICAgICBpZiAo aXNTaG9ydFNlYXJjaCAmJiB0aGlzLl9zaG9ydFNlYXJjaFdhc0ZvcmNlZEJ5S2V5RXZlbnQgJiYg dGhpcy5fY3VycmVudFF1ZXJ5ICE9PSBxdWVyeSkKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9z aG9ydFNlYXJjaFdhc0ZvcmNlZEJ5S2V5RXZlbnQ7Ci0KLSAgICAgICAgLy8gSW5kaWNhdGUgdGhp cyB3YXMgYSBmb3JjZWQgc2VhcmNoIG9uIGEgc2hvcnQgcXVlcnkuCi0gICAgICAgIGlmIChpc1No b3J0U2VhcmNoICYmIGZvcmNlU2VhcmNoKQotICAgICAgICAgICAgdGhpcy5fc2hvcnRTZWFyY2hX YXNGb3JjZWRCeUtleUV2ZW50ID0gdHJ1ZTsKLQotICAgICAgICBpZiAoIXF1ZXJ5IHx8ICFxdWVy eS5sZW5ndGggfHwgKCFmb3JjZVNlYXJjaCAmJiBpc1Nob3J0U2VhcmNoKSkgewotICAgICAgICAg ICAgLy8gUHJldmVudCBjbG9iYmVyaW5nIGEgc2hvcnQgc2VhcmNoIGZvcmNlZCBieSB0aGUgdXNl ci4KLSAgICAgICAgICAgIGlmICh0aGlzLl9zaG9ydFNlYXJjaFdhc0ZvcmNlZEJ5S2V5RXZlbnQp IHsKLSAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fc2hvcnRTZWFyY2hXYXNGb3JjZWRCeUtl eUV2ZW50OwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQorICAgICAg ICBpZiAoIXF1ZXJ5IHx8ICFxdWVyeS5sZW5ndGgpIHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlz Ll9jdXJyZW50UXVlcnk7CiAKICAgICAgICAgICAgIGZvciAodmFyIHBhbmVsTmFtZSBpbiBXZWJJ bnNwZWN0b3IucGFuZWxzKSB7CkBAIC0zMTMsMTQgKzI1MywxMiBAQCBXZWJJbnNwZWN0b3IuU2Vh cmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgaWYgKGhhZEN1cnJl bnRRdWVyeSAmJiBwYW5lbC5zZWFyY2hDYW5jZWxlZCkKICAgICAgICAgICAgICAgICAgICAgcGFu ZWwuc2VhcmNoQ2FuY2VsZWQoKTsKICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgdGhpcy5f dXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3VycmVudE1hdGNoSW5kZXgoKTsKLQorICAgICAg ICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3VycmVudE1hdGNoSW5kZXgo MCwgLTEpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgdmFyIGN1 cnJlbnRQYW5lbCA9IFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LmN1cnJlbnRQYW5lbCgpOwot ICAgICAgICBpZiAoIXJlcGVhdFNlYXJjaCAmJiBxdWVyeSA9PT0gY3VycmVudFBhbmVsLmN1cnJl bnRRdWVyeSAmJiBjdXJyZW50UGFuZWwuY3VycmVudFF1ZXJ5ID09PSB0aGlzLl9jdXJyZW50UXVl cnkpIHsKKyAgICAgICAgaWYgKHF1ZXJ5ID09PSBjdXJyZW50UGFuZWwuY3VycmVudFF1ZXJ5ICYm IGN1cnJlbnRQYW5lbC5jdXJyZW50UXVlcnkgPT09IHRoaXMuX2N1cnJlbnRRdWVyeSkgewogICAg ICAgICAgICAgLy8gV2hlbiB0aGlzIGlzIHRoZSBzYW1lIHF1ZXJ5IGFuZCBhIGZvcmNlZCBzZWFy Y2gsIGp1bXAgdG8gdGhlIG5leHQKICAgICAgICAgICAgIC8vIHNlYXJjaCByZXN1bHQgZm9yIGEg Z29vZCB1c2VyIGV4cGVyaWVuY2UuCiAgICAgICAgICAgICBpZiAoZm9yY2VTZWFyY2gpIHsKQEAg LTMzMiwxMiArMjcwLDE1IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2N1 cnJlbnRRdWVyeSA9IHF1ZXJ5OworICAgICAgICBpZiAoIWZvcmNlU2VhcmNoICYmIHF1ZXJ5Lmxl bmd0aCA8IDMgJiYgIXRoaXMuX2N1cnJlbnRRdWVyeSkKKyAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJbmRl eCgpOworICAgICAgICB0aGlzLl9jdXJyZW50UXVlcnkgPSBxdWVyeTsKIAotICAgICAgICBpZiAo IWN1cnJlbnRQYW5lbC5wZXJmb3JtU2VhcmNoKQorICAgICAgICBpZiAoIWN1cnJlbnRQYW5lbC5w ZXJmb3JtU2VhcmNoKSB7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291 bnRBbmRDdXJyZW50TWF0Y2hJbmRleCgwLCAtMSk7CiAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KIAogICAgICAgICBjdXJyZW50UGFuZWwuY3VycmVudFF1ZXJ5ID0gcXVlcnk7CiAgICAg ICAgIGN1cnJlbnRQYW5lbC5wZXJmb3JtU2VhcmNoKHF1ZXJ5KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCBkODI5ZjMxNGYxMGZl Yzc5YTJlMGEzZjBjM2Y2NTc5MGM2ZTliZGRjLi41NDQ3MTAwNDZlMjhiZDZhZDNhMzNiNzMyNDg5 YzlkMTE1YmJmOWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuY3NzCkBAIC0yNjQsMjYgKzI2NCw2MiBAQCBib2R5LmRldGFjaGVkLnBsYXRm b3JtLW1hYy1zbm93bGVvcGFyZCAjdG9vbGJhci1kcm9wZG93biB7CiB9CiAKICNzZWFyY2ggewot ICAgIHdpZHRoOiAyMDVweDsKLSAgICBtYXJnaW4tbGVmdDogNHB4OwotICAgIG1hcmdpbi1yaWdo dDogNHB4OwotICAgIGZvbnQtc2l6ZTogMTFweDsKKyAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG5v bmU7CisgICAgYm9yZGVyOiAwOworICAgIHBhZGRpbmc6IDAgMnB4OworICAgIG1hcmdpbjogMDsK KyAgICB3aWR0aDogMTY1cHg7Cit9CisKKyNzZWFyY2g6Zm9jdXMgeworICAgIG91dGxpbmU6IG5v bmU7Cit9CisKKy50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWNvbnRyb2xzIHsKKyAgICBwb3Np dGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwOworICAgIHJpZ2h0OiAwOworICAgIGhlaWdodDog MThweDsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWxpbmVhci1ncmFkaWVudChyZ2Io MjI4LCAyMjgsIDIyOCksIHJnYigyMDQsIDIwNCwgMjA0KSA3NSUsIHJnYigyMDYsIDIwNiwgMjA2 KSk7CiB9CiAKIC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uIHsKLSAgICB3aWR0aDogMTZweDsK LSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIHRvcDogNHB4 OwotICAgIG1hcmdpbjogMHB4IDFweDsKLSAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0 OwogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiAy cHggNXB4OwotICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OworICAgIHdpZHRoOiAx OHB4OworICAgIGhlaWdodDogMThweDsKKyAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0 OworICAgIGJhY2tncm91bmQtcG9zaXRpb246IDRweCA3cHg7CisgICAgYm9yZGVyLWxlZnQ6IDFw eCBzb2xpZCByZ2IoMTcwLCAxNzAsIDE3MCk7CisgICAgb3BhY2l0eTogMC4zOwogfQogCi0udG9v bGJhci1zZWFyY2gtbmF2aWdhdGlvbjpob3ZlciB7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgcmdi YSgxMjAsIDEyMCwgMTIwLCAwLjYpOyAgICAKKy50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLmVu YWJsZWQ6aG92ZXIgeworICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDE5MCwgMTkwLCAx OTApOworICAgIG9wYWNpdHk6IDAuOTsKK30KKworLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24u ZW5hYmxlZCwgLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24uZW5hYmxlZDphY3RpdmUgeworICAg IGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDE3MCwgMTcwLCAxNzApOworICAgIG9wYWNpdHk6 IDAuNzsKK30KKworI3NlYXJjaDpmb2N1cyB7CisgICAgb3V0bGluZTogbm9uZTsKK30KKworLnRv b2xiYXItc2VhcmNoIHsKKyAgICBsaW5lLWhlaWdodDogMTlweDsKK30KKworLnRvb2xiYXItc2Vh cmNoLWNvbnRyb2wgeworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBwb3NpdGlvbjog cmVsYXRpdmU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CisgICAgYm9yZGVyOiAxcHgg c29saWQgcmdiKDIwMiwgMjAyLCAyMDIpOworICAgIG1hcmdpbjogMnB4OworICAgIGhlaWdodDog MjBweDsKKyAgICBib3JkZXItcmFkaXVzOiAycHg7CisgICAgcGFkZGluZy1yaWdodDogMzZweDsK IH0KIAogLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24udG9vbGJhci1zZWFyY2gtbmF2aWdhdGlv bi1wcmV2IHsKQEAgLTI5NCwxOCArMzMwLDE4IEBAIGJvZHkuZGV0YWNoZWQucGxhdGZvcm0tbWFj LXNub3dsZW9wYXJkICN0b29sYmFyLWRyb3Bkb3duIHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiB1 cmwoSW1hZ2VzL3NlYXJjaE5leHQucG5nKTsKIH0KIAotLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRp b24taGlkZGVuIHsKLSAgICBiYWNrZ3JvdW5kOiBub25lOwotfQotCiBib2R5LmNvbXBhY3QgI3Nl YXJjaCB7CiAgICAgZm9udC1zaXplOiAxMXB4OwogfQogCiAuc2VhcmNoLXJlc3VsdHMtbWF0Y2hl cyB7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgIG1pbi13aWR0aDogNzBweDsKKyAg ICBtaW4taGVpZ2h0OiAxMHB4OworICAgIHRleHQtYWxpZ246IHJpZ2h0OwogICAgIGZvbnQtc2l6 ZTogMTFweDsKLSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4 IDA7Ci0gICAgcGFkZGluZy1sZWZ0OiA0cHg7CisgICAgcGFkZGluZzogMCA0cHg7CisgICAgY29s b3I6IHJnYigxNjUsIDE2NSwgMTY1KTsKIH0KIAogLnRvb2xiYXItaXRlbS5lbGVtZW50cyAudG9v bGJhci1pY29uIHsKQEAgLTI3ODUsMTAgKzI4MjEsNSBAQCBib2R5LnBsYXRmb3JtLW1hYyAjZHJh d2VyLXN0YXR1cy1iYXIgLnNlYXJjaC1zdGF0dXMtYmFyLXByb2dyZXNzIHsKICAgICBsZWZ0OiAw OwogICAgIHJpZ2h0OiAwOwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICBwYWRkaW5nLWxlZnQ6 IDdweDsKLSAgICBwYWRkaW5nLWJvdHRvbTogN3B4OwotfQotCi0uaW5zcGVjdG9yLWZvb3RlciA+ IGRpdiB7Ci0gICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKKyAgICBwYWRkaW5nLWxlZnQ6IDVw eDsKIH0K 151943 2012-07-12 07:05:28 -0700 2012-07-12 08:02:12 -0700 Patch bug-91087-20120712180526.patch text/plain 19002 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUxOGY1YjNkY2U1MGVm MGI5MzM1NGU4MjE2MTNkODM1NWVmZTI1MC4uMTA3OWE5ZmRiODRkZTM0OTIwNWE4ZmNiNmRlMDRi ODQzMWFiNzk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTEyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGJlYXV0aWZ5IGZpbmQgYmFyIGxvb2tzLCBzaW1wbGlmeSBzZWFyY2ggdXBkYXRlIHJvdXRp bmVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEw ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSB1cGRhdGVzIHRoZSBsb29rcyB0byB0aGUgb25lIG9uIHRoZSBzY3JlZW5zaG90cyBh bmQgc2ltcGxpZmllcyBtYXRjaCBjb3VudCB1cGRhdGUgcm91dGluZXMuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2VhcmNoQ29udHJvbGxlci5vbk1hdGNoZXNNb3VzZURvd24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJj aENvbnRyb2xsZXIucHJvdG90eXBlLmFjdGl2ZVBhbmVsQ2hhbmdlZC5wZXJmb3JtUGFuZWxTZWFy Y2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLmFj dGl2ZVBhbmVsQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxl ci5wcm90b3R5cGUuX3VwZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0b25TdGF0ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX3VwZGF0ZVNlYXJjaE1h dGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T ZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5fb25LZXlEb3duKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5fb25JbnB1dCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX29uTmV4dEJ1dHRvblNlYXJjaCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUuX29uUHJl dkJ1dHRvblNlYXJjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5w cm90b3R5cGUuX3BlcmZvcm1TZWFyY2gpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzczoKKyAgICAgICAgKCNzZWFyY2gpOgorICAgICAgICAoI3NlYXJjaDpmb2N1 cyk6CisgICAgICAgICgudG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbi1jb250cm9scyk6CisgICAg ICAgICgudG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbik6CisgICAgICAgICgudG9vbGJhci1zZWFy Y2gtbmF2aWdhdGlvbi5lbmFibGVkOmhvdmVyKToKKyAgICAgICAgKC50b29sYmFyLXNlYXJjaC1u YXZpZ2F0aW9uLmVuYWJsZWQsIC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLmVuYWJsZWQ6YWN0 aXZlKToKKyAgICAgICAgKC50b29sYmFyLXNlYXJjaCk6CisgICAgICAgICgudG9vbGJhci1zZWFy Y2gtY29udHJvbCk6CisgICAgICAgICguc2VhcmNoLXJlc3VsdHMtbWF0Y2hlcyk6CisgICAgICAg ICguaW5zcGVjdG9yLWZvb3Rlcik6CisKIDIwMTItMDctMTEgIEFybmF1ZCBSZW5ldmllciAgPGEu cmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBbR3RrXSBhbGxvdyBidWlsZGlu ZyB3aXRoIGNzcy1maWx0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMKaW5kZXggMTU4Yzg4YzkwMTg0ZTEyNWYzMzRkNmVhYWYzOTQ5OTA3 NDRlMDFmNC4uNmFiNGJjM2RhNzczYmI4MjQ1ZmNmZjU1NmZjMTE3ZmQ4YzcyOTYxMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAt NzE5LDQgKzcxOSw0IEBAIGxvY2FsaXplZFN0cmluZ3NbIkNQVSBUaW1lIl0gPSAiQ1BVIFRpbWUi OwogbG9jYWxpemVkU3RyaW5nc1siRW5jb2RlZCBEYXRhIExlbmd0aCJdID0gIkVuY29kZWQgRGF0 YSBMZW5ndGgiOwogbG9jYWxpemVkU3RyaW5nc1siJWQgQnl0ZXMiXSA9ICIlZCBCeXRlcyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJUaW1lIEVuZCJdID0gIlRpbWUgRW5kIjsKLWxvY2FsaXplZFN0cmlu Z3NbIlNlYXJjaDoiXSA9ICJTZWFyY2g6IjsKK2xvY2FsaXplZFN0cmluZ3NbIkZpbmQiXSA9ICJG aW5kIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Vh cmNoQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Vh cmNoQ29udHJvbGxlci5qcwppbmRleCAxNTY1ZjRkMjU0MjkyMTc5OTg0MDA4OTk4N2IwYTMyOGQy ZDEyODgzLi44NzUwN2NmNWFlZGViY2JkODliZmFkMjljZmRlMTEwMzg2NDM5ZGZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9s bGVyLmpzCkBAIC0zNSwyNyArMzUsMzEgQEAKIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVy ID0gZnVuY3Rpb24oKQogewogICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKLSAgICB0aGlzLl9lbGVtZW50LnRleHRDb250ZW50ID0gIlNlYXJjaDoiOwor ICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gInRvb2xiYXItc2VhcmNoIjsKIAotICAgIHRo aXMuX3NlYXJjaElucHV0RWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoImlucHV0 Iik7CisgICAgdmFyIGxhYmVsRWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoInNw YW4iKTsKKyAgICBsYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkZpbmQiKTsKKworICAgIHRoaXMuX3NlYXJjaENvbnRyb2xFbGVtZW50ID0gdGhpcy5fZWxl bWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRvb2xiYXItc2VhcmNoLWNvbnRyb2wiKTsKKworICAg IHRoaXMuX3NlYXJjaElucHV0RWxlbWVudCA9IHRoaXMuX3NlYXJjaENvbnRyb2xFbGVtZW50LmNy ZWF0ZUNoaWxkKCJpbnB1dCIpOwogICAgIHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC5pZCA9ICJz ZWFyY2giOwotICAgIHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC50eXBlID0gInNlYXJjaCI7Ci0g ICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LmluY3JlbWVudGFsID0gdHJ1ZTsKLSAgICB0aGlz Ll9zZWFyY2hJbnB1dEVsZW1lbnQucmVzdWx0cyA9IDA7CiAKLSAgICB0aGlzLl9zZWFyY2hOYXZp Z2F0aW9uTmV4dEVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAidG9v bGJhci1zZWFyY2gtbmF2aWdhdGlvbiB0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLW5leHQgaGlk ZGVuIik7Ci0gICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX29uTmV4dEJ1dHRvblNlYXJjaC5iaW5kKHRoaXMpLCBm YWxzZSk7IAotICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0RWxlbWVudC50aXRsZSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU2VhcmNoIE5leHQiKTsKKyAgICB0aGlzLl9tYXRjaGVzRWxl bWVudCA9IHRoaXMuX3NlYXJjaENvbnRyb2xFbGVtZW50LmNyZWF0ZUNoaWxkKCJsYWJlbCIsICJz ZWFyY2gtcmVzdWx0cy1tYXRjaGVzIik7CisgICAgdGhpcy5fbWF0Y2hlc0VsZW1lbnQuc2V0QXR0 cmlidXRlKCJmb3IiLCAic2VhcmNoIik7CiAKLSAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uUHJl dkVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAidG9vbGJhci1zZWFy Y2gtbmF2aWdhdGlvbiB0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLXByZXYgaGlkZGVuIik7Cisg ICAgdmFyIHNlYXJjaE5hdmlnYXRpb25FbGVtZW50ID0gdGhpcy5fc2VhcmNoQ29udHJvbEVsZW1l bnQuY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWNvbnRyb2xz Iik7CisgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvblByZXZFbGVtZW50ID0gc2VhcmNoTmF2aWdh dGlvbkVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9u IHRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tcHJldiIpOwogICAgIHRoaXMuX3NlYXJjaE5hdmln YXRpb25QcmV2RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9vblBy ZXZCdXR0b25TZWFyY2guYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuX3NlYXJjaE5hdmln YXRpb25QcmV2RWxlbWVudC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VhcmNoIFBy ZXZpb3VzIik7CiAKLSAgICB0aGlzLl9tYXRjaGVzRWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3Jl YXRlQ2hpbGQoInNwYW4iLCAic2VhcmNoLXJlc3VsdHMtbWF0Y2hlcyIpOworICAgIHRoaXMuX3Nl YXJjaE5hdmlnYXRpb25OZXh0RWxlbWVudCA9IHNlYXJjaE5hdmlnYXRpb25FbGVtZW50LmNyZWF0 ZUNoaWxkKCJkaXYiLCAidG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbiB0b29sYmFyLXNlYXJjaC1u YXZpZ2F0aW9uLW5leHQiKTsgCisgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX29uTmV4dEJ1dHRvblNlYXJjaC5i aW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50 LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWFyY2ggTmV4dCIpOwogCi0gICAgdGhp cy5fc2VhcmNoSW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNlYXJjaCIsIHRoaXMuX29u U2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgLy8gd2hlbiB0aGUgc2VhcmNoIGlzIGVtcHRpZWQK ICAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3du IiwgdGhpcy5fb25TZWFyY2hGaWVsZE1hbnVhbEZvY3VzLmJpbmQodGhpcyksIGZhbHNlKTsgLy8g d2hlbiB0aGUgc2VhcmNoIGZpZWxkIGlzIG1hbnVhbGx5IHNlbGVjdGVkCiAgICAgdGhpcy5fc2Vh cmNoSW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9vbktleURv d24uYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImlucHV0IiwgdGhpcy5fb25JbnB1dC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAK ICAgICB2YXIgY2xvc2VCdXR0b25FbGVtZW50ID0gdGhpcy5fZWxlbWVudC5jcmVhdGVDaGlsZCgi c3BhbiIsICJkcmF3ZXItaGVhZGVyLWNsb3NlLWJ1dHRvbiIpOwogICAgIGNsb3NlQnV0dG9uRWxl bWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiXHUwMEQ3Iik7CkBAIC03 MSw3ICs3NSw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcGFuZWwuY3VycmVudFNlYXJjaE1hdGNoZXMgPSBtYXRjaGVzOwogCiAgICAgICAg IGlmIChwYW5lbCA9PT0gV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuY3VycmVudFBhbmVsKCkp Ci0gICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnRBbmRDdXJyZW50TWF0 Y2hJbmRleChXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5jdXJyZW50UGFuZWwoKS5jdXJyZW50 UXVlcnkgJiYgbWF0Y2hlcyk7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVz Q291bnRBbmRDdXJyZW50TWF0Y2hJbmRleChXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5jdXJy ZW50UGFuZWwoKS5jdXJyZW50UXVlcnkgPyBtYXRjaGVzIDogMCwgLTEpOwogICAgIH0sCiAKICAg ICB1cGRhdGVDdXJyZW50TWF0Y2hJbmRleDogZnVuY3Rpb24oY3VycmVudE1hdGNoSW5kZXgsIHBh bmVsKQpAQCAtODAsMTUgKzg0LDYgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJv dG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5k Q3VycmVudE1hdGNoSW5kZXgocGFuZWwuY3VycmVudFNlYXJjaE1hdGNoZXMsIGN1cnJlbnRNYXRj aEluZGV4KTsKICAgICB9LAogCi0gICAgdXBkYXRlU2VhcmNoTGFiZWw6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHZhciBwYW5lbE5hbWUgPSBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5j dXJyZW50UGFuZWwoKSAmJiBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5jdXJyZW50UGFuZWwo KS50b29sYmFySXRlbUxhYmVsOwotICAgICAgICBpZiAoIXBhbmVsTmFtZSkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgdmFyIG5ld0xhYmVsID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT ZWFyY2ggJXMiLCBwYW5lbE5hbWUpOwotICAgICAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQu c2V0QXR0cmlidXRlKCJwbGFjZWhvbGRlciIsIG5ld0xhYmVsKTsKLSAgICB9LAotCiAgICAgY2Fu Y2VsU2VhcmNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9zZWFyY2hJbnB1dEVs ZW1lbnQudmFsdWUgPSAiIjsKQEAgLTE1MCw4ICsxNDUsNiBAQCBXZWJJbnNwZWN0b3IuU2VhcmNo Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICBhY3RpdmVQYW5lbENoYW5nZWQ6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMudXBkYXRlU2VhcmNoTGFiZWwoKTsKLQogICAgICAg ICBpZiAoIXRoaXMuX2N1cnJlbnRRdWVyeSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTU5 LDcgKzE1Miw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKHBhbmVsLnBlcmZvcm1TZWFyY2gpIHsKICAgICAgICAgICAgIGZ1bmN0aW9u IHBlcmZvcm1QYW5lbFNlYXJjaCgpCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgdGhp cy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3VycmVudE1hdGNoSW5kZXgoKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRjaGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJ bmRleCgwLCAtMSk7CiAKICAgICAgICAgICAgICAgICBwYW5lbC5jdXJyZW50UXVlcnkgPSB0aGlz Ll9jdXJyZW50UXVlcnk7CiAgICAgICAgICAgICAgICAgcGFuZWwucGVyZm9ybVNlYXJjaCh0aGlz Ll9jdXJyZW50UXVlcnkpOwpAQCAtMTY5LDU3ICsxNjIsMzAgQEAgV2ViSW5zcGVjdG9yLlNlYXJj aENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgc2V0VGltZW91dChwZXJmb3Jt UGFuZWxTZWFyY2guYmluZCh0aGlzKSwgMCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICAvLyBVcGRhdGUgdG8gc2hvdyBOb3QgZm91bmQgZm9yIHBhbmVscyB0aGF0IGNhbid0IGJlIHNl YXJjaGVkLgotICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3Vy cmVudE1hdGNoSW5kZXgoKTsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXND b3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KDAsIC0xKTsKICAgICAgICAgfQogICAgIH0sCiAKICAg ICBfdXBkYXRlU2VhcmNoTmF2aWdhdGlvbkJ1dHRvblN0YXRlOiBmdW5jdGlvbihlbmFibGVkKQog ICAgIHsKICAgICAgICAgaWYgKGVuYWJsZWQpIHsKLSAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5h dmlnYXRpb25QcmV2RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAgICAg ICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJo aWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25QcmV2RWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJlbmFibGVkIik7CisgICAgICAgICAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0 aW9uTmV4dEVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZW5hYmxlZCIpOwogICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvblByZXZFbGVtZW50LmFkZFN0eWxl Q2xhc3MoImhpZGRlbiIpOwotICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRF bGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5fc2VhcmNo TmF2aWdhdGlvblByZXZFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImVuYWJsZWQiKTsKKyAgICAg ICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNz KCJlbmFibGVkIik7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFt IHs/bnVtYmVyPX0gbWF0Y2hlcwotICAgICAqIEBwYXJhbSB7bnVtYmVyPX0gY3VycmVudE1hdGNo SW5kZXgKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gbWF0Y2hlcworICAgICAqIEBwYXJhbSB7bnVt YmVyfSBjdXJyZW50TWF0Y2hJbmRleAogICAgICAqLwogICAgIF91cGRhdGVTZWFyY2hNYXRjaGVz Q291bnRBbmRDdXJyZW50TWF0Y2hJbmRleDogZnVuY3Rpb24obWF0Y2hlcywgY3VycmVudE1hdGNo SW5kZXgpCiAgICAgewotICAgICAgICBpZiAobWF0Y2hlcyA9PSBudWxsKSB7Ci0gICAgICAgICAg ICB0aGlzLl9tYXRjaGVzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAgICAg ICAgIC8vIE1ha2UgU2VhcmNoIE5hdiBrZXkgbm9uLWFjY2Vzc2libGUgd2hlbiB0aGVyZSBpcyBu byBhY3RpdmUgc2VhcmNoLgotICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTmF2aWdhdGlv bkJ1dHRvblN0YXRlKGZhbHNlKTsgCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQot ICAgICAgICBpZiAobWF0Y2hlcykgewotICAgICAgICAgICAgaWYgKG1hdGNoZXMgPT09IDEpIHsK LSAgICAgICAgICAgICAgICBpZiAoY3VycmVudE1hdGNoSW5kZXggPT09IDApCi0gICAgICAgICAg ICAgICAgICAgIHZhciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIxIG9m IDEgbWF0Y2giKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHZh ciBtYXRjaGVzU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIxIG1hdGNoIik7Ci0gICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgY3VycmVudE1hdGNo SW5kZXggPT09ICJudW1iZXIiKQotICAgICAgICAgICAgICAgICAgICB2YXIgbWF0Y2hlc1N0cmlu ZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJWQgb2YgJWQgbWF0Y2hlcyIsIGN1cnJlbnRNYXRj aEluZGV4ICsgMSwgbWF0Y2hlcyk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICB2YXIgbWF0Y2hlc1N0cmluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJWQgbWF0 Y2hlcyIsIG1hdGNoZXMpOwotICAgICAgICAgICAgICAgIC8vIE1ha2Ugc2VhcmNoIG5hdiBrZXkg YWNjZXNzaWJsZSB3aGVuIHRoZXJlIGFyZSBtb3JlIHRoYW4gMSBzZWFyY2ggcmVzdWx0cyBmb3Vu ZC4gICAgCi0gICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTmF2aWdhdGlvbkJ1dHRv blN0YXRlKHRydWUpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgdmFyIG1hdGNoZXNTdHJpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vdCBGb3VuZCIp OwotICAgICAgICAgICAgLy8gTWFrZSBzZWFyY2ggbmF2IGtleSBub24tYWNjZXNzaWJsZSB3aGVu IHRoZXJlIGlzIG5vIG1hdGNoIGZvdW5kLgotICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNo TmF2aWdhdGlvbkJ1dHRvblN0YXRlKGZhbHNlKTsKLSAgICAgICAgfQotCi0gICAgICAgIHRoaXMu X21hdGNoZXNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICB0aGlz Ll9tYXRjaGVzRWxlbWVudC50ZXh0Q29udGVudCA9IG1hdGNoZXNTdHJpbmc7Ci0gICAgICAgIFdl Ykluc3BlY3Rvci50b29sYmFyLnJlc2l6ZSgpOworICAgICAgICBpZiAobWF0Y2hlcyA9PT0gMCB8 fCBjdXJyZW50TWF0Y2hJbmRleCA+PSAwKQorICAgICAgICAgICAgdGhpcy5fbWF0Y2hlc0VsZW1l bnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIG9mICVkIiwgY3VycmVu dE1hdGNoSW5kZXggKyAxLCBtYXRjaGVzKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTmF2 aWdhdGlvbkJ1dHRvblN0YXRlKG1hdGNoZXMgPiAwKTsKICAgICB9LAogCiAgICAgZm9jdXNTZWFy Y2hGaWVsZDogZnVuY3Rpb24oKQpAQCAtMjQ2LDY0ICsyMTIsMzQgQEAgV2ViSW5zcGVjdG9yLlNl YXJjaENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFpc0VudGVyS2V5KGV2ZW50KSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLQotICAgICAgICAvLyBTZWxlY3QgYWxsIG9mIHRoZSB0ZXh0IHNvIHRo ZSB1c2VyIGNhbiBlYXNpbHkgdHlwZSBhbiBlbnRpcmVseSBuZXcgcXVlcnkuCi0gICAgICAgIGV2 ZW50LnRhcmdldC5zZWxlY3QoKTsKLQotICAgICAgICAvLyBPbmx5IGNhbGwgcGVyZm9ybVNlYXJj aCBpZiB0aGUgRW50ZXIga2V5IHdhcyBwcmVzc2VkLiBPdGhlcndpc2UgdGhlIHNlYXJjaAotICAg ICAgICAvLyBwZXJmb3JtYW5jZSBpcyBwb29yIGJlY2F1c2Ugb2Ygc2VhcmNoaW5nIG9uIGV2ZXJ5 IGtleS4gVGhlIHNlYXJjaCBmaWVsZCBoYXMKLSAgICAgICAgLy8gdGhlIGluY3JlbWVudGFsIGF0 dHJpYnV0ZSBzZXQsIHNvIHdlIHN0aWxsIGdldCBpbmNyZW1lbnRhbCBzZWFyY2hlcy4KLSAgICAg ICAgdGhpcy5fb25TZWFyY2goZXZlbnQpOwotCi0gICAgICAgIC8vIENhbGwgcHJldmVudERlZmF1 bHQgc2luY2UgdGhpcyB3YXMgdGhlIEVudGVyIGtleS4gVGhpcyBwcmV2ZW50cyBhICJzZWFyY2gi IGV2ZW50Ci0gICAgICAgIC8vIGZyb20gZmlyaW5nIGZvciBrZXkgZG93bi4gVGhpcyBzdG9wcyBw ZXJmb3JtU2VhcmNoIGZyb20gYmVpbmcgY2FsbGVkIHR3aWNlIGluIGEgcm93LgotICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICBpZiAoaXNFbnRlcktleShldmVudCkpCisg ICAgICAgICAgICB0aGlzLl9wZXJmb3JtU2VhcmNoKGV2ZW50LnRhcmdldC52YWx1ZSwgdHJ1ZSwg ZXZlbnQuc2hpZnRLZXkpOwogICAgIH0sCiAKLSAgICBfb25TZWFyY2g6IGZ1bmN0aW9uKGV2ZW50 KQorICAgIF9vbklucHV0OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBmb3Jj ZVNlYXJjaCA9IGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJFbnRlciI7Ci0gICAgICAgIHRoaXMu X3BlcmZvcm1TZWFyY2goZXZlbnQudGFyZ2V0LnZhbHVlLCBmb3JjZVNlYXJjaCwgZXZlbnQuc2hp ZnRLZXksIGZhbHNlKTsKKyAgICAgICAgdGhpcy5fcGVyZm9ybVNlYXJjaChldmVudC50YXJnZXQu dmFsdWUsIGZhbHNlLCBmYWxzZSk7CiAgICAgfSwKIAogICAgIF9vbk5leHRCdXR0b25TZWFyY2g6 IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgLy8gU2ltdWxhdGUgbmV4dCBzZWFyY2gg b24gc2VhcmNoLW5hdmlnYXRpb24tYnV0dG9uIGNsaWNrLgotICAgICAgICB0aGlzLl9wZXJmb3Jt U2VhcmNoKHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC52YWx1ZSwgdHJ1ZSwgZmFsc2UsIGZhbHNl KTsKKyAgICAgICAgdGhpcy5fcGVyZm9ybVNlYXJjaCh0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQu dmFsdWUsIHRydWUsIGZhbHNlKTsKICAgICB9LAogCiAgICAgX29uUHJldkJ1dHRvblNlYXJjaDog ZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICAvLyBTaW11bGF0ZSBwcmV2aW91cyBzZWFy Y2ggb24gc2VhcmNoLW5hdmlnYXRpb24tYnV0dG9uIGNsaWNrLgotICAgICAgICB0aGlzLl9wZXJm b3JtU2VhcmNoKHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC52YWx1ZSwgdHJ1ZSwgdHJ1ZSwgZmFs c2UpOworICAgICAgICB0aGlzLl9wZXJmb3JtU2VhcmNoKHRoaXMuX3NlYXJjaElucHV0RWxlbWVu dC52YWx1ZSwgdHJ1ZSwgdHJ1ZSk7CiAgICAgfSwKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7 Ym9vbGVhbj19IGZvcmNlU2VhcmNoCiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNCYWNrd2Fy ZFNlYXJjaAotICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHJlcGVhdFNlYXJjaAogICAgICAqLwot ICAgIF9wZXJmb3JtU2VhcmNoOiBmdW5jdGlvbihxdWVyeSwgZm9yY2VTZWFyY2gsIGlzQmFja3dh cmRTZWFyY2gsIHJlcGVhdFNlYXJjaCkKKyAgICBfcGVyZm9ybVNlYXJjaDogZnVuY3Rpb24ocXVl cnksIGZvcmNlU2VhcmNoLCBpc0JhY2t3YXJkU2VhcmNoKQogICAgIHsKLSAgICAgICAgdmFyIGlz U2hvcnRTZWFyY2ggPSAocXVlcnkubGVuZ3RoIDwgMyk7Ci0KLSAgICAgICAgLy8gQ2xlYXIgYSBs ZWZ0b3ZlciBzaG9ydCBzZWFyY2ggZmxhZyBkdWUgdG8gYSBub24tY29uZmxpY3RpbmcgZm9yY2Vk IHNlYXJjaC4KLSAgICAgICAgaWYgKGlzU2hvcnRTZWFyY2ggJiYgdGhpcy5fc2hvcnRTZWFyY2hX YXNGb3JjZWRCeUtleUV2ZW50ICYmIHRoaXMuX2N1cnJlbnRRdWVyeSAhPT0gcXVlcnkpCi0gICAg ICAgICAgICBkZWxldGUgdGhpcy5fc2hvcnRTZWFyY2hXYXNGb3JjZWRCeUtleUV2ZW50OwotCi0g ICAgICAgIC8vIEluZGljYXRlIHRoaXMgd2FzIGEgZm9yY2VkIHNlYXJjaCBvbiBhIHNob3J0IHF1 ZXJ5LgotICAgICAgICBpZiAoaXNTaG9ydFNlYXJjaCAmJiBmb3JjZVNlYXJjaCkKLSAgICAgICAg ICAgIHRoaXMuX3Nob3J0U2VhcmNoV2FzRm9yY2VkQnlLZXlFdmVudCA9IHRydWU7Ci0KLSAgICAg ICAgaWYgKCFxdWVyeSB8fCAhcXVlcnkubGVuZ3RoIHx8ICghZm9yY2VTZWFyY2ggJiYgaXNTaG9y dFNlYXJjaCkpIHsKLSAgICAgICAgICAgIC8vIFByZXZlbnQgY2xvYmJlcmluZyBhIHNob3J0IHNl YXJjaCBmb3JjZWQgYnkgdGhlIHVzZXIuCi0gICAgICAgICAgICBpZiAodGhpcy5fc2hvcnRTZWFy Y2hXYXNGb3JjZWRCeUtleUV2ZW50KSB7Ci0gICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3No b3J0U2VhcmNoV2FzRm9yY2VkQnlLZXlFdmVudDsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICB9Ci0KKyAgICAgICAgaWYgKCFxdWVyeSB8fCAhcXVlcnkubGVuZ3RoKSB7CiAg ICAgICAgICAgICBkZWxldGUgdGhpcy5fY3VycmVudFF1ZXJ5OwogCiAgICAgICAgICAgICBmb3Ig KHZhciBwYW5lbE5hbWUgaW4gV2ViSW5zcGVjdG9yLnBhbmVscykgewpAQCAtMzEzLDE0ICsyNDks MTIgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgIGlmIChoYWRDdXJyZW50UXVlcnkgJiYgcGFuZWwuc2VhcmNoQ2FuY2VsZWQpCiAg ICAgICAgICAgICAgICAgICAgIHBhbmVsLnNlYXJjaENhbmNlbGVkKCk7CiAgICAgICAgICAgICB9 Ci0KLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRN YXRjaEluZGV4KCk7Ci0KKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3Vu dEFuZEN1cnJlbnRNYXRjaEluZGV4KDAsIC0xKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQogCiAgICAgICAgIHZhciBjdXJyZW50UGFuZWwgPSBXZWJJbnNwZWN0b3IuaW5zcGVjdG9y Vmlldy5jdXJyZW50UGFuZWwoKTsKLSAgICAgICAgaWYgKCFyZXBlYXRTZWFyY2ggJiYgcXVlcnkg PT09IGN1cnJlbnRQYW5lbC5jdXJyZW50UXVlcnkgJiYgY3VycmVudFBhbmVsLmN1cnJlbnRRdWVy eSA9PT0gdGhpcy5fY3VycmVudFF1ZXJ5KSB7CisgICAgICAgIGlmIChxdWVyeSA9PT0gY3VycmVu dFBhbmVsLmN1cnJlbnRRdWVyeSAmJiBjdXJyZW50UGFuZWwuY3VycmVudFF1ZXJ5ID09PSB0aGlz Ll9jdXJyZW50UXVlcnkpIHsKICAgICAgICAgICAgIC8vIFdoZW4gdGhpcyBpcyB0aGUgc2FtZSBx dWVyeSBhbmQgYSBmb3JjZWQgc2VhcmNoLCBqdW1wIHRvIHRoZSBuZXh0CiAgICAgICAgICAgICAv LyBzZWFyY2ggcmVzdWx0IGZvciBhIGdvb2QgdXNlciBleHBlcmllbmNlLgogICAgICAgICAgICAg aWYgKGZvcmNlU2VhcmNoKSB7CkBAIC0zMzIsMTIgKzI2NiwxNSBAQCBXZWJJbnNwZWN0b3IuU2Vh cmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KIAotICAgICAgICB0aGlzLl9jdXJyZW50UXVlcnkgPSBxdWVyeTsKKyAgICAgICAgaWYgKCFm b3JjZVNlYXJjaCAmJiBxdWVyeS5sZW5ndGggPCAzICYmICF0aGlzLl9jdXJyZW50UXVlcnkpCisg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlc0Nv dW50QW5kQ3VycmVudE1hdGNoSW5kZXgoKTsKKyAgICAgICAgdGhpcy5fY3VycmVudFF1ZXJ5ID0g cXVlcnk7CiAKLSAgICAgICAgaWYgKCFjdXJyZW50UGFuZWwucGVyZm9ybVNlYXJjaCkKKyAgICAg ICAgaWYgKCFjdXJyZW50UGFuZWwucGVyZm9ybVNlYXJjaCkgeworICAgICAgICAgICAgdGhpcy5f dXBkYXRlU2VhcmNoTWF0Y2hlc0NvdW50QW5kQ3VycmVudE1hdGNoSW5kZXgoMCwgLTEpOwogICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKICAgICAgICAgY3VycmVudFBhbmVsLmN1cnJl bnRRdWVyeSA9IHF1ZXJ5OwogICAgICAgICBjdXJyZW50UGFuZWwucGVyZm9ybVNlYXJjaChxdWVy eSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcwppbmRleCBhYjJjODU2Mjg3ZGViYWRlZDdjZmYzNjVmODNhYjNiMjZhY2RiNjQ2Li41ODAw MTI0NTA3ZGUxMmU5ZDNlODE1YTdmMWU1MzQ4YTE2YzRjZmZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTMzMyw3ICszMzMs NyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAg dGhpcy5fc2VhcmNoUmVzdWx0cyA9IHRoaXMuX2NvbGxlY3RSZWdleE1hdGNoZXMocmVnZXgpOwog ICAgICAgICAgICAgdmFyIHNlbGVjdGlvbiA9IHRoaXMuX3RleHRFZGl0b3IubGFzdFNlbGVjdGlv bigpOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IHNlbGVjdGlvbiAmJiBpIDwgdGhpcy5f c2VhcmNoUmVzdWx0cy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgIGlmICh0aGlzLl9z ZWFyY2hSZXN1bHRzW2ldLmNvbXBhcmVUbyhzZWxlY3Rpb24pID4gMCkgeworICAgICAgICAgICAg ICAgIGlmICh0aGlzLl9zZWFyY2hSZXN1bHRzW2ldLmNvbXBhcmVUbyhzZWxlY3Rpb24pID49IDAp IHsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0g aSAtIDE7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNz cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwppbmRl eCBkODI5ZjMxNGYxMGZlYzc5YTJlMGEzZjBjM2Y2NTc5MGM2ZTliZGRjLi41NDQ3MTAwNDZlMjhi ZDZhZDNhMzNiNzMyNDg5YzlkMTE1YmJmOWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBAIC0yNjQsMjYgKzI2NCw2MiBAQCBib2R5 LmRldGFjaGVkLnBsYXRmb3JtLW1hYy1zbm93bGVvcGFyZCAjdG9vbGJhci1kcm9wZG93biB7CiB9 CiAKICNzZWFyY2ggewotICAgIHdpZHRoOiAyMDVweDsKLSAgICBtYXJnaW4tbGVmdDogNHB4Owot ICAgIG1hcmdpbi1yaWdodDogNHB4OwotICAgIGZvbnQtc2l6ZTogMTFweDsKKyAgICAtd2Via2l0 LWFwcGVhcmFuY2U6IG5vbmU7CisgICAgYm9yZGVyOiAwOworICAgIHBhZGRpbmc6IDAgMnB4Owor ICAgIG1hcmdpbjogMDsKKyAgICB3aWR0aDogMTY1cHg7Cit9CisKKyNzZWFyY2g6Zm9jdXMgewor ICAgIG91dGxpbmU6IG5vbmU7Cit9CisKKy50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWNvbnRy b2xzIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwOworICAgIHJpZ2h0OiAw OworICAgIGhlaWdodDogMThweDsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWxpbmVh ci1ncmFkaWVudChyZ2IoMjI4LCAyMjgsIDIyOCksIHJnYigyMDQsIDIwNCwgMjA0KSA3NSUsIHJn YigyMDYsIDIwNiwgMjA2KSk7CiB9CiAKIC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uIHsKLSAg ICB3aWR0aDogMTZweDsKLSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZl OwotICAgIHRvcDogNHB4OwotICAgIG1hcmdpbjogMHB4IDFweDsKLSAgICBiYWNrZ3JvdW5kLXJl cGVhdDogbm8tcmVwZWF0OwogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBiYWNrZ3Jv dW5kLXBvc2l0aW9uOiAycHggNXB4OwotICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50 OworICAgIHdpZHRoOiAxOHB4OworICAgIGhlaWdodDogMThweDsKKyAgICBiYWNrZ3JvdW5kLXJl cGVhdDogbm8tcmVwZWF0OworICAgIGJhY2tncm91bmQtcG9zaXRpb246IDRweCA3cHg7CisgICAg Ym9yZGVyLWxlZnQ6IDFweCBzb2xpZCByZ2IoMTcwLCAxNzAsIDE3MCk7CisgICAgb3BhY2l0eTog MC4zOwogfQogCi0udG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbjpob3ZlciB7Ci0gICAgYm9yZGVy OiAxcHggc29saWQgcmdiYSgxMjAsIDEyMCwgMTIwLCAwLjYpOyAgICAKKy50b29sYmFyLXNlYXJj aC1uYXZpZ2F0aW9uLmVuYWJsZWQ6aG92ZXIgeworICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQg cmdiKDE5MCwgMTkwLCAxOTApOworICAgIG9wYWNpdHk6IDAuOTsKK30KKworLnRvb2xiYXItc2Vh cmNoLW5hdmlnYXRpb24uZW5hYmxlZCwgLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24uZW5hYmxl ZDphY3RpdmUgeworICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDE3MCwgMTcwLCAxNzAp OworICAgIG9wYWNpdHk6IDAuNzsKK30KKworI3NlYXJjaDpmb2N1cyB7CisgICAgb3V0bGluZTog bm9uZTsKK30KKworLnRvb2xiYXItc2VhcmNoIHsKKyAgICBsaW5lLWhlaWdodDogMTlweDsKK30K KworLnRvb2xiYXItc2VhcmNoLWNvbnRyb2wgeworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsK KyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Cisg ICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDIwMiwgMjAyLCAyMDIpOworICAgIG1hcmdpbjogMnB4 OworICAgIGhlaWdodDogMjBweDsKKyAgICBib3JkZXItcmFkaXVzOiAycHg7CisgICAgcGFkZGlu Zy1yaWdodDogMzZweDsKIH0KIAogLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24udG9vbGJhci1z ZWFyY2gtbmF2aWdhdGlvbi1wcmV2IHsKQEAgLTI5NCwxOCArMzMwLDE4IEBAIGJvZHkuZGV0YWNo ZWQucGxhdGZvcm0tbWFjLXNub3dsZW9wYXJkICN0b29sYmFyLWRyb3Bkb3duIHsKICAgICBiYWNr Z3JvdW5kLWltYWdlOiB1cmwoSW1hZ2VzL3NlYXJjaE5leHQucG5nKTsKIH0KIAotLnRvb2xiYXIt c2VhcmNoLW5hdmlnYXRpb24taGlkZGVuIHsKLSAgICBiYWNrZ3JvdW5kOiBub25lOwotfQotCiBi b2R5LmNvbXBhY3QgI3NlYXJjaCB7CiAgICAgZm9udC1zaXplOiAxMXB4OwogfQogCiAuc2VhcmNo LXJlc3VsdHMtbWF0Y2hlcyB7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgIG1pbi13 aWR0aDogNzBweDsKKyAgICBtaW4taGVpZ2h0OiAxMHB4OworICAgIHRleHQtYWxpZ246IHJpZ2h0 OwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwg MjU1LCAwLjUpIDAgMXB4IDA7Ci0gICAgcGFkZGluZy1sZWZ0OiA0cHg7CisgICAgcGFkZGluZzog MCA0cHg7CisgICAgY29sb3I6IHJnYigxNjUsIDE2NSwgMTY1KTsKIH0KIAogLnRvb2xiYXItaXRl bS5lbGVtZW50cyAudG9vbGJhci1pY29uIHsKQEAgLTI3ODUsMTAgKzI4MjEsNSBAQCBib2R5LnBs YXRmb3JtLW1hYyAjZHJhd2VyLXN0YXR1cy1iYXIgLnNlYXJjaC1zdGF0dXMtYmFyLXByb2dyZXNz IHsKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAg ICBwYWRkaW5nLWxlZnQ6IDdweDsKLSAgICBwYWRkaW5nLWJvdHRvbTogN3B4OwotfQotCi0uaW5z cGVjdG9yLWZvb3RlciA+IGRpdiB7Ci0gICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKKyAgICBw YWRkaW5nLWxlZnQ6IDVweDsKIH0K