156759 2016-04-19 14:20:59 -0700 Web Inspector: Use debounce proxies in a couple more places 2016-04-20 14:59:00 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1185160 0 timothy 2016-04-19 14:20:59 -0700 Replace some old *Soon() functions with the soon proxy. 1185162 1 276757 timothy 2016-04-19 14:26:08 -0700 Created attachment 276757 Patch 1185163 2 webkit-bug-importer 2016-04-19 14:27:52 -0700 <rdar://problem/25813633> 1185164 3 webkit-bug-importer 2016-04-19 14:27:53 -0700 <rdar://problem/25813634> 1185192 4 276764 timothy 2016-04-19 15:36:47 -0700 Created attachment 276764 Patch 1185193 5 276765 timothy 2016-04-19 15:38:39 -0700 Created attachment 276765 Patch 1185194 6 timothy 2016-04-19 15:39:27 -0700 Stupid webkit-patch… 1185546 7 276757 joepeck 2016-04-20 14:37:49 -0700 Comment on attachment 276757 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276757&action=review r=me, you can cq+ once the other lands > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:36 > - this.contentView.element.addEventListener("scroll", this._updateContentOverflowShadowVisibilitySoon.bind(this)); > + this.contentView.element.addEventListener("scroll", this.soon._updateContentOverflowShadowVisibility); This may have just blown my mind. 1185556 8 276757 timothy 2016-04-20 14:58:53 -0700 Comment on attachment 276757 Patch https://trac.webkit.org/changeset/199790 276757 2016-04-19 14:26:08 -0700 2016-04-20 14:58:53 -0700 Patch bug-156759-20160419142627.patch text/plain 9442 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 N2JlYmZkOWNhODZhOTVlYmFkNWRjZjc2YTJkM2Y4ZDljYjViMzU0Li5jM2I2ZWExNzE2OGU4ODBi MDhjOTgxZWE0YmRhY2QwNzA1YzZmMDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNi0wNC0xOSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVXNlIGRlYm91bmNlIHByb3hpZXMgaW4gYSBj b3VwbGUgbW9yZSBwbGFjZXMKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU2NzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5fZGlzcGF0Y2hDdXJy ZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5fY29udGVudFZpZXdTZWxlY3Rpb25QYXRoQ29t cG9uZW50RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5w cm90b3R5cGUuX2NvbnRlbnRWaWV3U3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hh bmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuX2Rp c3BhdGNoQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZUV2ZW50U29vbik6IERlbGV0 ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlVXBkYXRlci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlVXBkYXRlci5wcm90b3R5cGUuX2F0dHJpYnV0ZXNV cGRhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlVXBkYXRlci5wcm90b3R5cGUu X2NoYXJhY3RlckRhdGFNb2RpZmllZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVw ZGF0ZXIucHJvdG90eXBlLl9ub2RlSW5zZXJ0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRP TVRyZWVVcGRhdGVyLnByb3RvdHlwZS5fbm9kZVJlbW92ZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVVcGRhdGVyLnByb3RvdHlwZS5fdXBkYXRlTW9kaWZpZWROb2Rlcyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIucHJvdG90eXBlLl91cGRhdGVNb2RpZmll ZE5vZGVzU29vbik6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25T aWRlYmFyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFu ZWwucHJvdG90eXBlLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdHJl ZUVsZW1lbnRBZGRlZE9yQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlv blNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3RyZWVFbGVtZW50RGlzY2xvc3VyZURpZENoYW5nZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUu X3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zpc2liaWxpdHlTb29uKTogRGVsZXRlZC4KKwor MjAxNi0wNC0xOSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAg ICAgV2ViIEluc3BlY3RvcjogTWFrZSBkZWJvdW5jZSB1c2UgYW4gRVM2IFByb3h5CiAKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njc1NgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJy b3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50QnJvd3Nlci5qcwppbmRleCA0OGI3MzAyMjcwMGIxZGFkNjllNmU4ZWM5M2RmMDFmZDk2Mjdk YmFlLi43MzhmNjUxYjZhMTlhNTM2NzkwY2YxMTkwZGM4NjVjN2M1MDAwMzNhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50QnJvd3Nlci5qcwpAQCAtNDIxLDE5ICs0MjEsOSBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJy b3dzZXIgPSBjbGFzcyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAg ICAgICAgIH0KICAgICB9CiAKLSAgICBfZGlzcGF0Y2hDdXJyZW50UmVwcmVzZW50ZWRPYmplY3Rz RGlkQ2hhbmdlRXZlbnRTb29uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9jdXJyZW50UmVw cmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlVGltZW91dCkKLSAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgdGhpcy5fY3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZVRpbWVvdXQgPSBz ZXRUaW1lb3V0KHRoaXMuX2Rpc3BhdGNoQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5n ZUV2ZW50LmJpbmQodGhpcyksIDApOwotICAgIH0KLQogICAgIF9kaXNwYXRjaEN1cnJlbnRSZXBy ZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2VFdmVudCgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5f Y3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZVRpbWVvdXQpIHsKLSAgICAgICAgICAg IGNsZWFyVGltZW91dCh0aGlzLl9jdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlVGlt ZW91dCk7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5fY3VycmVudFJlcHJlc2VudGVkT2JqZWN0 c0RpZENoYW5nZVRpbWVvdXQ7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5fZGlzcGF0Y2hDdXJy ZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnQuY2FuY2VsRGVib3VuY2UoKTsKIAog ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVu dEJyb3dzZXIuRXZlbnQuQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSk7CiAgICAg fQpAQCAtNDUwLDcgKzQ0MCw3IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGNsYXNz IENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgICAgICB0aGlz Ll9uYXZpZ2F0aW9uQmFyLm5lZWRzTGF5b3V0KCk7CiAKLSAgICAgICAgdGhpcy5fZGlzcGF0Y2hD dXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnRTb29uKCk7CisgICAgICAgIHRo aXMuc29vbi5fZGlzcGF0Y2hDdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnQo KTsKICAgICB9CiAKICAgICBfY29udGVudFZpZXdTdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVj dHNEaWRDaGFuZ2UoZXZlbnQpCkBAIC00NTgsNyArNDQ4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRl bnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmll dwogICAgICAgICBpZiAoZXZlbnQudGFyZ2V0ICE9PSB0aGlzLmN1cnJlbnRDb250ZW50VmlldykK ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl9kaXNwYXRjaEN1cnJlbnRSZXBy ZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2VFdmVudFNvb24oKTsKKyAgICAgICAgdGhpcy5zb29uLl9k aXNwYXRjaEN1cnJlbnRSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2VFdmVudCgpOwogICAgIH0K IAogICAgIF9jdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UoZXZlbnQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlVXBkYXRlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVVcGRh dGVyLmpzCmluZGV4IGVlNWQyYjc5YzJmOGY2ZjA4NDc3ZGFjNmRlMmE5M2Q2M2I4YzI3NDguLjZi NjI2MGUzN2QyYjlmOWRiNDA3ZGY5OGQ0ZDcyNzBiMWI5MGNlMmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVVcGRhdGVyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVVcGRh dGVyLmpzCkBAIC01NywyOCArNTcsMjggQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVVcGRhdGVyLnBy b3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3JlY2VudGx5TW9kaWZpZWROb2Rlcy5w dXNoKHtub2RlOiBldmVudC5kYXRhLm5vZGUsIHVwZGF0ZWQ6IHRydWUsIGF0dHJpYnV0ZTogZXZl bnQuZGF0YS5uYW1lfSk7CiAgICAgICAgIGlmICh0aGlzLl90cmVlT3V0bGluZS5fdmlzaWJsZSkK LSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXNTb29uKCk7CisgICAgICAgICAg ICB0aGlzLnNvb24uX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsKICAgICB9LAogCiAgICAgX2NoYXJh Y3RlckRhdGFNb2RpZmllZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9y ZWNlbnRseU1vZGlmaWVkTm9kZXMucHVzaCh7bm9kZTogZXZlbnQuZGF0YS5ub2RlLCB1cGRhdGVk OiB0cnVlfSk7CiAgICAgICAgIGlmICh0aGlzLl90cmVlT3V0bGluZS5fdmlzaWJsZSkKLSAgICAg ICAgICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXNTb29uKCk7CisgICAgICAgICAgICB0aGlz LnNvb24uX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsKICAgICB9LAogCiAgICAgX25vZGVJbnNlcnRl ZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVk Tm9kZXMucHVzaCh7bm9kZTogZXZlbnQuZGF0YS5ub2RlLCBwYXJlbnQ6IGV2ZW50LmRhdGEucGFy ZW50LCBpbnNlcnRlZDogdHJ1ZX0pOwogICAgICAgICBpZiAodGhpcy5fdHJlZU91dGxpbmUuX3Zp c2libGUpCi0gICAgICAgICAgICB0aGlzLl91cGRhdGVNb2RpZmllZE5vZGVzU29vbigpOworICAg ICAgICAgICAgdGhpcy5zb29uLl91cGRhdGVNb2RpZmllZE5vZGVzKCk7CiAgICAgfSwKIAogICAg IF9ub2RlUmVtb3ZlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9yZWNl bnRseU1vZGlmaWVkTm9kZXMucHVzaCh7bm9kZTogZXZlbnQuZGF0YS5ub2RlLCBwYXJlbnQ6IGV2 ZW50LmRhdGEucGFyZW50LCByZW1vdmVkOiB0cnVlfSk7CiAgICAgICAgIGlmICh0aGlzLl90cmVl T3V0bGluZS5fdmlzaWJsZSkKLSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXNT b29uKCk7CisgICAgICAgICAgICB0aGlzLnNvb24uX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsKICAg ICB9LAogCiAgICAgX2NoaWxkTm9kZUNvdW50VXBkYXRlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC04 OCwxOSArODgsOSBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdHJlZUVsZW1lbnQuaGFzQ2hpbGRyZW4gPSBldmVudC5kYXRhLmhhc0NoaWxk Tm9kZXMoKTsKICAgICB9LAogCi0gICAgX3VwZGF0ZU1vZGlmaWVkTm9kZXNTb29uOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdXBkYXRlTW9kaWZpZWROb2Rlc1RpbWVvdXQp Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXNU aW1lb3V0ID0gc2V0VGltZW91dCh0aGlzLl91cGRhdGVNb2RpZmllZE5vZGVzLmJpbmQodGhpcyks IDApOwotICAgIH0sCi0KICAgICBfdXBkYXRlTW9kaWZpZWROb2RlczogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgaWYgKHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXNUaW1lb3V0KSB7Ci0gICAg ICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fdXBkYXRlTW9kaWZpZWROb2Rlc1RpbWVvdXQpOwot ICAgICAgICAgICAgdGhpcy5fdXBkYXRlTW9kaWZpZWROb2Rlc1RpbWVvdXQgPSBudWxsOwotICAg ICAgICB9CisgICAgICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXMuY2FuY2VsRGVib3VuY2Uo KTsKIAogICAgICAgICBsZXQgdXBkYXRlZFBhcmVudFRyZWVFbGVtZW50cyA9IFtdOwogICAgICAg ICBmb3IgKGxldCByZWNlbnRseU1vZGlmaWVkTm9kZSBvZiB0aGlzLl9yZWNlbnRseU1vZGlmaWVk Tm9kZXMpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IDg0YzUz NDdjZGViYTlhODVjNzk2M2M3MzU0ODhlNjcyNTNmMDRmMjQuLjA2ZDY4MjY1ZDI5MDc5NTU0Y2Nm MWY4MmIyYzQ5ZDdmZTNlYThmNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5l bC5qcwpAQCAtMzMsNyArMzMsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5l bCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogCiAgICAgICAg IHRoaXMuX3Zpc2libGVDb250ZW50VHJlZU91dGxpbmVzID0gbmV3IFNldDsKIAotICAgICAgICB0 aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgdGhpcy5f dXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eVNvb24uYmluZCh0aGlzKSk7Cisg ICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwi LCB0aGlzLnNvb24uX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zpc2liaWxpdHkpOwogCiAg ICAgICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRlQ29udGVudFRyZWVP dXRsaW5lKHRydWUpOwogICAgICAgICB0aGlzLl9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSA9 IG51bGw7CkBAIC01Myw3ICs1Myw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBh bmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAgICAgICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdG9wT3ZlcmZsb3dTaGFkb3dFbGVt ZW50KTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2JvdW5kVXBkYXRlQ29udGVudE92ZXJm bG93U2hhZG93VmlzaWJpbGl0eSA9IHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zp c2liaWxpdHlTb29uLmJpbmQodGhpcyk7CisgICAgICAgIHRoaXMuX2JvdW5kVXBkYXRlQ29udGVu dE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eSA9IHRoaXMuc29vbi5fdXBkYXRlQ29udGVudE92ZXJm bG93U2hhZG93VmlzaWJpbGl0eTsKICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInJl c2l6ZSIsIHRoaXMuX2JvdW5kVXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eSk7 CiAKICAgICAgICAgdGhpcy5fZmlsdGVyc1NldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRp bmcoaWRlbnRpZmllciArICItbmF2aWdhdGlvbi1zaWRlYmFyLWZpbHRlcnMiLCB7fSk7CkBAIC00 ODYsMTggKzQ4NiwxMCBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNs YXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgIH0KIAogICAgIC8v IFByaXZhdGUKLSAgICAKLSAgICBfdXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0 eVNvb24oKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1No YWRvd1Zpc2liaWxpdHlJZGVudGlmaWVyKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zpc2liaWxpdHlJZGVudGlmaWVyID0g c2V0VGltZW91dCh0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5LmJp bmQodGhpcyksIDApOwotICAgIH0KIAogICAgIF91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dW aXNpYmlsaXR5KCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1No YWRvd1Zpc2liaWxpdHlJZGVudGlmaWVyID0gdW5kZWZpbmVkOworICAgICAgICB0aGlzLl91cGRh dGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5LmNhbmNlbERlYm91bmNlKCk7CiAKICAg ICAgICAgbGV0IHNjcm9sbEhlaWdodCA9IHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5zY3JvbGxI ZWlnaHQ7CiAgICAgICAgIGxldCBvZmZzZXRIZWlnaHQgPSB0aGlzLmNvbnRlbnRWaWV3LmVsZW1l bnQub2Zmc2V0SGVpZ2h0OwpAQCAtNjM2LDcgKzYyOCw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0 aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdl YkluCiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9jaGVja0ZvckVtcHR5RmlsdGVyUmVzdWx0 cygpOwotICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5 U29vbigpOworICAgICAgICB0aGlzLnNvb24uX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zp c2liaWxpdHkoKTsKIAogICAgICAgICBpZiAodGhpcy5zZWxlY3RlZCkKICAgICAgICAgICAgIHRo aXMuX2NoZWNrRWxlbWVudHNGb3JQZW5kaW5nVmlld1N0YXRlQ29va2llKFt0cmVlRWxlbWVudF0p OwpAQCAtNjQ2LDcgKzYzOCw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVs ID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAKICAgICBfdHJl ZUVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdlKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5f dXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eVNvb24oKTsKKyAgICAgICAgdGhp cy5zb29uLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5KCk7CiAgICAgfQog CiAgICAgX3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UoZXZlbnQpCg== 276764 2016-04-19 15:36:47 -0700 2016-04-19 15:37:44 -0700 Patch bug-156759-20160419153706.patch text/plain 38316 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl Y2EyODc4YzAxMGRkZDk2ZTE3NDg4Y2ZjNWExNTFlYWIwZjFkMmMzLi5kOGNkYWJjNTkyZTI0ZmZj Nzc1NzczYjU0YjdmMjcwYzZhZDAwNTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxMTcgQEAKIDIwMTYtMDQtMTggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERhdGFHcmlkIHNob3VsZCBiZSB2aXJ0dWFs aXplZCBzbyBpdCBvbmx5IHJlbmRlcnMgdmlzaWJsZSByb3dzCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY2MworICAgICAgICByZGFyOi8vcHJv YmxlbS8yNTc2NTI1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90 eXBlLnNldCBjb250YWluZXJSZWdpb25zKToKKyAgICAgICAgQ2FsbCB1cGxhdGVMYXlvdXRJZk5l ZWRlZCBzaW5jZSB3ZSBkb24ndCB1c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlVmlldy5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlckFzVGFibGUpOgor ICAgICAgICBTZXQgaW5saW5lIGFuZCB2YXJpYWJsZUhlaWdodFJvd3MgdG8gdHJ1ZSwgcmVtb3Zl IGRpcmVjdCBjbGFzc0xpc3QgYWRkLiBDYWxsIHVwZGF0ZUxheW91dElmTmVlZGVkIHNpbmNlIHdl IGRvbid0IHVzZSB2aWV3cyBoZXJlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZURhdGFHcmlk KToKKyAgICAgICAgU2V0IGlubGluZSB0byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBh ZGQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzczoKKyAgICAg ICAgKC5kYXRhLWdyaWQgdGQpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0YWJsZS5kYXRhKToKKyAg ICAgICAgKC5kYXRhLWdyaWQ6bm90KC52YXJpYWJsZS1oZWlnaHQtcm93cykgdGFibGUuZGF0YSk6 CisgICAgICAgICguZGF0YS1ncmlkOm5vdCgudmFyaWFibGUtaGVpZ2h0LXJvd3MpIHRhYmxlLmRh dGEub2RkLWZpcnN0LXplYnJhLXN0cmlwZSk6CisgICAgICAgICguZGF0YS1ncmlkLnZhcmlhYmxl LWhlaWdodC1yb3dzIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkpOgorICAgICAgICAoLmRh dGEtZ3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyOm50aC1jaGlsZChldmVu KSk6CisgICAgICAgICguZGF0YS1ncmlkLnZhcmlhYmxlLWhlaWdodC1yb3dzLm9kZC1maXJzdC16 ZWJyYS1zdHJpcGUgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQob2RkKSk6CisgICAgICAgICguZGF0 YS1ncmlkLnZhcmlhYmxlLWhlaWdodC1yb3dzLm9kZC1maXJzdC16ZWJyYS1zdHJpcGUgdGFibGUu ZGF0YSB0cjpudGgtY2hpbGQoZXZlbikpOgorICAgICAgICAoLmRhdGEtZ3JpZC52YXJpYWJsZS1o ZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyLmZpbGxlcik6CisgICAgICAgIFVwZGF0ZWQgc3R5bGVz IHRvIHN1cHBvcnQgdmFyaWFibGUgaGVpZ2h0IHJvd3MgZGlyZWN0bHkgYW5kIGZsaXBwaW5nIHRo ZSBvcmRlciBvZiB0aGUgc3RyaXBlcworICAgICAgICB3aGVuIHRoZSB2aXJ0dXJhbCB0YWJsZSBz dGFydHMgYXQgYW4gb2RkIHJvdy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQpOiBBZGRlZCByb3dIZWln aHQgYW5kIHJvd3MuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLmdl dCBpbmxpbmUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5 cGUuc2V0IGlubGluZSk6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZS5nZXQgdmFyaWFibGVIZWlnaHRSb3dzKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCB2YXJpYWJsZUhlaWdodFJvd3MpOiBBZGRlZC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUubGF5b3V0KTogQ2FsbCBf dXBkYXRlVmlzaWJsZVJvd3MuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90 eXBlLl9ub3RlUm93c0NoYW5nZWQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5wcm90b3R5cGUuX3VwZGF0ZVZpc2libGVSb3dzKTogQWRkZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9zb3J0Tm9kZXNDYWxsYmFjayk6IFVwZGF0ZSB0 byBub3QgdXNlIHRoZSBET00uCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnBy b3RvdHlwZS5zZXQgaGFzQ2hpbGRyZW4pOiBDYWxsIG5lZWRzTGF5b3V0LgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY29sbGFwc2UpOiBDYWxsIG5lZWRzTGF5 b3V0LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuZXhwYW5k KTogQ2FsbCBuZWVkc0xheW91dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUu cHJvdG90eXBlLl9hdHRhY2gpOiBDYWxsIF9ub3RlUm93c0NoYW5nZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fZGV0YWNoKTogQ2FsbCBfbm90ZVJvd3ND aGFuZ2VkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVVzZXJRdWVy eVN1Y2Nlc3NWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlVXNlclF1ZXJ5 U3VjY2Vzc1ZpZXcpOgorICAgICAgICBTZXQgaW5saW5lIHRvIHRydWUsIHJlbW92ZSBkaXJlY3Qg Y2xhc3NMaXN0IGFkZC4gQ2FsbCB1cGxhdGVMYXlvdXRJZk5lZWRlZCBzaW5jZSB3ZSBkb24ndCB1 c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1Nl Y3Rpb24uY3NzOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdy aWQgdGQudmFsdWUtY29sdW1uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCAuZGF0YS1ncmlkIHRhYmxlLmRhdGEpOiBEZWxldGVkLgorICAgICAgICAoLmRldGFpbHMtc2Vj dGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdHI6bnRoLWNoaWxkKGV2ZW4pKTogRGVsZXRlZC4K KyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZGF0YS1ncmlkIHRyOm50aC1j aGlsZChvZGQpKTogRGVsZXRlZC4KKyAgICAgICAgTm93IGhhbmRsZWQgYnkgRGF0YUdyaWQuY3Nz IGRpcmVjdGx5LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlv bkRhdGFHcmlkUm93LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uRGF0 YUdyaWRSb3cucHJvdG90eXBlLnNldCBkYXRhR3JpZCk6CisgICAgICAgIFNldCBpbmxpbmUgYW5k IHZhcmlhYmxlSGVpZ2h0Um93cyB0byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBhZGQu IENhbGwgdXBsYXRlTGF5b3V0SWZOZWVkZWQgc2luY2Ugd2UgZG9uJ3QgdXNlIHZpZXdzIGhlcmUu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdEluc3RhbmNlc0Nv bnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5oZWFwLXNuYXBzaG90ID4gLmRhdGEtZ3JpZCB0cjpt YXRjaGVzKC5zZWxlY3RlZCwgOmhvdmVyKSB0ZCAuZ28tdG8tYXJyb3cpOgorICAgICAgICAoLmhl YXAtc25hcHNob3QgLmljb24pOgorICAgICAgICBSZW1vdmUgbWFyZ2luLXRvcCB0byBmaXQgaW5z aWRlIDIwcHggcm93IGluc3RlYWQgb2YgMjFweC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5jc3M6CisgICAgICAg ICguY29udGVudC12aWV3LmluZGV4ZWQtZGF0YWJhc2Utb2JqZWN0LXN0b3JlID4gLmRhdGEtZ3Jp ZCB0YWJsZS5kYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKC5jb250ZW50LXZpZXcuaW5kZXhlZC1k YXRhYmFzZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxk KGV2ZW4pKTogRGVsZXRlZC4KKyAgICAgICAgKC5jb250ZW50LXZpZXcuaW5kZXhlZC1kYXRhYmFz ZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkp OiBEZWxldGVkLgorICAgICAgICAoLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVj dC1zdG9yZSA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSB0ci5maWxsZXIpOiBEZWxldGVkLgorICAg ICAgICBOb3cgaGFuZGxlZCBieSBEYXRhR3JpZC5jc3MgZGlyZWN0bHkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250 ZW50Vmlldyk6CisgICAgICAgIFNldCB2YXJpYWJsZUhlaWdodFJvd3MgdG8gdHJ1ZS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLnBy b3RvdHlwZS5fYnVpbGREYXRhR3JpZFNlY3Rpb24pOgorICAgICAgICBTZXQgaW5saW5lIHRvIHRy dWUsIHJlbW92ZSBkaXJlY3QgY2xhc3NMaXN0IGFkZC4gQ2FsbCB1cGxhdGVMYXlvdXRJZk5lZWRl ZCBzaW5jZSB3ZSBkb24ndCB1c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvTG9nQ29udGVudFZpZXcuY3NzOgorICAgICAgICAoLmNvbnNvbGUtaXRlbSAuZGF0 YS1ncmlkIHRhYmxlLmRhdGEpOiBEZWxldGVkLgorICAgICAgICAoLmNvbnNvbGUtaXRlbSAuZGF0 YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKGV2ZW4pKTogRGVsZXRlZC4KKyAgICAgICAg Tm93IGhhbmRsZWQgYnkgRGF0YUdyaWQuY3NzIGRpcmVjdGx5LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250 ZW50LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0ZCk6IERlbGV0ZWQuCisgICAgICAg ICguY29udGVudC12aWV3Lm5ldHdvcmstZ3JpZCA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSk6IERl bGV0ZWQuCisgICAgICAgIE5vdyBoYW5kbGVkIGJ5IERhdGFHcmlkLmNzcyBkaXJlY3RseS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkKToKKyAgICAgICAgU2V0IGlubGluZSB0 byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBhZGQuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3LmNzczoKKyAgICAgICAgKC5wcm9maWxlID4gLmRhdGEt Z3JpZCB0ZCAuaWNvbik6CisgICAgICAgICgucHJvZmlsZSA+IC5kYXRhLWdyaWQgdHI6bWF0Y2hl cyguc2VsZWN0ZWQsIDpob3ZlcikgLmdvLXRvLWFycm93KToKKyAgICAgICAgUmVtb3ZlIG1hcmdp bi10b3AgdG8gZml0IGluc2lkZSAyMHB4IHJvdyBpbnN0ZWFkIG9mIDIxcHguCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzOgor ICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAuY29udGVudC1icm93 c2VyID4gLmNvbnRlbnQtdmlldy1jb250YWluZXIgPiAudGltZWxpbmUtdmlldyA+IC5kYXRhLWdy aWQgdGQpOiBEZWxldGVkLgorICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRp bmcgPiAuY29udGVudC1icm93c2VyID4gLmNvbnRlbnQtdmlldy1jb250YWluZXIgPiAudGltZWxp bmUtdmlldyA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSk6IERlbGV0ZWQuCisgICAgICAgIE5vdyBo YW5kbGVkIGJ5IERhdGFHcmlkLmNzcyBkaXJlY3RseS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVmFyaWFibGVzLmNzczoKKyAgICAgICAgKDpyb290KTogQWRkZWQgemVicmEgc3Ry aXBlIGNvbG9ycy4KKworMjAxNi0wNC0xOCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBs ZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvblNpZGViYXJQYW5lbCBk b2VzIGEgbG90IG9mIHN0eWxlIHJlY2FsYyBhbmQgbGF5b3V0IG9uIGJ1c3kgc2l0ZXMKIAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NzA0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRl ZFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCAxMmNhM2Q2Mzk0OTIz Y2JkZDU0MmQ5ZDI5ZjM5NTRmZjJjNGZmYzAzLi5kODU0ZjdhZTg0M2M0ZDBmYTM5ODZiY2E4NDA5 ZTBlNjhiZTkxOTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwu anMKQEAgLTE0Nyw2ICsxNDcsOCBAQCBXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZURldGFpbHNQ YW5lbCA9IGNsYXNzIENvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcwogICAgICAgICAg ICAgdGhpcy5fY29udGFpbmVyUmVnaW9uc0RhdGFHcmlkLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNw ZWN0b3IuRE9NVHJlZURhdGFHcmlkTm9kZShyZWdpb25Ob2RlKSk7CiAKICAgICAgICAgdGhpcy5f Y29udGFpbmVyUmVnaW9uc0Zsb3dTZWN0aW9uLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZSgiaGlk ZGVuIik7CisKKyAgICAgICAgdGhpcy5fY29udGFpbmVyUmVnaW9uc0RhdGFHcmlkLnVwZGF0ZUxh eW91dElmTmVlZGVkKCk7CiAgICAgfQogCiAgICAgY3NzU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3JTaG93UHJvcGVydHkocHJvcGVydHksIHNob3dTb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2Fn ZVZpZXcuanMKaW5kZXggNTZhYjcxNjU5YmY1NTc3MjM2MjU2MGM0YjllMDk3MTFmYTJlY2ZmMC4u ZjBiNjZlY2UzZjk5NGM1OTRkNTkyOTUxYThiZTQ5NGY3ZjFhODMxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNv bGVNZXNzYWdlVmlldy5qcwpAQCAtODA0LDkgKzgwNCwxMyBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVj dG9yLgogICAgICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIG91dHB1dCBzb21ldGhpbmcgZXh0cmEg aWYgdGhlIHByZXZpZXcgaXMgbG9zc2xlc3M/CiAKICAgICAgICAgdmFyIGRhdGFHcmlkID0gV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIGZs YXRWYWx1ZXMpOwotICAgICAgICBkYXRhR3JpZC5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGlu ZSIpOworICAgICAgICBkYXRhR3JpZC5pbmxpbmUgPSB0cnVlOworICAgICAgICBkYXRhR3JpZC52 YXJpYWJsZUhlaWdodFJvd3MgPSB0cnVlOworCiAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQo ZGF0YUdyaWQuZWxlbWVudCk7CiAKKyAgICAgICAgZGF0YUdyaWQudXBkYXRlTGF5b3V0SWZOZWVk ZWQoKTsKKwogICAgICAgICByZXR1cm4gZWxlbWVudDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRh R3JpZC5qcwppbmRleCBiNmRlYmZkMjZhYmZhMDE4MTA2YTU0NmZkM2I1ZTI2YTRiYTVhNWEyLi4w NDI3NTc1NzI2N2NlOTFjOTFmOGExYTAwMDQ3MjZmNGRlNzk5YzU5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRGF0YUdyaWQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZURh dGFHcmlkLmpzCkBAIC0zNCw3ICszNCw5IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRGF0YUdyaWQg PSBjbGFzcyBET01UcmVlRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuRGF0YUdyCiAKICAg ICAgICAgdGhpcy5fcHJldmlvdXNIb3ZlcmVkRWxlbWVudCA9IG51bGw7CiAKLSAgICAgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIsICJkb20tdHJlZS1kYXRhLWdyaWQiKTsK KyAgICAgICAgdGhpcy5pbmxpbmUgPSB0cnVlOworCisgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJkb20tdHJlZS1kYXRhLWdyaWQiKTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fb25tb3VzZW1vdmUuYmluZCh0aGlz KSwgZmFsc2UpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vv dXQiLCB0aGlzLl9vbm1vdXNlb3V0LmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcwppbmRl eCAyMTE4YTQ3YWVlYzYyNDNkMGRjOGI1YjZhYmU0Y2Q5MTRjNTBhMTdkLi4yZjMyMGQwOWI1M2Iy MjhhZWRjZmJjOTJmMjMzOGE5ZTQxNzY2Nzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCkBAIC0xMDksMTggKzEw OSwyMyBAQAogfQogCiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgewotICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgbGVmdDogMDsKLSAgICB0b3A6IDA7 CiAgICAgcmlnaHQ6IDA7Ci0gICAgYm90dG9tOiAwOwogICAgIGhlaWdodDogMTAwJTsKICAgICBi b3JkZXItdG9wOiAwIG5vbmUgdHJhbnNwYXJlbnQ7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGlu ZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgd2hpdGUsIHdoaXRlIDUwJSwgaHNsKDIxNCwgNDElLCA5 NiUpIDUwJSwgaHNsKDIxNCwgNDElLCA5NiUpKTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUg NDJweDsKICAgICB0YWJsZS1sYXlvdXQ6IGZpeGVkOwogfQogCisuZGF0YS1ncmlkOm5vdCgudmFy aWFibGUtaGVpZ2h0LXJvd3MpIHRhYmxlLmRhdGEgeworICAgIGJhY2tncm91bmQtaW1hZ2U6IGxp bmVhci1ncmFkaWVudCh0byBib3R0b20sIHZhcigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNr Z3JvdW5kLWNvbG9yKSwgdmFyKC0tZXZlbi16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29s b3IpIDUwJSwgdmFyKC0tb2RkLXplYnJhLXN0cmlwZS1yb3ctYmFja2dyb3VuZC1jb2xvcikgNTAl LCB2YXIoLS1vZGQtemVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKSk7CisgICAgYmFj a2dyb3VuZC1zaXplOiAxMDAlIDQwcHg7Cit9CisKKy5kYXRhLWdyaWQ6bm90KC52YXJpYWJsZS1o ZWlnaHQtcm93cykgdGFibGUuZGF0YS5vZGQtZmlyc3QtemVicmEtc3RyaXBlIHsKKyAgICBiYWNr Z3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCB2YXIoLS1vZGQtemVicmEt c3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKSwgdmFyKC0tb2RkLXplYnJhLXN0cmlwZS1yb3ct YmFja2dyb3VuZC1jb2xvcikgNTAlLCB2YXIoLS1ldmVuLXplYnJhLXN0cmlwZS1yb3ctYmFja2dy b3VuZC1jb2xvcikgNTAlLCB2YXIoLS1ldmVuLXplYnJhLXN0cmlwZS1yb3ctYmFja2dyb3VuZC1j b2xvcikpOworfQorCiAuZGF0YS1ncmlkLmlubGluZSB0YWJsZS5kYXRhIHsKICAgICBwb3NpdGlv bjogc3RhdGljOwogfQpAQCAtMTMzLDEwICsxMzgsMzEgQEAKICAgICBkaXNwbGF5OiB0YWJsZS1y b3c7CiB9CiAKKy5kYXRhLWdyaWQudmFyaWFibGUtaGVpZ2h0LXJvd3MgdGFibGUuZGF0YSB0cjpu dGgtY2hpbGQob2RkKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tb2RkLXplYnJhLXN0 cmlwZS1yb3ctYmFja2dyb3VuZC1jb2xvcik7Cit9CisKKy5kYXRhLWdyaWQudmFyaWFibGUtaGVp Z2h0LXJvd3MgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikgeworICAgIGJhY2tncm91bmQt Y29sb3I6IHZhcigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30K KworLmRhdGEtZ3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cy5vZGQtZmlyc3QtemVicmEtc3RyaXBl IHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkgeworICAgIGJhY2tncm91bmQtY29sb3I6IHZh cigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30KKworLmRhdGEt Z3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cy5vZGQtZmlyc3QtemVicmEtc3RyaXBlIHRhYmxlLmRh dGEgdHI6bnRoLWNoaWxkKGV2ZW4pIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1vZGQt emVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30KKworLmRhdGEtZ3JpZC52YXJp YWJsZS1oZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyLmZpbGxlciB7CisgLyogRklYTUU6IFRoaXMg c2hvdWxkIHNob3cgYW4gYWx0ZXJuYXRpbmcgc3RyaXBlLCBidXQgaXQgbmVlZHMgdG8ga25vdyBp ZiB0aGUgbGFzdCByb3cgaXMgZXZlbiBvciBvZGQuICovCisgICAgYmFja2dyb3VuZC1jb2xvcjog dmFyKC0tZXZlbi16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29sb3IpOworfQorCiAuZGF0 YS1ncmlkIHRkIHsKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwotICAgIGhlaWdodDogMTJweDsK LSAgICBsaW5lLWhlaWdodDogMTdweDsKKyAgICBoZWlnaHQ6IDE2cHg7CisgICAgbGluZS1oZWln aHQ6IDE2cHg7CiAgICAgcGFkZGluZzogMnB4IDZweDsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFw OwogICAgIG92ZXJmbG93OiBoaWRkZW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCmluZGV4IGVhNWQ1M2I2ZWRkYTQ4NzE1 NmM5MDJmMzUyODVjNWFhOTU0YzcxZTAuLjhjN2FlNWZiYWUzNWNlZDMzOTE5ZmM5NTFmZTE3MDY5 YzY0MzBlYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RhdGFHcmlkLmpzCkBAIC0zNyw2ICszNyw4IEBAIFdlYkluc3BlY3Rvci5EYXRh R3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAg dGhpcy5fc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5JbmRldGVy bWluYXRlOwogICAgICAgICB0aGlzLl9zb3J0T3JkZXJTZXR0aW5nID0gbnVsbDsKIAorICAgICAg ICB0aGlzLl9yb3dzID0gW107CisKICAgICAgICAgdGhpcy5jaGlsZHJlbiA9IFtdOwogICAgICAg ICB0aGlzLnNlbGVjdGVkTm9kZSA9IG51bGw7CiAgICAgICAgIHRoaXMuZXhwYW5kTm9kZXNXaGVu QXJyb3dpbmcgPSBmYWxzZTsKQEAgLTQ3LDYgKzQ5LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlk ID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlz LnNlbGVjdGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuZGF0YUdyaWQgPSB0aGlzOwogICAgICAg ICB0aGlzLmluZGVudFdpZHRoID0gMTU7CisgICAgICAgIHRoaXMucm93SGVpZ2h0ID0gMjA7CiAg ICAgICAgIHRoaXMucmVzaXplcnMgPSBbXTsKICAgICAgICAgdGhpcy5fY29sdW1uV2lkdGhzSW5p dGlhbGl6ZWQgPSBmYWxzZTsKIApAQCAtNjYsOCArNjksMTQgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0 aGlzLl9zY3JvbGxDb250YWluZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiAgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuY2xhc3NOYW1lID0gImRh dGEtY29udGFpbmVyIjsKIAotICAgICAgICB0aGlzLl9kYXRhVGFibGVFbGVtZW50ID0gdGhpcy5f c2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVhdGVDaGlsZCgidGFibGUiKTsKLSAgICAgICAgdGhp cy5fZGF0YVRhYmxlRWxlbWVudC5jbGFzc05hbWUgPSAiZGF0YSI7CisgICAgICAgIHRoaXMuX3Nj cm9sbExpc3RlbmVyID0gKCkgPT4gdGhpcy5uZWVkc0xheW91dCgpOworICAgICAgICB0aGlzLl9z Y3JvbGxDb250YWluZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3Nj cm9sbExpc3RlbmVyKTsKKworICAgICAgICB0aGlzLl90b3BEYXRhVGFibGVNYXJnaW5FbGVtZW50 ID0gdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7CisKKyAg ICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudCA9IHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1l bnQuY3JlYXRlQ2hpbGQoInRhYmxlIiwgImRhdGEiKTsKKworICAgICAgICB0aGlzLl9ib3R0b21E YXRhVGFibGVNYXJnaW5FbGVtZW50ID0gdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVh dGVDaGlsZCgiZGl2Iik7CiAKICAgICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd25JbkRhdGFUYWJsZS5iaW5kKHRo aXMpKTsKICAgICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMuX2NsaWNrSW5EYXRhVGFibGUuYmluZCh0aGlzKSk7CkBAIC03OSw2ICs4OCw3 IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5z cGVjdG9yLlZpZXcKICAgICAgICAgICAgIHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9vbmRibGNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsK ICAgICAgICAgICAgIHRoaXMuX2VkaXRDYWxsYmFjayA9IGVkaXRDYWxsYmFjazsKICAgICAgICAg fQorCiAgICAgICAgIGlmIChkZWxldGVDYWxsYmFjaykKICAgICAgICAgICAgIHRoaXMuX2RlbGV0 ZUNhbGxiYWNrID0gZGVsZXRlQ2FsbGJhY2s7CiAKQEAgLTg3LDggKzk3LDggQEAgV2ViSW5zcGVj dG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwog CiAgICAgICAgIC8vIFRoaXMgZWxlbWVudCBpcyB1c2VkIGJ5IERhdGFHcmlkTm9kZXMgdG8gbWFu aXB1bGF0ZSB0YWJsZSByb3dzIGFuZCBjZWxscy4KICAgICAgICAgdGhpcy5kYXRhVGFibGVCb2R5 RWxlbWVudCA9IHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQuY3JlYXRlQ2hpbGQoInRib2R5Iik7Ci0g ICAgICAgIHRoaXMuX2ZpbGxlclJvd0VsZW1lbnQgPSB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50 LmNyZWF0ZUNoaWxkKCJ0ciIpOwotICAgICAgICB0aGlzLl9maWxsZXJSb3dFbGVtZW50LmNsYXNz TmFtZSA9ICJmaWxsZXIiOworCisgICAgICAgIHRoaXMuX2ZpbGxlclJvd0VsZW1lbnQgPSB0aGlz LmRhdGFUYWJsZUJvZHlFbGVtZW50LmNyZWF0ZUNoaWxkKCJ0ciIsICJmaWxsZXIiKTsKIAogICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5faGVhZGVyVGFibGVFbGVtZW50KTsK ICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Njcm9sbENvbnRhaW5lckVs ZW1lbnQpOwpAQCAtMjM3LDYgKzI0NywzNCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFz cyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB0aGlzLnNv cnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nLnZh bHVlOwogICAgIH0KIAorICAgIGdldCBpbmxpbmUoKSB7IHJldHVybiB0aGlzLl9pbmxpbmU7IH0K KworICAgIHNldCBpbmxpbmUoeCkKKyAgICB7CisgICAgICAgIHRoaXMuX2lubGluZSA9IHggfHwg ZmFsc2U7CisKKyAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJpbmxpbmUi LCB0aGlzLl9pbmxpbmUpOworCisgICAgICAgIGlmICh0aGlzLl9pbmxpbmUgfHwgdGhpcy5fdmFy aWFibGVIZWlnaHRSb3dzKQorICAgICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVu dC5yZW1vdmVFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGxMaXN0ZW5lcik7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgdGhpcy5fc2Nyb2xsTGlzdGVuZXIpOworICAgIH0KKwor ICAgIGdldCB2YXJpYWJsZUhlaWdodFJvd3MoKSB7IHJldHVybiB0aGlzLl92YXJpYWJsZUhlaWdo dFJvd3M7IH0KKworICAgIHNldCB2YXJpYWJsZUhlaWdodFJvd3MoeCkKKyAgICB7CisgICAgICAg IHRoaXMuX3ZhcmlhYmxlSGVpZ2h0Um93cyA9IHggfHwgZmFsc2U7CisKKyAgICAgICAgdGhpcy5f ZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJ2YXJpYWJsZS1oZWlnaHQtcm93cyIsIHRoaXMuX3Zh cmlhYmxlSGVpZ2h0Um93cyk7CisKKyAgICAgICAgaWYgKHRoaXMuX2lubGluZSB8fCB0aGlzLl92 YXJpYWJsZUhlaWdodFJvd3MpCisgICAgICAgICAgICB0aGlzLl9zY3JvbGxDb250YWluZXJFbGVt ZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3Njcm9sbExpc3RlbmVyKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGxMaXN0ZW5lcik7CisgICAgfQor CiAgICAgX3VwZGF0ZVNvcnRlZENvbHVtbihvbGRTb3J0Q29sdW1uSWRlbnRpZmllcikKICAgICB7 CiAgICAgICAgIGlmICh0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcpCkBAIC01MDYs MTEgKzU0NCw5IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgaWYgKGNvbHVtblsiY29sbGFwc2VzR3JvdXAi XSkgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoY29sdW1uWyJncm91cCJdICE9PSBjb2x1 bW5bImNvbGxhcHNlc0dyb3VwIl0pOwogCi0gICAgICAgICAgICB2YXIgZGl2aWRlckVsZW1lbnQg PSBoZWFkZXJDZWxsRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7Ci0gICAgICAgICAgICBkaXZp ZGVyRWxlbWVudC5jbGFzc05hbWUgPSAiZGl2aWRlciI7CisgICAgICAgICAgICB2YXIgZGl2aWRl ckVsZW1lbnQgPSBoZWFkZXJDZWxsRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgImRpdmlkZXIi KTsKIAotICAgICAgICAgICAgdmFyIGNvbGxhcHNlRGl2ID0gaGVhZGVyQ2VsbEVsZW1lbnQuY3Jl YXRlQ2hpbGQoImRpdiIpOwotICAgICAgICAgICAgY29sbGFwc2VEaXYuY2xhc3NOYW1lID0gImNv bGxhcHNlci1idXR0b24iOworICAgICAgICAgICAgdmFyIGNvbGxhcHNlRGl2ID0gaGVhZGVyQ2Vs bEVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJjb2xsYXBzZXItYnV0dG9uIik7CiAgICAgICAg ICAgICBjb2xsYXBzZURpdi50aXRsZSA9IHRoaXMuX2NvbGxhcHNlckJ1dHRvbkNvbGxhcHNlQ29s dW1uc1Rvb2xUaXAoKTsKICAgICAgICAgICAgIGxpc3RlbmVycy5yZWdpc3Rlcihjb2xsYXBzZURp diwgIm1vdXNlb3ZlciIsIHRoaXMuX21vdXNlb3ZlckNvbHVtbkNvbGxhcHNlcik7CiAgICAgICAg ICAgICBsaXN0ZW5lcnMucmVnaXN0ZXIoY29sbGFwc2VEaXYsICJtb3VzZW91dCIsIHRoaXMuX21v dXNlb3V0Q29sdW1uQ29sbGFwc2VyKTsKQEAgLTYzOCw2ICs2NzQsOCBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAg ICAgICAgICB0aGlzLl9wb3NpdGlvblJlc2l6ZXJFbGVtZW50cygpOwogICAgICAgICAgICAgdGhp cy5fcG9zaXRpb25IZWFkZXJWaWV3cygpOwogICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fdXBk YXRlVmlzaWJsZVJvd3MoKTsKICAgICB9CiAKICAgICBjb2x1bW5XaWR0aHNNYXAoKQpAQCAtNzkx LDYgKzgyOSw4MSBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRl bmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIH0KICAgICB9CiAKKyAgICBfbm90ZVJvd3ND aGFuZ2VkKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3ByZXZpb3VzUmV2ZWFsZWRSb3dDb3VudCA9 IE5hTjsKKworICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CisgICAgfQorCisgICAgX3VwZGF0 ZVZpc2libGVSb3dzKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9pbmxpbmUgfHwgdGhpcy5f dmFyaWFibGVIZWlnaHRSb3dzKSB7CisgICAgICAgICAgICAvLyBJbmxpbmUgRGF0YUdyaWRzIGFs d2F5cyBzaG93IGFsbCB0aGVpciByb3dzLCBzbyB3ZSBjYW4ndCB2aXJ0dWFsaXplIHRoZW0uCisg ICAgICAgICAgICAvLyBJbiBnZW5lcmFsLCBpbmxpbmUgRGF0YUdyaWRzIHVzdWFsbHkgaGF2ZSBh IHNtYWxsIG51bWJlciBvZiByb3dzLgorCisgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBh IHNsb3cgcGF0aCBmb3IgdmFyaWFibGUgaGVpZ2h0IHJvd3MgdGhhdCBpcyBzaW1pbGFyIHRvIHRo ZSBvbGQKKyAgICAgICAgICAgIC8vIG5vbi12aXJ0dWFsaXplZCBEYXRhR3JpZC4gSWRlYWxseSB3 ZSB3b3VsZCB0cmFjayByb3cgaGVpZ2h0IHBlci1EYXRhR3JpZE5vZGUKKyAgICAgICAgICAgIC8v IGFuZCB0aGVuIHdlIGNvdWxkIHZpcnR1YWxpemUgZXZlbiB0aG9zZSBjYXNlcy4gQ3VycmVudGx5 IHZhcmlhYmxlIGhlaWdodCByb3cKKyAgICAgICAgICAgIC8vIERhdGFHcmlkcyBkb24ndCB1c3Vh bGx5IGhhdmUgbWFueSByb3dzLCBvdGhlciB0aGFuIEluZGV4ZWREQi4KKworICAgICAgICAgICAg bGV0IG5leHRFbGVtZW50ID0gdGhpcy5kYXRhVGFibGVCb2R5RWxlbWVudC5sYXN0Q2hpbGQ7Cisg ICAgICAgICAgICBmb3IgKGxldCBpID0gdGhpcy5fcm93cy5sZW5ndGggLSAxOyBpID49IDA7IC0t aSkgeworICAgICAgICAgICAgICAgIGxldCByb3dFbGVtZW50ID0gdGhpcy5fcm93c1tpXS5lbGVt ZW50OworICAgICAgICAgICAgICAgIGlmIChyb3dFbGVtZW50Lm5leHRTaWJsaW5nICE9PSBuZXh0 RWxlbWVudCkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5kYXRhVGFibGVCb2R5RWxlbWVudC5p bnNlcnRCZWZvcmUocm93RWxlbWVudCwgbmV4dEVsZW1lbnQpOworICAgICAgICAgICAgICAgIG5l eHRFbGVtZW50ID0gcm93RWxlbWVudDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKKyAgICAgICAgbGV0IHJvd0hlaWdodCA9IHRoaXMucm93SGVpZ2h0 OworICAgICAgICBsZXQgdXBkYXRlT2Zmc2V0VGhyZXNob2xkID0gcm93SGVpZ2h0ICogNTsKKwor ICAgICAgICBsZXQgcmV2ZWFsZWRSb3dzID0gdGhpcy5fcm93cy5maWx0ZXIoKHJvdykgPT4gcm93 LnJldmVhbGVkKTsKKworICAgICAgICBsZXQgc2Nyb2xsVG9wID0gdGhpcy5fc2Nyb2xsQ29udGFp bmVyRWxlbWVudC5zY3JvbGxUb3A7CisgICAgICAgIGxldCBzY3JvbGxIZWlnaHQgPSB0aGlzLl9z Y3JvbGxDb250YWluZXJFbGVtZW50Lm9mZnNldEhlaWdodDsKKworICAgICAgICBsZXQgY3VycmVu dFRvcE1hcmdpbiA9IHRoaXMuX3RvcERhdGFUYWJsZU1hcmdpbkVsZW1lbnQub2Zmc2V0SGVpZ2h0 OworICAgICAgICBsZXQgY3VycmVudEJvdHRvbU1hcmdpbiA9IHRoaXMuX2JvdHRvbURhdGFUYWJs ZU1hcmdpbkVsZW1lbnQub2Zmc2V0SGVpZ2h0OworICAgICAgICBsZXQgY3VycmVudFRhYmxlQm90 dG9tID0gY3VycmVudFRvcE1hcmdpbiArIHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQub2Zmc2V0SGVp Z2h0OworCisgICAgICAgIGxldCBiZWxvd1RvcFRocmVzaG9sZCA9ICFjdXJyZW50VG9wTWFyZ2lu IHx8IHNjcm9sbFRvcCA+IGN1cnJlbnRUb3BNYXJnaW4gKyB1cGRhdGVPZmZzZXRUaHJlc2hvbGQ7 CisgICAgICAgIGxldCBhYm92ZUJvdHRvbVRocmVzaG9sZCA9ICFjdXJyZW50Qm90dG9tTWFyZ2lu IHx8IHNjcm9sbFRvcCArIHNjcm9sbEhlaWdodCA8IGN1cnJlbnRUYWJsZUJvdHRvbSAtIHVwZGF0 ZU9mZnNldFRocmVzaG9sZDsKKworICAgICAgICBpZiAoYmVsb3dUb3BUaHJlc2hvbGQgJiYgYWJv dmVCb3R0b21UaHJlc2hvbGQgJiYgdGhpcy5fcHJldmlvdXNSZXZlYWxlZFJvd0NvdW50ID09PSBy ZXZlYWxlZFJvd3MubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMu X3ByZXZpb3VzUmV2ZWFsZWRSb3dDb3VudCA9IHJldmVhbGVkUm93cy5sZW5ndGg7CisKKyAgICAg ICAgbGV0IG92ZXJmbG93UGFkZGluZyA9IHVwZGF0ZU9mZnNldFRocmVzaG9sZCAqIDM7CisKKyAg ICAgICAgbGV0IHRvcEhpZGRlblJvd0NvdW50ID0gTWF0aC5tYXgoMCwgTWF0aC5mbG9vcigoc2Ny b2xsVG9wIC0gb3ZlcmZsb3dQYWRkaW5nKSAvIHJvd0hlaWdodCkpOworICAgICAgICBsZXQgdmlz aWJsZVJvd0NvdW50ID0gTWF0aC5jZWlsKChzY3JvbGxIZWlnaHQgKyAob3ZlcmZsb3dQYWRkaW5n ICogMikpIC8gcm93SGVpZ2h0KTsKKyAgICAgICAgbGV0IGJvdHRvbUhpZGRlblJvd0NvdW50ID0g TWF0aC5tYXgoMCwgcmV2ZWFsZWRSb3dzLmxlbmd0aCAtIHRvcEhpZGRlblJvd0NvdW50IC0gdmlz aWJsZVJvd0NvdW50KTsKKworICAgICAgICBsZXQgbWFyZ2luVG9wID0gdG9wSGlkZGVuUm93Q291 bnQgKiByb3dIZWlnaHQ7CisgICAgICAgIGxldCBtYXJnaW5Cb3R0b20gPSBib3R0b21IaWRkZW5S b3dDb3VudCAqIHJvd0hlaWdodDsKKworICAgICAgICB0aGlzLl90b3BEYXRhVGFibGVNYXJnaW5F bGVtZW50LnN0eWxlLmhlaWdodCA9IG1hcmdpblRvcCArICJweCI7CisgICAgICAgIHRoaXMuX2Jv dHRvbURhdGFUYWJsZU1hcmdpbkVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gbWFyZ2luQm90dG9tICsg InB4IjsKKworICAgICAgICB0aGlzLl9kYXRhVGFibGVFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUo Im9kZC1maXJzdC16ZWJyYS1zdHJpcGUiLCAhISh0b3BIaWRkZW5Sb3dDb3VudCAlIDIpKTsKKwor ICAgICAgICB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisKKyAg ICAgICAgZm9yIChsZXQgaSA9IHRvcEhpZGRlblJvd0NvdW50OyBpIDwgdG9wSGlkZGVuUm93Q291 bnQgKyB2aXNpYmxlUm93Q291bnQ7ICsraSkgeworICAgICAgICAgICAgbGV0IHJvd0RhdGFHcmlk Tm9kZSA9IHJldmVhbGVkUm93c1tpXTsKKyAgICAgICAgICAgIGlmICghcm93RGF0YUdyaWROb2Rl KQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgdGhpcy5kYXRhVGFibGVC b2R5RWxlbWVudC5hcHBlbmRDaGlsZChyb3dEYXRhR3JpZE5vZGUuZWxlbWVudCk7CisgICAgICAg IH0KKworICAgICAgICB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2ZpbGxlclJvd0VsZW1lbnQpOworICAgIH0KKwogICAgIGFkZFBsYWNlaG9sZGVyTm9kZSgpCiAg ICAgewogICAgICAgICBpZiAodGhpcy5wbGFjZWhvbGRlck5vZGUpCkBAIC05MzgsMTAgKzEwNTEs MTAgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogCiAgICAgX3NvcnROb2Rlc0NhbGxiYWNrKGNvbXBhcmF0b3IpCiAgICAg ewotICAgICAgICBmdW5jdGlvbiBjb21wYXJhdG9yV3JhcHBlcihhUm93LCBiUm93KQorICAgICAg ICBmdW5jdGlvbiBjb21wYXJhdG9yV3JhcHBlcihhTm9kZSwgYk5vZGUpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIHZhciBhTm9kZSA9IGFSb3cuX2RhdGFHcmlkTm9kZTsKLSAgICAgICAgICAgIHZh ciBiTm9kZSA9IGJSb3cuX2RhdGFHcmlkTm9kZTsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCFhTm9kZS5oYXNDaGlsZHJlbiwgIlRoaXMgc29ydCBtZXRob2QgY2FuJ3QgYmUgdXNlZCB3aXRo IHBhcmVudCBub2RlcywgY2hpbGRyZW4gd2lsbCBiZSBkaXNwbGF5ZWQgb3V0IG9mIG9yZGVyLiIp OworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIWJOb2RlLmhhc0NoaWxkcmVuLCAiVGhpcyBz b3J0IG1ldGhvZCBjYW4ndCBiZSB1c2VkIHdpdGggcGFyZW50IG5vZGVzLCBjaGlsZHJlbiB3aWxs IGJlIGRpc3BsYXllZCBvdXQgb2Ygb3JkZXIuIik7CiAKICAgICAgICAgICAgIGlmIChhTm9kZS5p c1BsYWNlaG9sZGVyTm9kZSkKICAgICAgICAgICAgICAgICByZXR1cm4gMTsKQEAgLTk1OSwyOSAr MTA3MiwyMyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRlbmRz IFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAg ICAgICB2YXIgdGJvZHkgPSB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50OwotICAgICAgICB2YXIg Y2hpbGROb2RlcyA9IHRib2R5LmNoaWxkTm9kZXM7Ci0gICAgICAgIHZhciBmaWxsZXJSb3dFbGVt ZW50ID0gdGJvZHkubGFzdENoaWxkOwotCi0gICAgICAgIHZhciBzb3J0ZWRSb3dFbGVtZW50cyA9 IEFycmF5LnByb3RvdHlwZS5zbGljZS5jYWxsKGNoaWxkTm9kZXMsIDAsIGNoaWxkTm9kZXMubGVu Z3RoIC0gMSk7Ci0gICAgICAgIHNvcnRlZFJvd0VsZW1lbnRzLnNvcnQoY29tcGFyYXRvcldyYXBw ZXIuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX3Jvd3Muc29ydChjb21wYXJhdG9yV3JhcHBl ci5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fbm90ZVJvd3NDaGFuZ2VkKCk7CiAKLSAgICAg ICAgdGJvZHkucmVtb3ZlQ2hpbGRyZW4oKTsKLQotICAgICAgICB2YXIgcHJldmlvdXNTaWJsaW5n Tm9kZSA9IG51bGw7Ci0gICAgICAgIGZvciAodmFyIHJvd0VsZW1lbnQgb2Ygc29ydGVkUm93RWxl bWVudHMpIHsKLSAgICAgICAgICAgIHZhciBub2RlID0gcm93RWxlbWVudC5fZGF0YUdyaWROb2Rl OworICAgICAgICBsZXQgcHJldmlvdXNTaWJsaW5nTm9kZSA9IG51bGw7CisgICAgICAgIGZvciAo bGV0IG5vZGUgb2YgdGhpcy5fcm93cykgewogICAgICAgICAgICAgbm9kZS5wcmV2aW91c1NpYmxp bmcgPSBwcmV2aW91c1NpYmxpbmdOb2RlOwogICAgICAgICAgICAgaWYgKHByZXZpb3VzU2libGlu Z05vZGUpCiAgICAgICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nTm9kZS5uZXh0U2libGluZyA9 IG5vZGU7Ci0gICAgICAgICAgICB0Ym9keS5hcHBlbmRDaGlsZChyb3dFbGVtZW50KTsKICAgICAg ICAgICAgIHByZXZpb3VzU2libGluZ05vZGUgPSBub2RlOwogICAgICAgICB9CiAKICAgICAgICAg aWYgKHByZXZpb3VzU2libGluZ05vZGUpCiAgICAgICAgICAgICBwcmV2aW91c1NpYmxpbmdOb2Rl Lm5leHRTaWJsaW5nID0gbnVsbDsKIAotICAgICAgICB0Ym9keS5hcHBlbmRDaGlsZChmaWxsZXJS b3dFbGVtZW50KTsgLy8gV2UgZXhwZWN0IHRvIGZpbmQgYSBmaWxsZXIgcm93IHdoZW4gYXR0YWNo aW5nIG5vZGVzLgorICAgICAgICAvLyBBIHNvcnRhYmxlIGRhdGEgZ3JpZCBtaWdodCBub3QgYmUg aW4gYWRkZWQgdG8gYSB2aWV3LCBzbyBpdCBuZWVkcyBpdHMgbGF5b3V0IHVwZGF0ZWQgaGVyZS4K KyAgICAgICAgaWYgKCF0aGlzLnBhcmVudFZpZXcpCisgICAgICAgICAgICB0aGlzLnVwZGF0ZUxh eW91dElmTmVlZGVkKCk7CiAgICAgfQogCiAgICAgX3RvZ2dsZWRTb3J0T3JkZXIoKQpAQCAtMTYy NSwxNiArMTczMiwxMiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdy aWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBpZiAoIXRoaXMuX2Vs ZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMuX2hhc0NoaWxk cmVuKQotICAgICAgICB7CisgICAgICAgIGlmICh0aGlzLl9oYXNDaGlsZHJlbikgewogICAgICAg ICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJwYXJlbnQiKTsKICAgICAgICAgICAg IGlmICh0aGlzLmV4cGFuZGVkKQogICAgICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NM aXN0LmFkZCgiZXhwYW5kZWQiKTsKLSAgICAgICAgfQotICAgICAgICBlbHNlCi0gICAgICAgIHsK KyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoInBhcmVudCIsICJleHBhbmRlZCIpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgZ2V0IGhh c0NoaWxkcmVuKCkKQEAgLTE4MzgsOCArMTk0MSwxMCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWRO b2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJjb2xsYXBzZWQiKTsKIAotICAg ICAgICBpZiAodGhpcy5kYXRhR3JpZCkKKyAgICAgICAgaWYgKHRoaXMuZGF0YUdyaWQpIHsKICAg ICAgICAgICAgIHRoaXMuZGF0YUdyaWQuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5FdmVudC5Db2xsYXBzZWROb2RlLCB7ZGF0YUdyaWROb2RlOiB0aGlzfSk7 CisgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLm5lZWRzTGF5b3V0KCk7CisgICAgICAgIH0KICAg ICB9CiAKICAgICBjb2xsYXBzZVJlY3Vyc2l2ZWx5KCkKQEAgLTE4ODYsOCArMTk5MSwxMCBAQCBX ZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KCJleHBhbmRlZCIpOwogCi0gICAgICAgIGlmICh0aGlzLmRhdGFHcmlkKQorICAgICAgICBpZiAo dGhpcy5kYXRhR3JpZCkgewogICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LkV4cGFuZGVkTm9kZSwge2Rh dGFHcmlkTm9kZTogdGhpc30pOworICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5uZWVkc0xheW91 dCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgZXhwYW5kUmVjdXJzaXZlbHkoKQpAQCAtMjA1 NSwyNyArMjE2MiwyOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdy aWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuX2F0dGFj aGVkID0gdHJ1ZTsKIAotICAgICAgICB2YXIgbmV4dEVsZW1lbnQgPSBudWxsOworICAgICAgICBs ZXQgaW5zZXJ0aW9uSW5kZXggPSAtMTsKIAogICAgICAgICBpZiAoIXRoaXMuaXNQbGFjZWhvbGRl ck5vZGUpIHsKICAgICAgICAgICAgIHZhciBwcmV2aW91c0dyaWROb2RlID0gdGhpcy50cmF2ZXJz ZVByZXZpb3VzTm9kZSh0cnVlLCB0cnVlKTsKLSAgICAgICAgICAgIGlmIChwcmV2aW91c0dyaWRO b2RlICYmIHByZXZpb3VzR3JpZE5vZGUuZWxlbWVudC5wYXJlbnROb2RlKQotICAgICAgICAgICAg ICAgIG5leHRFbGVtZW50ID0gcHJldmlvdXNHcmlkTm9kZS5lbGVtZW50Lm5leHRTaWJsaW5nOwot ICAgICAgICAgICAgZWxzZSBpZiAoIXByZXZpb3VzR3JpZE5vZGUpCi0gICAgICAgICAgICAgICAg bmV4dEVsZW1lbnQgPSB0aGlzLmRhdGFHcmlkLmRhdGFUYWJsZUJvZHlFbGVtZW50LmZpcnN0Q2hp bGQ7CisgICAgICAgICAgICBpbnNlcnRpb25JbmRleCA9IHRoaXMuZGF0YUdyaWQuX3Jvd3MuaW5k ZXhPZihwcmV2aW91c0dyaWROb2RlKTsKKyAgICAgICAgICAgIGlmIChpbnNlcnRpb25JbmRleCA9 PT0gLTEpCisgICAgICAgICAgICAgICAgaW5zZXJ0aW9uSW5kZXggPSAwOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIGluc2VydGlvbkluZGV4Kys7CiAgICAgICAgIH0KIAotICAg ICAgICAvLyBJZiB0aGVyZSBpcyBubyBuZXh0IGdyaWQgbm9kZSwgdGhlbiBhcHBlbmQgYmVmb3Jl IHRoZSBsYXN0IGNoaWxkIHNpbmNlIHRoZSBsYXN0IGNoaWxkIGlzIHRoZSBmaWxsZXIgcm93Lgot ICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmRhdGFHcmlkLmRhdGFUYWJsZUJvZHlFbGVtZW50 Lmxhc3RDaGlsZC5jbGFzc0xpc3QuY29udGFpbnMoImZpbGxlciIpKTsKLQotICAgICAgICBpZiAo IW5leHRFbGVtZW50KQotICAgICAgICAgICAgbmV4dEVsZW1lbnQgPSB0aGlzLmRhdGFHcmlkLmRh dGFUYWJsZUJvZHlFbGVtZW50Lmxhc3RDaGlsZDsKKyAgICAgICAgaWYgKGluc2VydGlvbkluZGV4 ID09PSAtMSkKKyAgICAgICAgICAgIHRoaXMuZGF0YUdyaWQuX3Jvd3MucHVzaCh0aGlzKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5fcm93cy5pbnNlcnRBdEluZGV4 KHRoaXMsIGluc2VydGlvbkluZGV4KTsKIAotICAgICAgICB0aGlzLmRhdGFHcmlkLmRhdGFUYWJs ZUJvZHlFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIG5leHRFbGVtZW50KTsKKyAg ICAgICAgdGhpcy5kYXRhR3JpZC5fbm90ZVJvd3NDaGFuZ2VkKCk7CiAKLSAgICAgICAgaWYgKHRo aXMuZXhwYW5kZWQpCisgICAgICAgIGlmICh0aGlzLmV4cGFuZGVkKSB7CiAgICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHRoaXMuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCiAgICAgICAgICAg ICAgICAgdGhpcy5jaGlsZHJlbltpXS5fYXR0YWNoKCk7CisgICAgICAgIH0KICAgICB9CiAKICAg ICBfZGV0YWNoKCkKQEAgLTIwODUsOCArMjE5Myw4IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5v ZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAg ICAgICAgdGhpcy5fYXR0YWNoZWQgPSBmYWxzZTsKIAotICAgICAgICBpZiAodGhpcy5fZWxlbWVu dCAmJiB0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUpCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50 LnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQodGhpcy5fZWxlbWVudCk7CisgICAgICAgIHRoaXMuZGF0 YUdyaWQuX3Jvd3MucmVtb3ZlKHRoaXMsIHRydWUpOworICAgICAgICB0aGlzLmRhdGFHcmlkLl9u b3RlUm93c0NoYW5nZWQoKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuY2hp bGRyZW4ubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLmNoaWxkcmVuW2ldLl9kZXRhY2go KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVVzZXJRdWVyeVN1Y2Nlc3NWaWV3LmpzCmluZGV4 IGYyZGI2YzRhNDYzYTExYjBhYjMyNTkzZTk0MGY4ZjNmOTkyYWQ4YWUuLjA5NDRkYzk5ZjBiZjBi M2NhMTJhNGJhZjRmNTEwOTZmMGMxZjRkMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VV c2VyUXVlcnlTdWNjZXNzVmlldy5qcwpAQCAtMzEsOCArMzEsMTEgQEAgV2ViSW5zcGVjdG9yLkRh dGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcgPSBjbGFzcyBEYXRhYmFzZVVzZXJRdWVyeVN1Y2Nl c3NWaWV3IGUKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5jcmVhdGVTb3J0YWJsZURhdGFHcmlkKGNvbHVtbk5hbWVzLCB2YWx1ZXMpOwogICAgICAgICBp ZiAodGhpcy5fZGF0YUdyaWQpIHsKLSAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgiaW5saW5lIik7CisgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5pbmxp bmUgPSB0cnVlOworCiAgICAgICAgICAgICB0aGlzLnJlc3VsdEVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CisKKyAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVw ZGF0ZUxheW91dElmTmVlZGVkKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlz LnJlc3VsdEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibm8tcmVzdWx0cyIpOwogICAgICAgICAgICAg dGhpcy5yZXN1bHRFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJR dWVyeSByZXR1cm5lZCBubyByZXN1bHRzLiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4 IDVlMDA0ODIxNmNiODNhMzY2MDY2N2M5MWM3YzY3ZTE4ZDVmNWI1YzUuLjZlZjdkMzk0YTIyY2Nm OTRjY2VjMzc1NjQyN2FjYWM0Zjk2M2ViMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAg LTI2MiwyMiArMjYyLDEyIEBACiAgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKIH0KIAotLmRldGFp bHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdGFibGUuZGF0YSB7Ci0gICAgYmFja2dy b3VuZC1pbWFnZTogbm9uZTsKLX0KLQotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRh LWdyaWQgdHI6bnRoLWNoaWxkKGV2ZW4pIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK LX0KLQotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdHI6bnRoLWNoaWxk KG9kZCkgewotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTQsIDQxJSwgOTYlKTsKLX0KLQog LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdGQudmFsdWUtY29sdW1uIHsK ICAgICBoZWlnaHQ6IGF1dG87CiAgICAgbGluZS1oZWlnaHQ6IGluaXRpYWw7CiAgICAgd2hpdGUt c3BhY2U6IG5vcm1hbDsKKyAgICBwYWRkaW5nLXRvcDogNHB4OworICAgIHBhZGRpbmctYm90dG9t OiA0cHg7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZGF0YS1ncmlkIHRkLnZh bHVlLWNvbHVtbiA+IGRpdiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbkRhdGFHcmlkUm93LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25EYXRhR3JpZFJv dy5qcwppbmRleCA5NjRkNjkyNGJlODE4Njk3OWNjZDliZWQ0MjY0YTFlODM2NmU1MjJjLi43OWYw ZDBiODg5OTQxMGI4M2FiYTMwMmMyNzhjNmQ5NmE0ZDBkZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbkRhdGFHcmlk Um93LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rl dGFpbHNTZWN0aW9uRGF0YUdyaWRSb3cuanMKQEAgLTQ5LDEwICs0OSwxMyBAQCBXZWJJbnNwZWN0 b3IuRGV0YWlsc1NlY3Rpb25EYXRhR3JpZFJvdyA9IGNsYXNzIERldGFpbHNTZWN0aW9uRGF0YUdy aWRSb3cgZXh0ZW5kcwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkIHx8IG51bGw7 CiAKICAgICAgICAgaWYgKGRhdGFHcmlkKSB7Ci0gICAgICAgICAgICBkYXRhR3JpZC5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOworICAgICAgICAgICAgZGF0YUdyaWQuaW5saW5lID0g dHJ1ZTsKKyAgICAgICAgICAgIGRhdGFHcmlkLnZhcmlhYmxlSGVpZ2h0Um93cyA9IHRydWU7CiAK ICAgICAgICAgICAgIHRoaXMuaGlkZUVtcHR5TWVzc2FnZSgpOwogICAgICAgICAgICAgdGhpcy5l bGVtZW50LmFwcGVuZENoaWxkKGRhdGFHcmlkLmVsZW1lbnQpOworCisgICAgICAgICAgICBkYXRh R3JpZC51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAg IHRoaXMuc2hvd0VtcHR5TWVzc2FnZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdEluc3RhbmNlc0NvbnRl bnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hl YXBTbmFwc2hvdEluc3RhbmNlc0NvbnRlbnRWaWV3LmNzcwppbmRleCA4MjRkMWVkZWRkZmIyZjA2 ZDcwNTk5ZTU2MGExNzFlMmZkN2NiOWU1Li44YzQ5ZDkxMWYyZTNkZGVmMjRmZTBiY2YyYWM1MmRj NmIxMDNkOGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9IZWFwU25hcHNob3RJbnN0YW5jZXNDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90SW5zdGFuY2Vz Q29udGVudFZpZXcuY3NzCkBAIC02NSw3ICs2NSw2IEBACiAgICAgcG9zaXRpb246IHJlbGF0aXZl OwogICAgIHdpZHRoOiAxNnB4OwogICAgIGhlaWdodDogMTZweDsKLSAgICBtYXJnaW4tdG9wOiAx cHg7CiAgICAgbWFyZ2luLWxlZnQ6IDJweDsKIH0KIApAQCAtNzgsNyArNzcsNiBAQAogICAgIHBv c2l0aW9uOiByZWxhdGl2ZTsKICAgICB3aWR0aDogMTZweDsKICAgICBoZWlnaHQ6IDE2cHg7Ci0g ICAgbWFyZ2luLXRvcDogMXB4OwogICAgIG1hcmdpbi1yaWdodDogNHB4OwogICAgIGNvbnRlbnQ6 IHVybCguLi9JbWFnZXMvVHlwZVVuZGVmaW5lZC5zdmcpOwogfQpAQCAtMTIyLDggKzEyMCw3IEBA CiAuaGVhcC1zbmFwc2hvdCA+IC5kYXRhLWdyaWQgdGQgLmZvcm1hdHRlZC1ub2RlLXByZXZpZXcs CiAuaGVhcC1zbmFwc2hvdCA+IC5kYXRhLWdyaWQgdGQgLm9iamVjdC1wcmV2aWV3IHsKICAgICB0 ZXh0LWluZGVudDogMDsgLyogRG8gbm90IGluaGVyaXQgdGhlIERhdGFHcmlkJ3MgaW5kZW50LiAq LwotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBoZWlnaHQ6IDE2cHg7CisgICAgbGlu ZS1oZWlnaHQ6IGluaXRpYWw7CiB9CiAKIC5oZWFwLXNuYXBzaG90LWluc3RhbmNlLXBvcG92ZXIt Y29udGVudCA+IC50aXRsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRh YmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuY3NzCmluZGV4IDM3NjMzYzVhNDU3Y2I5MWQ4NjUx NmEzZTRlZTJlYmZjMjk0MTBhNjAuLjZiZmMzYTFiZTM1NmMxNGIwOGViOGM2ZDYxMDFmNWFmNGIz NzQzYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVj dFN0b3JlQ29udGVudFZpZXcuY3NzCkBAIC0zMSwyMyArMzEsNiBAQAogICAgIGJvdHRvbTogMDsK IH0KIAotLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRh LWdyaWQgdGFibGUuZGF0YSB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKLX0KLQotLmNv bnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRhLWdyaWQgdGFi bGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikgewotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRl OwotfQotCi0uY29udGVudC12aWV3LmluZGV4ZWQtZGF0YWJhc2Utb2JqZWN0LXN0b3JlID4gLmRh dGEtZ3JpZCB0YWJsZS5kYXRhIHRyOm50aC1jaGlsZChvZGQpIHsKLSAgICBiYWNrZ3JvdW5kLWNv bG9yOiBoc2woMjE0LCA0MSUsIDk2JSk7Ci19Ci0KLS5jb250ZW50LXZpZXcuaW5kZXhlZC1kYXRh YmFzZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHIuZmlsbGVyIHsKLSAv KiBGSVhNRTogVGhpcyBzaG91bGQgc2hvdyBhbiBhbHRlcm5hdGluZyBzdHJpcGUsIGJ1dCBJIGNv dWxkbid0IG1ha2UgaXQgd29yay4gKi8KLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKLX0K LQogLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRhLWdy aWQgdHIuc2VsZWN0ZWQgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTAsIDkwJSwgOTAl KSAhaW1wb3J0YW50OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFz ZU9iamVjdFN0b3JlQ29udGVudFZpZXcuanMKaW5kZXggYWM4NjA1NDFiYjU2YzAxM2YzMDJlOGE2 OTg2MGI4ZDI1MjQwNjNmZi4uZGY2NmE0NWZmOTQyMzE0ZWNmZGNhOGJkNGEwMTk4NGNkMzlmZTQ3 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv SW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9y ZUNvbnRlbnRWaWV3LmpzCkBAIC02OCw2ICs2OCw3IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkRGF0 YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3ID0gY2xhc3MgSW5kZXhlZERhdGFiYXNlT2JqZWN0 CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQoY29sdW1uSW5mbyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnZhcmlhYmxlSGVp Z2h0Um93cyA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNjcm9sbENvbnRhaW5lci5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9kYXRhR3JpZFNjcm9sbGVkLmJpbmQodGhp cykpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVE ZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAxYmU3MTFkMDI1 NDA0MzA3OTRmNjVjYWRmYjMyZTJjNzlmYmE1ZTljLi44NTdlZTg0YjYzMTYwYWViODU0NDRmMGE0 NTk4Y2Y2Y2RiZDlhMmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRl YmFyUGFuZWwuanMKQEAgLTEzOCw2ICsxMzgsNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgZQog ICAgICAgICBjb2x1bW5zLm1lbW9yeS53aWR0aCA9ICI3MHB4IjsKIAogICAgICAgICB0aGlzLl9k YXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CisgICAgICAgIHRo aXMuX2RhdGFHcmlkLmlubGluZSA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlz Ll9zb3J0RGF0YUdyaWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0 aGlzLl9zZWxlY3RlZERhdGFHcmlkTm9kZUNoYW5nZWQsIHRoaXMpOwogCkBAIC0xNDUsNyArMTQ2 LDYgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBM YXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgdGhpcy5zb3J0T3JkZXJTZXR0 aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXllci10cmVlLWRldGFpbHMtc2lkZWJh ci1wYW5lbC1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5EZXNj ZW5kaW5nKTsKIAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQ7 Ci0gICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaW5saW5lIik7CiAgICAgICAgIGVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9kYXRhR3JpZEdhaW5lZEZvY3VzLmJp bmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJibHVy IiwgdGhpcy5fZGF0YUdyaWRMb3N0Rm9jdXMuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICBl bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZGF0YUdyaWRXYXNDbGlja2Vk LmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcwppbmRleCA1OWMyZWJl ZjYyZjQwMzFkZThhOTY5YzNhY2EwZmNkNTM3NjM2ZjdjLi5mZTViOGM4NzVkOTUzYTM5ODNiMTE1 Y2M1ZjNkZGQ1ZGRkZTZmNjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuY3NzCkBAIC0xMTcsMTUg KzExNyw2IEBACiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDIxMCwgOTAlLCA5MCUpICFpbXBv cnRhbnQ7CiB9CiAKLS5jb25zb2xlLWl0ZW0gLmRhdGEtZ3JpZCB0YWJsZS5kYXRhIHsKLSAgICBi YWNrZ3JvdW5kLWltYWdlOiBub25lOwotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwotfQot Ci0uY29uc29sZS1pdGVtIC5kYXRhLWdyaWQgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikg ewotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTQsIDQxJSwgOTYlKTsKLX0KLQogLmNvbnNv bGUtaXRlbSAuZGF0YS1ncmlkIHRyLnNlbGVjdGVkIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBo c2woMjEwLCAwJSwgOTAlKSAhaW1wb3J0YW50OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmNzcwppbmRleCAzMTNhMDI3ZDUzNTA5OTI0N2FjMWI0Y2ZlZjE1ZmFmNmYwOTA5 MTE4Li5lODM4YjRlODUzYjI2MzllZTczYzg2ZTQwNDg0MDhhOWRmMjlhNDBiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmNzcwpAQCAtMzQsMTMgKzM0LDMgQEAKIC5jb250 ZW50LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0aCB7CiAgICAgYm9yZGVyLXRvcDog bm9uZTsKIH0KLQotLmNvbnRlbnQtdmlldy5uZXR3b3JrLWdyaWQgPiAuZGF0YS1ncmlkIHRkIHsK LSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgbGluZS1oZWlnaHQ6IDE2cHg7Ci19Ci0KLS5jb250ZW50 LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0YWJsZS5kYXRhIHsKLSAgICBiYWNrZ3Jv dW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCB3aGl0ZSwgd2hpdGUgNTAlLCBo c2woMCwgMCUsIDk1JSkgNTAlLCBoc2woMCwgMCUsIDk1JSkpOwotICAgIGJhY2tncm91bmQtc2l6 ZTogMTAwJSA0MHB4OwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0YUdyaWQuanMKaW5kZXggNDNiNjFjYzNl Mjg5MTRlNmIyMzRjYTYxMGU5Y2Q1ZWE3NzQ1N2Y2Yi4uNDZlMTNmMTAyMTU3NDIzZDc3YTY2ZjM4 YTM2ODAxMGJkMDgwOWU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpzCkBAIC00MCw3ICs0 MCw3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkID0gY2xhc3MgUHJvYmVTZXREYXRh R3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAKICAgICAgICAgdGhpcy5wcm9iZVNldCA9 IHByb2JlU2V0OwogCi0gICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUi KTsKKyAgICAgICAgdGhpcy5pbmxpbmUgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2ZyYW1lTm9k ZXMgPSBuZXcgTWFwOwogICAgICAgICB0aGlzLl9sYXN0VXBkYXRlZEZyYW1lID0gbnVsbDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2Zp bGVWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1By b2ZpbGVWaWV3LmNzcwppbmRleCBlM2M1NTQ4MGY5Y2VjNjdlOGM0ZDEyM2RmZDU3NzI2NTFjODc5 MWI1Li4yMzcyMzA5OGM1NjYzYjBjYmEwODZkNmQ1YTQ1NjkyYTZkNTRlMDkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlVmlldy5j c3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmls ZVZpZXcuY3NzCkBAIC0zOSw3ICszOSw2IEBACiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAg IHdpZHRoOiAxNnB4OwogICAgIGhlaWdodDogMTZweDsKLSAgICBtYXJnaW4tdG9wOiAxcHg7CiAg ICAgbWFyZ2luLXJpZ2h0OiAzcHg7CiB9CiAKQEAgLTc3LDcgKzc2LDYgQEAKICAgICBwb3NpdGlv bjogcmVsYXRpdmU7CiAgICAgd2lkdGg6IDE2cHg7CiAgICAgaGVpZ2h0OiAxNnB4OwotICAgIG1h cmdpbi10b3A6IDFweDsKICAgICBtYXJnaW4tbGVmdDogMnB4OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzCmluZGV4IGY3ZmNkNTFhMTFiN2Nm ZDNiNDM4MDJkNTlhODU2OGIwYTY2ZTUxYjIuLmZjMmNhY2IwOTJhZjVhZjAzNzEzOTA5MmJjOGY1 YTBkOTk3NWZkY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuY3NzCkBAIC02MSwxMyArNjEsMyBAQAogLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNv cmRpbmcgPiAuY29udGVudC1icm93c2VyID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uc2NvcGUt YmFyLmRlZmF1bHQtaXRlbS1zZWxlY3RlZCA+IC5tdWx0aXBsZSAuYXJyb3dzIHsKICAgICBjb2xv cjogYmxhY2s7CiB9Ci0KLS5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRl bnQtYnJvd3NlciA+IC5jb250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAu ZGF0YS1ncmlkIHRkIHsKLSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgbGluZS1oZWlnaHQ6IDE2cHg7 Ci19Ci0KLS5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3Nl ciA+IC5jb250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAuZGF0YS1ncmlk IHRhYmxlLmRhdGEgewotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBi b3R0b20sIHdoaXRlLCB3aGl0ZSA1MCUsIGhzbCgwLCAwJSwgOTUlKSA1MCUsIGhzbCgwLCAwJSwg OTUlKSk7Ci0gICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDQwcHg7Ci19CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVzLmNzcwpp bmRleCA5ODUwZDI3NTQ4YmI2ZDRiNmZhMDQxYTgwNDFhYTdiMzU0ZWE2ZjYyLi5hOTBlYjg2YmM5 MWZjNjQ3ZDYxMTU5ZGM0ZGUwNzNlNzQyNmMxYjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxlcy5jc3MKQEAgLTcwLDYg KzcwLDkgQEAKICAgICAtLW1lbW9yeS1leHRyYS1maWxsLWNvbG9yOiBoc2woMjExLCA1MyUsIDcw JSk7CiAgICAgLS1tZW1vcnktZXh0cmEtc3Ryb2tlLWNvbG9yOiBoc2woMjExLCA1MyUsIDU1JSk7 CiAKKyAgICAtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK KyAgICAtLW9kZC16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwg OTUlKTsKKwogICAgIC0tdG9vbGJhci1oZWlnaHQ6IDM2cHg7CiAgICAgLS10YWItYmFyLWhlaWdo dDogMjRweDsKIH0K 276765 2016-04-19 15:38:39 -0700 2016-04-19 15:39:01 -0700 Patch bug-156759-20160419153859.patch text/plain 38316 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl Y2EyODc4YzAxMGRkZDk2ZTE3NDg4Y2ZjNWExNTFlYWIwZjFkMmMzLi5kOGNkYWJjNTkyZTI0ZmZj Nzc1NzczYjU0YjdmMjcwYzZhZDAwNTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxMTcgQEAKIDIwMTYtMDQtMTggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERhdGFHcmlkIHNob3VsZCBiZSB2aXJ0dWFs aXplZCBzbyBpdCBvbmx5IHJlbmRlcnMgdmlzaWJsZSByb3dzCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY2MworICAgICAgICByZGFyOi8vcHJv YmxlbS8yNTc2NTI1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90 eXBlLnNldCBjb250YWluZXJSZWdpb25zKToKKyAgICAgICAgQ2FsbCB1cGxhdGVMYXlvdXRJZk5l ZWRlZCBzaW5jZSB3ZSBkb24ndCB1c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlVmlldy5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlckFzVGFibGUpOgor ICAgICAgICBTZXQgaW5saW5lIGFuZCB2YXJpYWJsZUhlaWdodFJvd3MgdG8gdHJ1ZSwgcmVtb3Zl IGRpcmVjdCBjbGFzc0xpc3QgYWRkLiBDYWxsIHVwZGF0ZUxheW91dElmTmVlZGVkIHNpbmNlIHdl IGRvbid0IHVzZSB2aWV3cyBoZXJlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZURhdGFHcmlk KToKKyAgICAgICAgU2V0IGlubGluZSB0byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBh ZGQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzczoKKyAgICAg ICAgKC5kYXRhLWdyaWQgdGQpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0YWJsZS5kYXRhKToKKyAg ICAgICAgKC5kYXRhLWdyaWQ6bm90KC52YXJpYWJsZS1oZWlnaHQtcm93cykgdGFibGUuZGF0YSk6 CisgICAgICAgICguZGF0YS1ncmlkOm5vdCgudmFyaWFibGUtaGVpZ2h0LXJvd3MpIHRhYmxlLmRh dGEub2RkLWZpcnN0LXplYnJhLXN0cmlwZSk6CisgICAgICAgICguZGF0YS1ncmlkLnZhcmlhYmxl LWhlaWdodC1yb3dzIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkpOgorICAgICAgICAoLmRh dGEtZ3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyOm50aC1jaGlsZChldmVu KSk6CisgICAgICAgICguZGF0YS1ncmlkLnZhcmlhYmxlLWhlaWdodC1yb3dzLm9kZC1maXJzdC16 ZWJyYS1zdHJpcGUgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQob2RkKSk6CisgICAgICAgICguZGF0 YS1ncmlkLnZhcmlhYmxlLWhlaWdodC1yb3dzLm9kZC1maXJzdC16ZWJyYS1zdHJpcGUgdGFibGUu ZGF0YSB0cjpudGgtY2hpbGQoZXZlbikpOgorICAgICAgICAoLmRhdGEtZ3JpZC52YXJpYWJsZS1o ZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyLmZpbGxlcik6CisgICAgICAgIFVwZGF0ZWQgc3R5bGVz IHRvIHN1cHBvcnQgdmFyaWFibGUgaGVpZ2h0IHJvd3MgZGlyZWN0bHkgYW5kIGZsaXBwaW5nIHRo ZSBvcmRlciBvZiB0aGUgc3RyaXBlcworICAgICAgICB3aGVuIHRoZSB2aXJ0dXJhbCB0YWJsZSBz dGFydHMgYXQgYW4gb2RkIHJvdy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQpOiBBZGRlZCByb3dIZWln aHQgYW5kIHJvd3MuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLmdl dCBpbmxpbmUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5 cGUuc2V0IGlubGluZSk6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZS5nZXQgdmFyaWFibGVIZWlnaHRSb3dzKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCB2YXJpYWJsZUhlaWdodFJvd3MpOiBBZGRlZC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUubGF5b3V0KTogQ2FsbCBf dXBkYXRlVmlzaWJsZVJvd3MuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90 eXBlLl9ub3RlUm93c0NoYW5nZWQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5wcm90b3R5cGUuX3VwZGF0ZVZpc2libGVSb3dzKTogQWRkZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9zb3J0Tm9kZXNDYWxsYmFjayk6IFVwZGF0ZSB0 byBub3QgdXNlIHRoZSBET00uCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnBy b3RvdHlwZS5zZXQgaGFzQ2hpbGRyZW4pOiBDYWxsIG5lZWRzTGF5b3V0LgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY29sbGFwc2UpOiBDYWxsIG5lZWRzTGF5 b3V0LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuZXhwYW5k KTogQ2FsbCBuZWVkc0xheW91dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUu cHJvdG90eXBlLl9hdHRhY2gpOiBDYWxsIF9ub3RlUm93c0NoYW5nZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fZGV0YWNoKTogQ2FsbCBfbm90ZVJvd3ND aGFuZ2VkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVVzZXJRdWVy eVN1Y2Nlc3NWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlVXNlclF1ZXJ5 U3VjY2Vzc1ZpZXcpOgorICAgICAgICBTZXQgaW5saW5lIHRvIHRydWUsIHJlbW92ZSBkaXJlY3Qg Y2xhc3NMaXN0IGFkZC4gQ2FsbCB1cGxhdGVMYXlvdXRJZk5lZWRlZCBzaW5jZSB3ZSBkb24ndCB1 c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1Nl Y3Rpb24uY3NzOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdy aWQgdGQudmFsdWUtY29sdW1uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCAuZGF0YS1ncmlkIHRhYmxlLmRhdGEpOiBEZWxldGVkLgorICAgICAgICAoLmRldGFpbHMtc2Vj dGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdHI6bnRoLWNoaWxkKGV2ZW4pKTogRGVsZXRlZC4K KyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZGF0YS1ncmlkIHRyOm50aC1j aGlsZChvZGQpKTogRGVsZXRlZC4KKyAgICAgICAgTm93IGhhbmRsZWQgYnkgRGF0YUdyaWQuY3Nz IGRpcmVjdGx5LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlv bkRhdGFHcmlkUm93LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uRGF0 YUdyaWRSb3cucHJvdG90eXBlLnNldCBkYXRhR3JpZCk6CisgICAgICAgIFNldCBpbmxpbmUgYW5k IHZhcmlhYmxlSGVpZ2h0Um93cyB0byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBhZGQu IENhbGwgdXBsYXRlTGF5b3V0SWZOZWVkZWQgc2luY2Ugd2UgZG9uJ3QgdXNlIHZpZXdzIGhlcmUu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdEluc3RhbmNlc0Nv bnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5oZWFwLXNuYXBzaG90ID4gLmRhdGEtZ3JpZCB0cjpt YXRjaGVzKC5zZWxlY3RlZCwgOmhvdmVyKSB0ZCAuZ28tdG8tYXJyb3cpOgorICAgICAgICAoLmhl YXAtc25hcHNob3QgLmljb24pOgorICAgICAgICBSZW1vdmUgbWFyZ2luLXRvcCB0byBmaXQgaW5z aWRlIDIwcHggcm93IGluc3RlYWQgb2YgMjFweC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5jc3M6CisgICAgICAg ICguY29udGVudC12aWV3LmluZGV4ZWQtZGF0YWJhc2Utb2JqZWN0LXN0b3JlID4gLmRhdGEtZ3Jp ZCB0YWJsZS5kYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKC5jb250ZW50LXZpZXcuaW5kZXhlZC1k YXRhYmFzZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxk KGV2ZW4pKTogRGVsZXRlZC4KKyAgICAgICAgKC5jb250ZW50LXZpZXcuaW5kZXhlZC1kYXRhYmFz ZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkp OiBEZWxldGVkLgorICAgICAgICAoLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVj dC1zdG9yZSA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSB0ci5maWxsZXIpOiBEZWxldGVkLgorICAg ICAgICBOb3cgaGFuZGxlZCBieSBEYXRhR3JpZC5jc3MgZGlyZWN0bHkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250 ZW50Vmlldyk6CisgICAgICAgIFNldCB2YXJpYWJsZUhlaWdodFJvd3MgdG8gdHJ1ZS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLnBy b3RvdHlwZS5fYnVpbGREYXRhR3JpZFNlY3Rpb24pOgorICAgICAgICBTZXQgaW5saW5lIHRvIHRy dWUsIHJlbW92ZSBkaXJlY3QgY2xhc3NMaXN0IGFkZC4gQ2FsbCB1cGxhdGVMYXlvdXRJZk5lZWRl ZCBzaW5jZSB3ZSBkb24ndCB1c2Ugdmlld3MgaGVyZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvTG9nQ29udGVudFZpZXcuY3NzOgorICAgICAgICAoLmNvbnNvbGUtaXRlbSAuZGF0 YS1ncmlkIHRhYmxlLmRhdGEpOiBEZWxldGVkLgorICAgICAgICAoLmNvbnNvbGUtaXRlbSAuZGF0 YS1ncmlkIHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKGV2ZW4pKTogRGVsZXRlZC4KKyAgICAgICAg Tm93IGhhbmRsZWQgYnkgRGF0YUdyaWQuY3NzIGRpcmVjdGx5LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250 ZW50LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0ZCk6IERlbGV0ZWQuCisgICAgICAg ICguY29udGVudC12aWV3Lm5ldHdvcmstZ3JpZCA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSk6IERl bGV0ZWQuCisgICAgICAgIE5vdyBoYW5kbGVkIGJ5IERhdGFHcmlkLmNzcyBkaXJlY3RseS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkKToKKyAgICAgICAgU2V0IGlubGluZSB0 byB0cnVlLCByZW1vdmUgZGlyZWN0IGNsYXNzTGlzdCBhZGQuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3LmNzczoKKyAgICAgICAgKC5wcm9maWxlID4gLmRhdGEt Z3JpZCB0ZCAuaWNvbik6CisgICAgICAgICgucHJvZmlsZSA+IC5kYXRhLWdyaWQgdHI6bWF0Y2hl cyguc2VsZWN0ZWQsIDpob3ZlcikgLmdvLXRvLWFycm93KToKKyAgICAgICAgUmVtb3ZlIG1hcmdp bi10b3AgdG8gZml0IGluc2lkZSAyMHB4IHJvdyBpbnN0ZWFkIG9mIDIxcHguCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzOgor ICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAuY29udGVudC1icm93 c2VyID4gLmNvbnRlbnQtdmlldy1jb250YWluZXIgPiAudGltZWxpbmUtdmlldyA+IC5kYXRhLWdy aWQgdGQpOiBEZWxldGVkLgorICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRp bmcgPiAuY29udGVudC1icm93c2VyID4gLmNvbnRlbnQtdmlldy1jb250YWluZXIgPiAudGltZWxp bmUtdmlldyA+IC5kYXRhLWdyaWQgdGFibGUuZGF0YSk6IERlbGV0ZWQuCisgICAgICAgIE5vdyBo YW5kbGVkIGJ5IERhdGFHcmlkLmNzcyBkaXJlY3RseS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVmFyaWFibGVzLmNzczoKKyAgICAgICAgKDpyb290KTogQWRkZWQgemVicmEgc3Ry aXBlIGNvbG9ycy4KKworMjAxNi0wNC0xOCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBs ZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvblNpZGViYXJQYW5lbCBk b2VzIGEgbG90IG9mIHN0eWxlIHJlY2FsYyBhbmQgbGF5b3V0IG9uIGJ1c3kgc2l0ZXMKIAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NzA0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRl ZFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCAxMmNhM2Q2Mzk0OTIz Y2JkZDU0MmQ5ZDI5ZjM5NTRmZjJjNGZmYzAzLi5kODU0ZjdhZTg0M2M0ZDBmYTM5ODZiY2E4NDA5 ZTBlNjhiZTkxOTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwu anMKQEAgLTE0Nyw2ICsxNDcsOCBAQCBXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZURldGFpbHNQ YW5lbCA9IGNsYXNzIENvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcwogICAgICAgICAg ICAgdGhpcy5fY29udGFpbmVyUmVnaW9uc0RhdGFHcmlkLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNw ZWN0b3IuRE9NVHJlZURhdGFHcmlkTm9kZShyZWdpb25Ob2RlKSk7CiAKICAgICAgICAgdGhpcy5f Y29udGFpbmVyUmVnaW9uc0Zsb3dTZWN0aW9uLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZSgiaGlk ZGVuIik7CisKKyAgICAgICAgdGhpcy5fY29udGFpbmVyUmVnaW9uc0RhdGFHcmlkLnVwZGF0ZUxh eW91dElmTmVlZGVkKCk7CiAgICAgfQogCiAgICAgY3NzU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3JTaG93UHJvcGVydHkocHJvcGVydHksIHNob3dTb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2Fn ZVZpZXcuanMKaW5kZXggNTZhYjcxNjU5YmY1NTc3MjM2MjU2MGM0YjllMDk3MTFmYTJlY2ZmMC4u ZjBiNjZlY2UzZjk5NGM1OTRkNTkyOTUxYThiZTQ5NGY3ZjFhODMxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNv bGVNZXNzYWdlVmlldy5qcwpAQCAtODA0LDkgKzgwNCwxMyBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVj dG9yLgogICAgICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIG91dHB1dCBzb21ldGhpbmcgZXh0cmEg aWYgdGhlIHByZXZpZXcgaXMgbG9zc2xlc3M/CiAKICAgICAgICAgdmFyIGRhdGFHcmlkID0gV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIGZs YXRWYWx1ZXMpOwotICAgICAgICBkYXRhR3JpZC5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGlu ZSIpOworICAgICAgICBkYXRhR3JpZC5pbmxpbmUgPSB0cnVlOworICAgICAgICBkYXRhR3JpZC52 YXJpYWJsZUhlaWdodFJvd3MgPSB0cnVlOworCiAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQo ZGF0YUdyaWQuZWxlbWVudCk7CiAKKyAgICAgICAgZGF0YUdyaWQudXBkYXRlTGF5b3V0SWZOZWVk ZWQoKTsKKwogICAgICAgICByZXR1cm4gZWxlbWVudDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRh R3JpZC5qcwppbmRleCBiNmRlYmZkMjZhYmZhMDE4MTA2YTU0NmZkM2I1ZTI2YTRiYTVhNWEyLi4w NDI3NTc1NzI2N2NlOTFjOTFmOGExYTAwMDQ3MjZmNGRlNzk5YzU5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRGF0YUdyaWQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZURh dGFHcmlkLmpzCkBAIC0zNCw3ICszNCw5IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRGF0YUdyaWQg PSBjbGFzcyBET01UcmVlRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuRGF0YUdyCiAKICAg ICAgICAgdGhpcy5fcHJldmlvdXNIb3ZlcmVkRWxlbWVudCA9IG51bGw7CiAKLSAgICAgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIsICJkb20tdHJlZS1kYXRhLWdyaWQiKTsK KyAgICAgICAgdGhpcy5pbmxpbmUgPSB0cnVlOworCisgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJkb20tdHJlZS1kYXRhLWdyaWQiKTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fb25tb3VzZW1vdmUuYmluZCh0aGlz KSwgZmFsc2UpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vv dXQiLCB0aGlzLl9vbm1vdXNlb3V0LmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcwppbmRl eCAyMTE4YTQ3YWVlYzYyNDNkMGRjOGI1YjZhYmU0Y2Q5MTRjNTBhMTdkLi4yZjMyMGQwOWI1M2Iy MjhhZWRjZmJjOTJmMjMzOGE5ZTQxNzY2Nzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCkBAIC0xMDksMTggKzEw OSwyMyBAQAogfQogCiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgewotICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgbGVmdDogMDsKLSAgICB0b3A6IDA7 CiAgICAgcmlnaHQ6IDA7Ci0gICAgYm90dG9tOiAwOwogICAgIGhlaWdodDogMTAwJTsKICAgICBi b3JkZXItdG9wOiAwIG5vbmUgdHJhbnNwYXJlbnQ7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGlu ZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgd2hpdGUsIHdoaXRlIDUwJSwgaHNsKDIxNCwgNDElLCA5 NiUpIDUwJSwgaHNsKDIxNCwgNDElLCA5NiUpKTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUg NDJweDsKICAgICB0YWJsZS1sYXlvdXQ6IGZpeGVkOwogfQogCisuZGF0YS1ncmlkOm5vdCgudmFy aWFibGUtaGVpZ2h0LXJvd3MpIHRhYmxlLmRhdGEgeworICAgIGJhY2tncm91bmQtaW1hZ2U6IGxp bmVhci1ncmFkaWVudCh0byBib3R0b20sIHZhcigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNr Z3JvdW5kLWNvbG9yKSwgdmFyKC0tZXZlbi16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29s b3IpIDUwJSwgdmFyKC0tb2RkLXplYnJhLXN0cmlwZS1yb3ctYmFja2dyb3VuZC1jb2xvcikgNTAl LCB2YXIoLS1vZGQtemVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKSk7CisgICAgYmFj a2dyb3VuZC1zaXplOiAxMDAlIDQwcHg7Cit9CisKKy5kYXRhLWdyaWQ6bm90KC52YXJpYWJsZS1o ZWlnaHQtcm93cykgdGFibGUuZGF0YS5vZGQtZmlyc3QtemVicmEtc3RyaXBlIHsKKyAgICBiYWNr Z3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCB2YXIoLS1vZGQtemVicmEt c3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKSwgdmFyKC0tb2RkLXplYnJhLXN0cmlwZS1yb3ct YmFja2dyb3VuZC1jb2xvcikgNTAlLCB2YXIoLS1ldmVuLXplYnJhLXN0cmlwZS1yb3ctYmFja2dy b3VuZC1jb2xvcikgNTAlLCB2YXIoLS1ldmVuLXplYnJhLXN0cmlwZS1yb3ctYmFja2dyb3VuZC1j b2xvcikpOworfQorCiAuZGF0YS1ncmlkLmlubGluZSB0YWJsZS5kYXRhIHsKICAgICBwb3NpdGlv bjogc3RhdGljOwogfQpAQCAtMTMzLDEwICsxMzgsMzEgQEAKICAgICBkaXNwbGF5OiB0YWJsZS1y b3c7CiB9CiAKKy5kYXRhLWdyaWQudmFyaWFibGUtaGVpZ2h0LXJvd3MgdGFibGUuZGF0YSB0cjpu dGgtY2hpbGQob2RkKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tb2RkLXplYnJhLXN0 cmlwZS1yb3ctYmFja2dyb3VuZC1jb2xvcik7Cit9CisKKy5kYXRhLWdyaWQudmFyaWFibGUtaGVp Z2h0LXJvd3MgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikgeworICAgIGJhY2tncm91bmQt Y29sb3I6IHZhcigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30K KworLmRhdGEtZ3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cy5vZGQtZmlyc3QtemVicmEtc3RyaXBl IHRhYmxlLmRhdGEgdHI6bnRoLWNoaWxkKG9kZCkgeworICAgIGJhY2tncm91bmQtY29sb3I6IHZh cigtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30KKworLmRhdGEt Z3JpZC52YXJpYWJsZS1oZWlnaHQtcm93cy5vZGQtZmlyc3QtemVicmEtc3RyaXBlIHRhYmxlLmRh dGEgdHI6bnRoLWNoaWxkKGV2ZW4pIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1vZGQt emVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yKTsKK30KKworLmRhdGEtZ3JpZC52YXJp YWJsZS1oZWlnaHQtcm93cyB0YWJsZS5kYXRhIHRyLmZpbGxlciB7CisgLyogRklYTUU6IFRoaXMg c2hvdWxkIHNob3cgYW4gYWx0ZXJuYXRpbmcgc3RyaXBlLCBidXQgaXQgbmVlZHMgdG8ga25vdyBp ZiB0aGUgbGFzdCByb3cgaXMgZXZlbiBvciBvZGQuICovCisgICAgYmFja2dyb3VuZC1jb2xvcjog dmFyKC0tZXZlbi16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29sb3IpOworfQorCiAuZGF0 YS1ncmlkIHRkIHsKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwotICAgIGhlaWdodDogMTJweDsK LSAgICBsaW5lLWhlaWdodDogMTdweDsKKyAgICBoZWlnaHQ6IDE2cHg7CisgICAgbGluZS1oZWln aHQ6IDE2cHg7CiAgICAgcGFkZGluZzogMnB4IDZweDsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFw OwogICAgIG92ZXJmbG93OiBoaWRkZW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCmluZGV4IGVhNWQ1M2I2ZWRkYTQ4NzE1 NmM5MDJmMzUyODVjNWFhOTU0YzcxZTAuLjhjN2FlNWZiYWUzNWNlZDMzOTE5ZmM5NTFmZTE3MDY5 YzY0MzBlYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RhdGFHcmlkLmpzCkBAIC0zNyw2ICszNyw4IEBAIFdlYkluc3BlY3Rvci5EYXRh R3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAg dGhpcy5fc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5JbmRldGVy bWluYXRlOwogICAgICAgICB0aGlzLl9zb3J0T3JkZXJTZXR0aW5nID0gbnVsbDsKIAorICAgICAg ICB0aGlzLl9yb3dzID0gW107CisKICAgICAgICAgdGhpcy5jaGlsZHJlbiA9IFtdOwogICAgICAg ICB0aGlzLnNlbGVjdGVkTm9kZSA9IG51bGw7CiAgICAgICAgIHRoaXMuZXhwYW5kTm9kZXNXaGVu QXJyb3dpbmcgPSBmYWxzZTsKQEAgLTQ3LDYgKzQ5LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlk ID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlz LnNlbGVjdGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuZGF0YUdyaWQgPSB0aGlzOwogICAgICAg ICB0aGlzLmluZGVudFdpZHRoID0gMTU7CisgICAgICAgIHRoaXMucm93SGVpZ2h0ID0gMjA7CiAg ICAgICAgIHRoaXMucmVzaXplcnMgPSBbXTsKICAgICAgICAgdGhpcy5fY29sdW1uV2lkdGhzSW5p dGlhbGl6ZWQgPSBmYWxzZTsKIApAQCAtNjYsOCArNjksMTQgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0 aGlzLl9zY3JvbGxDb250YWluZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiAgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuY2xhc3NOYW1lID0gImRh dGEtY29udGFpbmVyIjsKIAotICAgICAgICB0aGlzLl9kYXRhVGFibGVFbGVtZW50ID0gdGhpcy5f c2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVhdGVDaGlsZCgidGFibGUiKTsKLSAgICAgICAgdGhp cy5fZGF0YVRhYmxlRWxlbWVudC5jbGFzc05hbWUgPSAiZGF0YSI7CisgICAgICAgIHRoaXMuX3Nj cm9sbExpc3RlbmVyID0gKCkgPT4gdGhpcy5uZWVkc0xheW91dCgpOworICAgICAgICB0aGlzLl9z Y3JvbGxDb250YWluZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3Nj cm9sbExpc3RlbmVyKTsKKworICAgICAgICB0aGlzLl90b3BEYXRhVGFibGVNYXJnaW5FbGVtZW50 ID0gdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7CisKKyAg ICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudCA9IHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1l bnQuY3JlYXRlQ2hpbGQoInRhYmxlIiwgImRhdGEiKTsKKworICAgICAgICB0aGlzLl9ib3R0b21E YXRhVGFibGVNYXJnaW5FbGVtZW50ID0gdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jcmVh dGVDaGlsZCgiZGl2Iik7CiAKICAgICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd25JbkRhdGFUYWJsZS5iaW5kKHRo aXMpKTsKICAgICAgICAgdGhpcy5fZGF0YVRhYmxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMuX2NsaWNrSW5EYXRhVGFibGUuYmluZCh0aGlzKSk7CkBAIC03OSw2ICs4OCw3 IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5z cGVjdG9yLlZpZXcKICAgICAgICAgICAgIHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9vbmRibGNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsK ICAgICAgICAgICAgIHRoaXMuX2VkaXRDYWxsYmFjayA9IGVkaXRDYWxsYmFjazsKICAgICAgICAg fQorCiAgICAgICAgIGlmIChkZWxldGVDYWxsYmFjaykKICAgICAgICAgICAgIHRoaXMuX2RlbGV0 ZUNhbGxiYWNrID0gZGVsZXRlQ2FsbGJhY2s7CiAKQEAgLTg3LDggKzk3LDggQEAgV2ViSW5zcGVj dG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwog CiAgICAgICAgIC8vIFRoaXMgZWxlbWVudCBpcyB1c2VkIGJ5IERhdGFHcmlkTm9kZXMgdG8gbWFu aXB1bGF0ZSB0YWJsZSByb3dzIGFuZCBjZWxscy4KICAgICAgICAgdGhpcy5kYXRhVGFibGVCb2R5 RWxlbWVudCA9IHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQuY3JlYXRlQ2hpbGQoInRib2R5Iik7Ci0g ICAgICAgIHRoaXMuX2ZpbGxlclJvd0VsZW1lbnQgPSB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50 LmNyZWF0ZUNoaWxkKCJ0ciIpOwotICAgICAgICB0aGlzLl9maWxsZXJSb3dFbGVtZW50LmNsYXNz TmFtZSA9ICJmaWxsZXIiOworCisgICAgICAgIHRoaXMuX2ZpbGxlclJvd0VsZW1lbnQgPSB0aGlz LmRhdGFUYWJsZUJvZHlFbGVtZW50LmNyZWF0ZUNoaWxkKCJ0ciIsICJmaWxsZXIiKTsKIAogICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5faGVhZGVyVGFibGVFbGVtZW50KTsK ICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Njcm9sbENvbnRhaW5lckVs ZW1lbnQpOwpAQCAtMjM3LDYgKzI0NywzNCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFz cyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB0aGlzLnNv cnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nLnZh bHVlOwogICAgIH0KIAorICAgIGdldCBpbmxpbmUoKSB7IHJldHVybiB0aGlzLl9pbmxpbmU7IH0K KworICAgIHNldCBpbmxpbmUoeCkKKyAgICB7CisgICAgICAgIHRoaXMuX2lubGluZSA9IHggfHwg ZmFsc2U7CisKKyAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJpbmxpbmUi LCB0aGlzLl9pbmxpbmUpOworCisgICAgICAgIGlmICh0aGlzLl9pbmxpbmUgfHwgdGhpcy5fdmFy aWFibGVIZWlnaHRSb3dzKQorICAgICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVu dC5yZW1vdmVFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGxMaXN0ZW5lcik7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgdGhpcy5fc2Nyb2xsTGlzdGVuZXIpOworICAgIH0KKwor ICAgIGdldCB2YXJpYWJsZUhlaWdodFJvd3MoKSB7IHJldHVybiB0aGlzLl92YXJpYWJsZUhlaWdo dFJvd3M7IH0KKworICAgIHNldCB2YXJpYWJsZUhlaWdodFJvd3MoeCkKKyAgICB7CisgICAgICAg IHRoaXMuX3ZhcmlhYmxlSGVpZ2h0Um93cyA9IHggfHwgZmFsc2U7CisKKyAgICAgICAgdGhpcy5f ZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJ2YXJpYWJsZS1oZWlnaHQtcm93cyIsIHRoaXMuX3Zh cmlhYmxlSGVpZ2h0Um93cyk7CisKKyAgICAgICAgaWYgKHRoaXMuX2lubGluZSB8fCB0aGlzLl92 YXJpYWJsZUhlaWdodFJvd3MpCisgICAgICAgICAgICB0aGlzLl9zY3JvbGxDb250YWluZXJFbGVt ZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3Njcm9sbExpc3RlbmVyKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGxMaXN0ZW5lcik7CisgICAgfQor CiAgICAgX3VwZGF0ZVNvcnRlZENvbHVtbihvbGRTb3J0Q29sdW1uSWRlbnRpZmllcikKICAgICB7 CiAgICAgICAgIGlmICh0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcpCkBAIC01MDYs MTEgKzU0NCw5IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgaWYgKGNvbHVtblsiY29sbGFwc2VzR3JvdXAi XSkgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoY29sdW1uWyJncm91cCJdICE9PSBjb2x1 bW5bImNvbGxhcHNlc0dyb3VwIl0pOwogCi0gICAgICAgICAgICB2YXIgZGl2aWRlckVsZW1lbnQg PSBoZWFkZXJDZWxsRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7Ci0gICAgICAgICAgICBkaXZp ZGVyRWxlbWVudC5jbGFzc05hbWUgPSAiZGl2aWRlciI7CisgICAgICAgICAgICB2YXIgZGl2aWRl ckVsZW1lbnQgPSBoZWFkZXJDZWxsRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgImRpdmlkZXIi KTsKIAotICAgICAgICAgICAgdmFyIGNvbGxhcHNlRGl2ID0gaGVhZGVyQ2VsbEVsZW1lbnQuY3Jl YXRlQ2hpbGQoImRpdiIpOwotICAgICAgICAgICAgY29sbGFwc2VEaXYuY2xhc3NOYW1lID0gImNv bGxhcHNlci1idXR0b24iOworICAgICAgICAgICAgdmFyIGNvbGxhcHNlRGl2ID0gaGVhZGVyQ2Vs bEVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJjb2xsYXBzZXItYnV0dG9uIik7CiAgICAgICAg ICAgICBjb2xsYXBzZURpdi50aXRsZSA9IHRoaXMuX2NvbGxhcHNlckJ1dHRvbkNvbGxhcHNlQ29s dW1uc1Rvb2xUaXAoKTsKICAgICAgICAgICAgIGxpc3RlbmVycy5yZWdpc3Rlcihjb2xsYXBzZURp diwgIm1vdXNlb3ZlciIsIHRoaXMuX21vdXNlb3ZlckNvbHVtbkNvbGxhcHNlcik7CiAgICAgICAg ICAgICBsaXN0ZW5lcnMucmVnaXN0ZXIoY29sbGFwc2VEaXYsICJtb3VzZW91dCIsIHRoaXMuX21v dXNlb3V0Q29sdW1uQ29sbGFwc2VyKTsKQEAgLTYzOCw2ICs2NzQsOCBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAg ICAgICAgICB0aGlzLl9wb3NpdGlvblJlc2l6ZXJFbGVtZW50cygpOwogICAgICAgICAgICAgdGhp cy5fcG9zaXRpb25IZWFkZXJWaWV3cygpOwogICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fdXBk YXRlVmlzaWJsZVJvd3MoKTsKICAgICB9CiAKICAgICBjb2x1bW5XaWR0aHNNYXAoKQpAQCAtNzkx LDYgKzgyOSw4MSBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRl bmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIH0KICAgICB9CiAKKyAgICBfbm90ZVJvd3ND aGFuZ2VkKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3ByZXZpb3VzUmV2ZWFsZWRSb3dDb3VudCA9 IE5hTjsKKworICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CisgICAgfQorCisgICAgX3VwZGF0 ZVZpc2libGVSb3dzKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9pbmxpbmUgfHwgdGhpcy5f dmFyaWFibGVIZWlnaHRSb3dzKSB7CisgICAgICAgICAgICAvLyBJbmxpbmUgRGF0YUdyaWRzIGFs d2F5cyBzaG93IGFsbCB0aGVpciByb3dzLCBzbyB3ZSBjYW4ndCB2aXJ0dWFsaXplIHRoZW0uCisg ICAgICAgICAgICAvLyBJbiBnZW5lcmFsLCBpbmxpbmUgRGF0YUdyaWRzIHVzdWFsbHkgaGF2ZSBh IHNtYWxsIG51bWJlciBvZiByb3dzLgorCisgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBh IHNsb3cgcGF0aCBmb3IgdmFyaWFibGUgaGVpZ2h0IHJvd3MgdGhhdCBpcyBzaW1pbGFyIHRvIHRo ZSBvbGQKKyAgICAgICAgICAgIC8vIG5vbi12aXJ0dWFsaXplZCBEYXRhR3JpZC4gSWRlYWxseSB3 ZSB3b3VsZCB0cmFjayByb3cgaGVpZ2h0IHBlci1EYXRhR3JpZE5vZGUKKyAgICAgICAgICAgIC8v IGFuZCB0aGVuIHdlIGNvdWxkIHZpcnR1YWxpemUgZXZlbiB0aG9zZSBjYXNlcy4gQ3VycmVudGx5 IHZhcmlhYmxlIGhlaWdodCByb3cKKyAgICAgICAgICAgIC8vIERhdGFHcmlkcyBkb24ndCB1c3Vh bGx5IGhhdmUgbWFueSByb3dzLCBvdGhlciB0aGFuIEluZGV4ZWREQi4KKworICAgICAgICAgICAg bGV0IG5leHRFbGVtZW50ID0gdGhpcy5kYXRhVGFibGVCb2R5RWxlbWVudC5sYXN0Q2hpbGQ7Cisg ICAgICAgICAgICBmb3IgKGxldCBpID0gdGhpcy5fcm93cy5sZW5ndGggLSAxOyBpID49IDA7IC0t aSkgeworICAgICAgICAgICAgICAgIGxldCByb3dFbGVtZW50ID0gdGhpcy5fcm93c1tpXS5lbGVt ZW50OworICAgICAgICAgICAgICAgIGlmIChyb3dFbGVtZW50Lm5leHRTaWJsaW5nICE9PSBuZXh0 RWxlbWVudCkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5kYXRhVGFibGVCb2R5RWxlbWVudC5p bnNlcnRCZWZvcmUocm93RWxlbWVudCwgbmV4dEVsZW1lbnQpOworICAgICAgICAgICAgICAgIG5l eHRFbGVtZW50ID0gcm93RWxlbWVudDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKKyAgICAgICAgbGV0IHJvd0hlaWdodCA9IHRoaXMucm93SGVpZ2h0 OworICAgICAgICBsZXQgdXBkYXRlT2Zmc2V0VGhyZXNob2xkID0gcm93SGVpZ2h0ICogNTsKKwor ICAgICAgICBsZXQgcmV2ZWFsZWRSb3dzID0gdGhpcy5fcm93cy5maWx0ZXIoKHJvdykgPT4gcm93 LnJldmVhbGVkKTsKKworICAgICAgICBsZXQgc2Nyb2xsVG9wID0gdGhpcy5fc2Nyb2xsQ29udGFp bmVyRWxlbWVudC5zY3JvbGxUb3A7CisgICAgICAgIGxldCBzY3JvbGxIZWlnaHQgPSB0aGlzLl9z Y3JvbGxDb250YWluZXJFbGVtZW50Lm9mZnNldEhlaWdodDsKKworICAgICAgICBsZXQgY3VycmVu dFRvcE1hcmdpbiA9IHRoaXMuX3RvcERhdGFUYWJsZU1hcmdpbkVsZW1lbnQub2Zmc2V0SGVpZ2h0 OworICAgICAgICBsZXQgY3VycmVudEJvdHRvbU1hcmdpbiA9IHRoaXMuX2JvdHRvbURhdGFUYWJs ZU1hcmdpbkVsZW1lbnQub2Zmc2V0SGVpZ2h0OworICAgICAgICBsZXQgY3VycmVudFRhYmxlQm90 dG9tID0gY3VycmVudFRvcE1hcmdpbiArIHRoaXMuX2RhdGFUYWJsZUVsZW1lbnQub2Zmc2V0SGVp Z2h0OworCisgICAgICAgIGxldCBiZWxvd1RvcFRocmVzaG9sZCA9ICFjdXJyZW50VG9wTWFyZ2lu IHx8IHNjcm9sbFRvcCA+IGN1cnJlbnRUb3BNYXJnaW4gKyB1cGRhdGVPZmZzZXRUaHJlc2hvbGQ7 CisgICAgICAgIGxldCBhYm92ZUJvdHRvbVRocmVzaG9sZCA9ICFjdXJyZW50Qm90dG9tTWFyZ2lu IHx8IHNjcm9sbFRvcCArIHNjcm9sbEhlaWdodCA8IGN1cnJlbnRUYWJsZUJvdHRvbSAtIHVwZGF0 ZU9mZnNldFRocmVzaG9sZDsKKworICAgICAgICBpZiAoYmVsb3dUb3BUaHJlc2hvbGQgJiYgYWJv dmVCb3R0b21UaHJlc2hvbGQgJiYgdGhpcy5fcHJldmlvdXNSZXZlYWxlZFJvd0NvdW50ID09PSBy ZXZlYWxlZFJvd3MubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMu X3ByZXZpb3VzUmV2ZWFsZWRSb3dDb3VudCA9IHJldmVhbGVkUm93cy5sZW5ndGg7CisKKyAgICAg ICAgbGV0IG92ZXJmbG93UGFkZGluZyA9IHVwZGF0ZU9mZnNldFRocmVzaG9sZCAqIDM7CisKKyAg ICAgICAgbGV0IHRvcEhpZGRlblJvd0NvdW50ID0gTWF0aC5tYXgoMCwgTWF0aC5mbG9vcigoc2Ny b2xsVG9wIC0gb3ZlcmZsb3dQYWRkaW5nKSAvIHJvd0hlaWdodCkpOworICAgICAgICBsZXQgdmlz aWJsZVJvd0NvdW50ID0gTWF0aC5jZWlsKChzY3JvbGxIZWlnaHQgKyAob3ZlcmZsb3dQYWRkaW5n ICogMikpIC8gcm93SGVpZ2h0KTsKKyAgICAgICAgbGV0IGJvdHRvbUhpZGRlblJvd0NvdW50ID0g TWF0aC5tYXgoMCwgcmV2ZWFsZWRSb3dzLmxlbmd0aCAtIHRvcEhpZGRlblJvd0NvdW50IC0gdmlz aWJsZVJvd0NvdW50KTsKKworICAgICAgICBsZXQgbWFyZ2luVG9wID0gdG9wSGlkZGVuUm93Q291 bnQgKiByb3dIZWlnaHQ7CisgICAgICAgIGxldCBtYXJnaW5Cb3R0b20gPSBib3R0b21IaWRkZW5S b3dDb3VudCAqIHJvd0hlaWdodDsKKworICAgICAgICB0aGlzLl90b3BEYXRhVGFibGVNYXJnaW5F bGVtZW50LnN0eWxlLmhlaWdodCA9IG1hcmdpblRvcCArICJweCI7CisgICAgICAgIHRoaXMuX2Jv dHRvbURhdGFUYWJsZU1hcmdpbkVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gbWFyZ2luQm90dG9tICsg InB4IjsKKworICAgICAgICB0aGlzLl9kYXRhVGFibGVFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUo Im9kZC1maXJzdC16ZWJyYS1zdHJpcGUiLCAhISh0b3BIaWRkZW5Sb3dDb3VudCAlIDIpKTsKKwor ICAgICAgICB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisKKyAg ICAgICAgZm9yIChsZXQgaSA9IHRvcEhpZGRlblJvd0NvdW50OyBpIDwgdG9wSGlkZGVuUm93Q291 bnQgKyB2aXNpYmxlUm93Q291bnQ7ICsraSkgeworICAgICAgICAgICAgbGV0IHJvd0RhdGFHcmlk Tm9kZSA9IHJldmVhbGVkUm93c1tpXTsKKyAgICAgICAgICAgIGlmICghcm93RGF0YUdyaWROb2Rl KQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgdGhpcy5kYXRhVGFibGVC b2R5RWxlbWVudC5hcHBlbmRDaGlsZChyb3dEYXRhR3JpZE5vZGUuZWxlbWVudCk7CisgICAgICAg IH0KKworICAgICAgICB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2ZpbGxlclJvd0VsZW1lbnQpOworICAgIH0KKwogICAgIGFkZFBsYWNlaG9sZGVyTm9kZSgpCiAg ICAgewogICAgICAgICBpZiAodGhpcy5wbGFjZWhvbGRlck5vZGUpCkBAIC05MzgsMTAgKzEwNTEs MTAgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogCiAgICAgX3NvcnROb2Rlc0NhbGxiYWNrKGNvbXBhcmF0b3IpCiAgICAg ewotICAgICAgICBmdW5jdGlvbiBjb21wYXJhdG9yV3JhcHBlcihhUm93LCBiUm93KQorICAgICAg ICBmdW5jdGlvbiBjb21wYXJhdG9yV3JhcHBlcihhTm9kZSwgYk5vZGUpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIHZhciBhTm9kZSA9IGFSb3cuX2RhdGFHcmlkTm9kZTsKLSAgICAgICAgICAgIHZh ciBiTm9kZSA9IGJSb3cuX2RhdGFHcmlkTm9kZTsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCFhTm9kZS5oYXNDaGlsZHJlbiwgIlRoaXMgc29ydCBtZXRob2QgY2FuJ3QgYmUgdXNlZCB3aXRo IHBhcmVudCBub2RlcywgY2hpbGRyZW4gd2lsbCBiZSBkaXNwbGF5ZWQgb3V0IG9mIG9yZGVyLiIp OworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIWJOb2RlLmhhc0NoaWxkcmVuLCAiVGhpcyBz b3J0IG1ldGhvZCBjYW4ndCBiZSB1c2VkIHdpdGggcGFyZW50IG5vZGVzLCBjaGlsZHJlbiB3aWxs IGJlIGRpc3BsYXllZCBvdXQgb2Ygb3JkZXIuIik7CiAKICAgICAgICAgICAgIGlmIChhTm9kZS5p c1BsYWNlaG9sZGVyTm9kZSkKICAgICAgICAgICAgICAgICByZXR1cm4gMTsKQEAgLTk1OSwyOSAr MTA3MiwyMyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRlbmRz IFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAg ICAgICB2YXIgdGJvZHkgPSB0aGlzLmRhdGFUYWJsZUJvZHlFbGVtZW50OwotICAgICAgICB2YXIg Y2hpbGROb2RlcyA9IHRib2R5LmNoaWxkTm9kZXM7Ci0gICAgICAgIHZhciBmaWxsZXJSb3dFbGVt ZW50ID0gdGJvZHkubGFzdENoaWxkOwotCi0gICAgICAgIHZhciBzb3J0ZWRSb3dFbGVtZW50cyA9 IEFycmF5LnByb3RvdHlwZS5zbGljZS5jYWxsKGNoaWxkTm9kZXMsIDAsIGNoaWxkTm9kZXMubGVu Z3RoIC0gMSk7Ci0gICAgICAgIHNvcnRlZFJvd0VsZW1lbnRzLnNvcnQoY29tcGFyYXRvcldyYXBw ZXIuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX3Jvd3Muc29ydChjb21wYXJhdG9yV3JhcHBl ci5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fbm90ZVJvd3NDaGFuZ2VkKCk7CiAKLSAgICAg ICAgdGJvZHkucmVtb3ZlQ2hpbGRyZW4oKTsKLQotICAgICAgICB2YXIgcHJldmlvdXNTaWJsaW5n Tm9kZSA9IG51bGw7Ci0gICAgICAgIGZvciAodmFyIHJvd0VsZW1lbnQgb2Ygc29ydGVkUm93RWxl bWVudHMpIHsKLSAgICAgICAgICAgIHZhciBub2RlID0gcm93RWxlbWVudC5fZGF0YUdyaWROb2Rl OworICAgICAgICBsZXQgcHJldmlvdXNTaWJsaW5nTm9kZSA9IG51bGw7CisgICAgICAgIGZvciAo bGV0IG5vZGUgb2YgdGhpcy5fcm93cykgewogICAgICAgICAgICAgbm9kZS5wcmV2aW91c1NpYmxp bmcgPSBwcmV2aW91c1NpYmxpbmdOb2RlOwogICAgICAgICAgICAgaWYgKHByZXZpb3VzU2libGlu Z05vZGUpCiAgICAgICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nTm9kZS5uZXh0U2libGluZyA9 IG5vZGU7Ci0gICAgICAgICAgICB0Ym9keS5hcHBlbmRDaGlsZChyb3dFbGVtZW50KTsKICAgICAg ICAgICAgIHByZXZpb3VzU2libGluZ05vZGUgPSBub2RlOwogICAgICAgICB9CiAKICAgICAgICAg aWYgKHByZXZpb3VzU2libGluZ05vZGUpCiAgICAgICAgICAgICBwcmV2aW91c1NpYmxpbmdOb2Rl Lm5leHRTaWJsaW5nID0gbnVsbDsKIAotICAgICAgICB0Ym9keS5hcHBlbmRDaGlsZChmaWxsZXJS b3dFbGVtZW50KTsgLy8gV2UgZXhwZWN0IHRvIGZpbmQgYSBmaWxsZXIgcm93IHdoZW4gYXR0YWNo aW5nIG5vZGVzLgorICAgICAgICAvLyBBIHNvcnRhYmxlIGRhdGEgZ3JpZCBtaWdodCBub3QgYmUg aW4gYWRkZWQgdG8gYSB2aWV3LCBzbyBpdCBuZWVkcyBpdHMgbGF5b3V0IHVwZGF0ZWQgaGVyZS4K KyAgICAgICAgaWYgKCF0aGlzLnBhcmVudFZpZXcpCisgICAgICAgICAgICB0aGlzLnVwZGF0ZUxh eW91dElmTmVlZGVkKCk7CiAgICAgfQogCiAgICAgX3RvZ2dsZWRTb3J0T3JkZXIoKQpAQCAtMTYy NSwxNiArMTczMiwxMiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdy aWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBpZiAoIXRoaXMuX2Vs ZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMuX2hhc0NoaWxk cmVuKQotICAgICAgICB7CisgICAgICAgIGlmICh0aGlzLl9oYXNDaGlsZHJlbikgewogICAgICAg ICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJwYXJlbnQiKTsKICAgICAgICAgICAg IGlmICh0aGlzLmV4cGFuZGVkKQogICAgICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NM aXN0LmFkZCgiZXhwYW5kZWQiKTsKLSAgICAgICAgfQotICAgICAgICBlbHNlCi0gICAgICAgIHsK KyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoInBhcmVudCIsICJleHBhbmRlZCIpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgZ2V0IGhh c0NoaWxkcmVuKCkKQEAgLTE4MzgsOCArMTk0MSwxMCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWRO b2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJjb2xsYXBzZWQiKTsKIAotICAg ICAgICBpZiAodGhpcy5kYXRhR3JpZCkKKyAgICAgICAgaWYgKHRoaXMuZGF0YUdyaWQpIHsKICAg ICAgICAgICAgIHRoaXMuZGF0YUdyaWQuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5FdmVudC5Db2xsYXBzZWROb2RlLCB7ZGF0YUdyaWROb2RlOiB0aGlzfSk7 CisgICAgICAgICAgICB0aGlzLmRhdGFHcmlkLm5lZWRzTGF5b3V0KCk7CisgICAgICAgIH0KICAg ICB9CiAKICAgICBjb2xsYXBzZVJlY3Vyc2l2ZWx5KCkKQEAgLTE4ODYsOCArMTk5MSwxMCBAQCBX ZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KCJleHBhbmRlZCIpOwogCi0gICAgICAgIGlmICh0aGlzLmRhdGFHcmlkKQorICAgICAgICBpZiAo dGhpcy5kYXRhR3JpZCkgewogICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LkV4cGFuZGVkTm9kZSwge2Rh dGFHcmlkTm9kZTogdGhpc30pOworICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5uZWVkc0xheW91 dCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgZXhwYW5kUmVjdXJzaXZlbHkoKQpAQCAtMjA1 NSwyNyArMjE2MiwyOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdy aWROb2RlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuX2F0dGFj aGVkID0gdHJ1ZTsKIAotICAgICAgICB2YXIgbmV4dEVsZW1lbnQgPSBudWxsOworICAgICAgICBs ZXQgaW5zZXJ0aW9uSW5kZXggPSAtMTsKIAogICAgICAgICBpZiAoIXRoaXMuaXNQbGFjZWhvbGRl ck5vZGUpIHsKICAgICAgICAgICAgIHZhciBwcmV2aW91c0dyaWROb2RlID0gdGhpcy50cmF2ZXJz ZVByZXZpb3VzTm9kZSh0cnVlLCB0cnVlKTsKLSAgICAgICAgICAgIGlmIChwcmV2aW91c0dyaWRO b2RlICYmIHByZXZpb3VzR3JpZE5vZGUuZWxlbWVudC5wYXJlbnROb2RlKQotICAgICAgICAgICAg ICAgIG5leHRFbGVtZW50ID0gcHJldmlvdXNHcmlkTm9kZS5lbGVtZW50Lm5leHRTaWJsaW5nOwot ICAgICAgICAgICAgZWxzZSBpZiAoIXByZXZpb3VzR3JpZE5vZGUpCi0gICAgICAgICAgICAgICAg bmV4dEVsZW1lbnQgPSB0aGlzLmRhdGFHcmlkLmRhdGFUYWJsZUJvZHlFbGVtZW50LmZpcnN0Q2hp bGQ7CisgICAgICAgICAgICBpbnNlcnRpb25JbmRleCA9IHRoaXMuZGF0YUdyaWQuX3Jvd3MuaW5k ZXhPZihwcmV2aW91c0dyaWROb2RlKTsKKyAgICAgICAgICAgIGlmIChpbnNlcnRpb25JbmRleCA9 PT0gLTEpCisgICAgICAgICAgICAgICAgaW5zZXJ0aW9uSW5kZXggPSAwOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIGluc2VydGlvbkluZGV4Kys7CiAgICAgICAgIH0KIAotICAg ICAgICAvLyBJZiB0aGVyZSBpcyBubyBuZXh0IGdyaWQgbm9kZSwgdGhlbiBhcHBlbmQgYmVmb3Jl IHRoZSBsYXN0IGNoaWxkIHNpbmNlIHRoZSBsYXN0IGNoaWxkIGlzIHRoZSBmaWxsZXIgcm93Lgot ICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmRhdGFHcmlkLmRhdGFUYWJsZUJvZHlFbGVtZW50 Lmxhc3RDaGlsZC5jbGFzc0xpc3QuY29udGFpbnMoImZpbGxlciIpKTsKLQotICAgICAgICBpZiAo IW5leHRFbGVtZW50KQotICAgICAgICAgICAgbmV4dEVsZW1lbnQgPSB0aGlzLmRhdGFHcmlkLmRh dGFUYWJsZUJvZHlFbGVtZW50Lmxhc3RDaGlsZDsKKyAgICAgICAgaWYgKGluc2VydGlvbkluZGV4 ID09PSAtMSkKKyAgICAgICAgICAgIHRoaXMuZGF0YUdyaWQuX3Jvd3MucHVzaCh0aGlzKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC5fcm93cy5pbnNlcnRBdEluZGV4 KHRoaXMsIGluc2VydGlvbkluZGV4KTsKIAotICAgICAgICB0aGlzLmRhdGFHcmlkLmRhdGFUYWJs ZUJvZHlFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIG5leHRFbGVtZW50KTsKKyAg ICAgICAgdGhpcy5kYXRhR3JpZC5fbm90ZVJvd3NDaGFuZ2VkKCk7CiAKLSAgICAgICAgaWYgKHRo aXMuZXhwYW5kZWQpCisgICAgICAgIGlmICh0aGlzLmV4cGFuZGVkKSB7CiAgICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHRoaXMuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCiAgICAgICAgICAg ICAgICAgdGhpcy5jaGlsZHJlbltpXS5fYXR0YWNoKCk7CisgICAgICAgIH0KICAgICB9CiAKICAg ICBfZGV0YWNoKCkKQEAgLTIwODUsOCArMjE5Myw4IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5v ZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAg ICAgICAgdGhpcy5fYXR0YWNoZWQgPSBmYWxzZTsKIAotICAgICAgICBpZiAodGhpcy5fZWxlbWVu dCAmJiB0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUpCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50 LnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQodGhpcy5fZWxlbWVudCk7CisgICAgICAgIHRoaXMuZGF0 YUdyaWQuX3Jvd3MucmVtb3ZlKHRoaXMsIHRydWUpOworICAgICAgICB0aGlzLmRhdGFHcmlkLl9u b3RlUm93c0NoYW5nZWQoKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuY2hp bGRyZW4ubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLmNoaWxkcmVuW2ldLl9kZXRhY2go KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVVzZXJRdWVyeVN1Y2Nlc3NWaWV3LmpzCmluZGV4 IGYyZGI2YzRhNDYzYTExYjBhYjMyNTkzZTk0MGY4ZjNmOTkyYWQ4YWUuLjA5NDRkYzk5ZjBiZjBi M2NhMTJhNGJhZjRmNTEwOTZmMGMxZjRkMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VV c2VyUXVlcnlTdWNjZXNzVmlldy5qcwpAQCAtMzEsOCArMzEsMTEgQEAgV2ViSW5zcGVjdG9yLkRh dGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcgPSBjbGFzcyBEYXRhYmFzZVVzZXJRdWVyeVN1Y2Nl c3NWaWV3IGUKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5jcmVhdGVTb3J0YWJsZURhdGFHcmlkKGNvbHVtbk5hbWVzLCB2YWx1ZXMpOwogICAgICAgICBp ZiAodGhpcy5fZGF0YUdyaWQpIHsKLSAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgiaW5saW5lIik7CisgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5pbmxp bmUgPSB0cnVlOworCiAgICAgICAgICAgICB0aGlzLnJlc3VsdEVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CisKKyAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVw ZGF0ZUxheW91dElmTmVlZGVkKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlz LnJlc3VsdEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibm8tcmVzdWx0cyIpOwogICAgICAgICAgICAg dGhpcy5yZXN1bHRFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJR dWVyeSByZXR1cm5lZCBubyByZXN1bHRzLiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4 IDVlMDA0ODIxNmNiODNhMzY2MDY2N2M5MWM3YzY3ZTE4ZDVmNWI1YzUuLjZlZjdkMzk0YTIyY2Nm OTRjY2VjMzc1NjQyN2FjYWM0Zjk2M2ViMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAg LTI2MiwyMiArMjYyLDEyIEBACiAgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKIH0KIAotLmRldGFp bHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdGFibGUuZGF0YSB7Ci0gICAgYmFja2dy b3VuZC1pbWFnZTogbm9uZTsKLX0KLQotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRh LWdyaWQgdHI6bnRoLWNoaWxkKGV2ZW4pIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK LX0KLQotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdHI6bnRoLWNoaWxk KG9kZCkgewotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTQsIDQxJSwgOTYlKTsKLX0KLQog LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50IC5kYXRhLWdyaWQgdGQudmFsdWUtY29sdW1uIHsK ICAgICBoZWlnaHQ6IGF1dG87CiAgICAgbGluZS1oZWlnaHQ6IGluaXRpYWw7CiAgICAgd2hpdGUt c3BhY2U6IG5vcm1hbDsKKyAgICBwYWRkaW5nLXRvcDogNHB4OworICAgIHBhZGRpbmctYm90dG9t OiA0cHg7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZGF0YS1ncmlkIHRkLnZh bHVlLWNvbHVtbiA+IGRpdiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbkRhdGFHcmlkUm93LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25EYXRhR3JpZFJv dy5qcwppbmRleCA5NjRkNjkyNGJlODE4Njk3OWNjZDliZWQ0MjY0YTFlODM2NmU1MjJjLi43OWYw ZDBiODg5OTQxMGI4M2FiYTMwMmMyNzhjNmQ5NmE0ZDBkZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbkRhdGFHcmlk Um93LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rl dGFpbHNTZWN0aW9uRGF0YUdyaWRSb3cuanMKQEAgLTQ5LDEwICs0OSwxMyBAQCBXZWJJbnNwZWN0 b3IuRGV0YWlsc1NlY3Rpb25EYXRhR3JpZFJvdyA9IGNsYXNzIERldGFpbHNTZWN0aW9uRGF0YUdy aWRSb3cgZXh0ZW5kcwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkIHx8IG51bGw7 CiAKICAgICAgICAgaWYgKGRhdGFHcmlkKSB7Ci0gICAgICAgICAgICBkYXRhR3JpZC5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOworICAgICAgICAgICAgZGF0YUdyaWQuaW5saW5lID0g dHJ1ZTsKKyAgICAgICAgICAgIGRhdGFHcmlkLnZhcmlhYmxlSGVpZ2h0Um93cyA9IHRydWU7CiAK ICAgICAgICAgICAgIHRoaXMuaGlkZUVtcHR5TWVzc2FnZSgpOwogICAgICAgICAgICAgdGhpcy5l bGVtZW50LmFwcGVuZENoaWxkKGRhdGFHcmlkLmVsZW1lbnQpOworCisgICAgICAgICAgICBkYXRh R3JpZC51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAg IHRoaXMuc2hvd0VtcHR5TWVzc2FnZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdEluc3RhbmNlc0NvbnRl bnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hl YXBTbmFwc2hvdEluc3RhbmNlc0NvbnRlbnRWaWV3LmNzcwppbmRleCA4MjRkMWVkZWRkZmIyZjA2 ZDcwNTk5ZTU2MGExNzFlMmZkN2NiOWU1Li44YzQ5ZDkxMWYyZTNkZGVmMjRmZTBiY2YyYWM1MmRj NmIxMDNkOGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9IZWFwU25hcHNob3RJbnN0YW5jZXNDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90SW5zdGFuY2Vz Q29udGVudFZpZXcuY3NzCkBAIC02NSw3ICs2NSw2IEBACiAgICAgcG9zaXRpb246IHJlbGF0aXZl OwogICAgIHdpZHRoOiAxNnB4OwogICAgIGhlaWdodDogMTZweDsKLSAgICBtYXJnaW4tdG9wOiAx cHg7CiAgICAgbWFyZ2luLWxlZnQ6IDJweDsKIH0KIApAQCAtNzgsNyArNzcsNiBAQAogICAgIHBv c2l0aW9uOiByZWxhdGl2ZTsKICAgICB3aWR0aDogMTZweDsKICAgICBoZWlnaHQ6IDE2cHg7Ci0g ICAgbWFyZ2luLXRvcDogMXB4OwogICAgIG1hcmdpbi1yaWdodDogNHB4OwogICAgIGNvbnRlbnQ6 IHVybCguLi9JbWFnZXMvVHlwZVVuZGVmaW5lZC5zdmcpOwogfQpAQCAtMTIyLDggKzEyMCw3IEBA CiAuaGVhcC1zbmFwc2hvdCA+IC5kYXRhLWdyaWQgdGQgLmZvcm1hdHRlZC1ub2RlLXByZXZpZXcs CiAuaGVhcC1zbmFwc2hvdCA+IC5kYXRhLWdyaWQgdGQgLm9iamVjdC1wcmV2aWV3IHsKICAgICB0 ZXh0LWluZGVudDogMDsgLyogRG8gbm90IGluaGVyaXQgdGhlIERhdGFHcmlkJ3MgaW5kZW50LiAq LwotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBoZWlnaHQ6IDE2cHg7CisgICAgbGlu ZS1oZWlnaHQ6IGluaXRpYWw7CiB9CiAKIC5oZWFwLXNuYXBzaG90LWluc3RhbmNlLXBvcG92ZXIt Y29udGVudCA+IC50aXRsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRh YmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuY3NzCmluZGV4IDM3NjMzYzVhNDU3Y2I5MWQ4NjUx NmEzZTRlZTJlYmZjMjk0MTBhNjAuLjZiZmMzYTFiZTM1NmMxNGIwOGViOGM2ZDYxMDFmNWFmNGIz NzQzYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVj dFN0b3JlQ29udGVudFZpZXcuY3NzCkBAIC0zMSwyMyArMzEsNiBAQAogICAgIGJvdHRvbTogMDsK IH0KIAotLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRh LWdyaWQgdGFibGUuZGF0YSB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKLX0KLQotLmNv bnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRhLWdyaWQgdGFi bGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikgewotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRl OwotfQotCi0uY29udGVudC12aWV3LmluZGV4ZWQtZGF0YWJhc2Utb2JqZWN0LXN0b3JlID4gLmRh dGEtZ3JpZCB0YWJsZS5kYXRhIHRyOm50aC1jaGlsZChvZGQpIHsKLSAgICBiYWNrZ3JvdW5kLWNv bG9yOiBoc2woMjE0LCA0MSUsIDk2JSk7Ci19Ci0KLS5jb250ZW50LXZpZXcuaW5kZXhlZC1kYXRh YmFzZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRhYmxlLmRhdGEgdHIuZmlsbGVyIHsKLSAv KiBGSVhNRTogVGhpcyBzaG91bGQgc2hvdyBhbiBhbHRlcm5hdGluZyBzdHJpcGUsIGJ1dCBJIGNv dWxkbid0IG1ha2UgaXQgd29yay4gKi8KLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKLX0K LQogLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSA+IC5kYXRhLWdy aWQgdHIuc2VsZWN0ZWQgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTAsIDkwJSwgOTAl KSAhaW1wb3J0YW50OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFz ZU9iamVjdFN0b3JlQ29udGVudFZpZXcuanMKaW5kZXggYWM4NjA1NDFiYjU2YzAxM2YzMDJlOGE2 OTg2MGI4ZDI1MjQwNjNmZi4uZGY2NmE0NWZmOTQyMzE0ZWNmZGNhOGJkNGEwMTk4NGNkMzlmZTQ3 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv SW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9y ZUNvbnRlbnRWaWV3LmpzCkBAIC02OCw2ICs2OCw3IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkRGF0 YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3ID0gY2xhc3MgSW5kZXhlZERhdGFiYXNlT2JqZWN0 CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQoY29sdW1uSW5mbyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnZhcmlhYmxlSGVp Z2h0Um93cyA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNjcm9sbENvbnRhaW5lci5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9kYXRhR3JpZFNjcm9sbGVkLmJpbmQodGhp cykpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVE ZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCAxYmU3MTFkMDI1 NDA0MzA3OTRmNjVjYWRmYjMyZTJjNzlmYmE1ZTljLi44NTdlZTg0YjYzMTYwYWViODU0NDRmMGE0 NTk4Y2Y2Y2RiZDlhMmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRl YmFyUGFuZWwuanMKQEAgLTEzOCw2ICsxMzgsNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgZQog ICAgICAgICBjb2x1bW5zLm1lbW9yeS53aWR0aCA9ICI3MHB4IjsKIAogICAgICAgICB0aGlzLl9k YXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CisgICAgICAgIHRo aXMuX2RhdGFHcmlkLmlubGluZSA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlz Ll9zb3J0RGF0YUdyaWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0 aGlzLl9zZWxlY3RlZERhdGFHcmlkTm9kZUNoYW5nZWQsIHRoaXMpOwogCkBAIC0xNDUsNyArMTQ2 LDYgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBM YXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgdGhpcy5zb3J0T3JkZXJTZXR0 aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXllci10cmVlLWRldGFpbHMtc2lkZWJh ci1wYW5lbC1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5EZXNj ZW5kaW5nKTsKIAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQ7 Ci0gICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaW5saW5lIik7CiAgICAgICAgIGVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9kYXRhR3JpZEdhaW5lZEZvY3VzLmJp bmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJibHVy IiwgdGhpcy5fZGF0YUdyaWRMb3N0Rm9jdXMuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICBl bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZGF0YUdyaWRXYXNDbGlja2Vk LmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcwppbmRleCA1OWMyZWJl ZjYyZjQwMzFkZThhOTY5YzNhY2EwZmNkNTM3NjM2ZjdjLi5mZTViOGM4NzVkOTUzYTM5ODNiMTE1 Y2M1ZjNkZGQ1ZGRkZTZmNjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuY3NzCkBAIC0xMTcsMTUg KzExNyw2IEBACiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDIxMCwgOTAlLCA5MCUpICFpbXBv cnRhbnQ7CiB9CiAKLS5jb25zb2xlLWl0ZW0gLmRhdGEtZ3JpZCB0YWJsZS5kYXRhIHsKLSAgICBi YWNrZ3JvdW5kLWltYWdlOiBub25lOwotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwotfQot Ci0uY29uc29sZS1pdGVtIC5kYXRhLWdyaWQgdGFibGUuZGF0YSB0cjpudGgtY2hpbGQoZXZlbikg ewotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMTQsIDQxJSwgOTYlKTsKLX0KLQogLmNvbnNv bGUtaXRlbSAuZGF0YS1ncmlkIHRyLnNlbGVjdGVkIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBo c2woMjEwLCAwJSwgOTAlKSAhaW1wb3J0YW50OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmNzcwppbmRleCAzMTNhMDI3ZDUzNTA5OTI0N2FjMWI0Y2ZlZjE1ZmFmNmYwOTA5 MTE4Li5lODM4YjRlODUzYjI2MzllZTczYzg2ZTQwNDg0MDhhOWRmMjlhNDBiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmNzcwpAQCAtMzQsMTMgKzM0LDMgQEAKIC5jb250 ZW50LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0aCB7CiAgICAgYm9yZGVyLXRvcDog bm9uZTsKIH0KLQotLmNvbnRlbnQtdmlldy5uZXR3b3JrLWdyaWQgPiAuZGF0YS1ncmlkIHRkIHsK LSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgbGluZS1oZWlnaHQ6IDE2cHg7Ci19Ci0KLS5jb250ZW50 LXZpZXcubmV0d29yay1ncmlkID4gLmRhdGEtZ3JpZCB0YWJsZS5kYXRhIHsKLSAgICBiYWNrZ3Jv dW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCB3aGl0ZSwgd2hpdGUgNTAlLCBo c2woMCwgMCUsIDk1JSkgNTAlLCBoc2woMCwgMCUsIDk1JSkpOwotICAgIGJhY2tncm91bmQtc2l6 ZTogMTAwJSA0MHB4OwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0YUdyaWQuanMKaW5kZXggNDNiNjFjYzNl Mjg5MTRlNmIyMzRjYTYxMGU5Y2Q1ZWE3NzQ1N2Y2Yi4uNDZlMTNmMTAyMTU3NDIzZDc3YTY2ZjM4 YTM2ODAxMGJkMDgwOWU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpzCkBAIC00MCw3ICs0 MCw3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkID0gY2xhc3MgUHJvYmVTZXREYXRh R3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAKICAgICAgICAgdGhpcy5wcm9iZVNldCA9 IHByb2JlU2V0OwogCi0gICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUi KTsKKyAgICAgICAgdGhpcy5pbmxpbmUgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2ZyYW1lTm9k ZXMgPSBuZXcgTWFwOwogICAgICAgICB0aGlzLl9sYXN0VXBkYXRlZEZyYW1lID0gbnVsbDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2Zp bGVWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1By b2ZpbGVWaWV3LmNzcwppbmRleCBlM2M1NTQ4MGY5Y2VjNjdlOGM0ZDEyM2RmZDU3NzI2NTFjODc5 MWI1Li4yMzcyMzA5OGM1NjYzYjBjYmEwODZkNmQ1YTQ1NjkyYTZkNTRlMDkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlVmlldy5j c3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmls ZVZpZXcuY3NzCkBAIC0zOSw3ICszOSw2IEBACiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAg IHdpZHRoOiAxNnB4OwogICAgIGhlaWdodDogMTZweDsKLSAgICBtYXJnaW4tdG9wOiAxcHg7CiAg ICAgbWFyZ2luLXJpZ2h0OiAzcHg7CiB9CiAKQEAgLTc3LDcgKzc2LDYgQEAKICAgICBwb3NpdGlv bjogcmVsYXRpdmU7CiAgICAgd2lkdGg6IDE2cHg7CiAgICAgaGVpZ2h0OiAxNnB4OwotICAgIG1h cmdpbi10b3A6IDFweDsKICAgICBtYXJnaW4tbGVmdDogMnB4OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzCmluZGV4IGY3ZmNkNTFhMTFiN2Nm ZDNiNDM4MDJkNTlhODU2OGIwYTY2ZTUxYjIuLmZjMmNhY2IwOTJhZjVhZjAzNzEzOTA5MmJjOGY1 YTBkOTk3NWZkY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuY3NzCkBAIC02MSwxMyArNjEsMyBAQAogLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNv cmRpbmcgPiAuY29udGVudC1icm93c2VyID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uc2NvcGUt YmFyLmRlZmF1bHQtaXRlbS1zZWxlY3RlZCA+IC5tdWx0aXBsZSAuYXJyb3dzIHsKICAgICBjb2xv cjogYmxhY2s7CiB9Ci0KLS5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRl bnQtYnJvd3NlciA+IC5jb250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAu ZGF0YS1ncmlkIHRkIHsKLSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgbGluZS1oZWlnaHQ6IDE2cHg7 Ci19Ci0KLS5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3Nl ciA+IC5jb250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAuZGF0YS1ncmlk IHRhYmxlLmRhdGEgewotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBi b3R0b20sIHdoaXRlLCB3aGl0ZSA1MCUsIGhzbCgwLCAwJSwgOTUlKSA1MCUsIGhzbCgwLCAwJSwg OTUlKSk7Ci0gICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDQwcHg7Ci19CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVzLmNzcwpp bmRleCA5ODUwZDI3NTQ4YmI2ZDRiNmZhMDQxYTgwNDFhYTdiMzU0ZWE2ZjYyLi5hOTBlYjg2YmM5 MWZjNjQ3ZDYxMTU5ZGM0ZGUwNzNlNzQyNmMxYjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxlcy5jc3MKQEAgLTcwLDYg KzcwLDkgQEAKICAgICAtLW1lbW9yeS1leHRyYS1maWxsLWNvbG9yOiBoc2woMjExLCA1MyUsIDcw JSk7CiAgICAgLS1tZW1vcnktZXh0cmEtc3Ryb2tlLWNvbG9yOiBoc2woMjExLCA1MyUsIDU1JSk7 CiAKKyAgICAtLWV2ZW4temVicmEtc3RyaXBlLXJvdy1iYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK KyAgICAtLW9kZC16ZWJyYS1zdHJpcGUtcm93LWJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwg OTUlKTsKKwogICAgIC0tdG9vbGJhci1oZWlnaHQ6IDM2cHg7CiAgICAgLS10YWItYmFyLWhlaWdo dDogMjRweDsKIH0K