68242 2011-09-16 05:32:17 -0700 Web Inspector: change WebInspector.currentPanel getter/setter to functions 2011-09-16 05:54:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 68234 1 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 468442 0 loislo 2011-09-16 05:32:17 -0700 This is necessary for the panel switching performance tests. 468445 1 107639 loislo 2011-09-16 05:40:23 -0700 Created attachment 107639 [patch] initial version 468450 2 107639 loislo 2011-09-16 05:54:37 -0700 Comment on attachment 107639 [patch] initial version Clearing flags on attachment: 107639 Committed r95287: <http://trac.webkit.org/changeset/95287> 468451 3 loislo 2011-09-16 05:54:45 -0700 All reviewed patches have been landed. Closing bug. 107639 2011-09-16 05:40:23 -0700 2011-09-16 05:54:37 -0700 [patch] initial version patch text/plain 23346 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiZWUyNGM2Li5mNTdiNjllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDkt MTYgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IGNoYW5nZSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsIGdldHRlci9zZXR0 ZXIgdG8gZnVuY3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjgyNDIKKworICAgICAgICBUaGlzIGlzIG5lY2Vzc2FyeSBmb3IgdGhlIHBhbmVs IHN3aXRjaGluZyBwZXJmb3JtYW5jZSB0ZXN0cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRy ZWUvcmVzb3VyY2UtdHJlZS10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9SZXNvdXJjZVRy ZWVUZXN0Lkluc3BlY3RvclRlc3QuZHVtcFJlc291cmNlc1RyZWUpOgorICAgICAgICAqIGluc3Bl Y3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1leHBhbmQtc2NvcGUuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZGVidWdnZXIvZGVidWdnZXItcHJvdG8tcHJvcGVydHkuaHRtbDoKKyAgICAgICAgKiBp bnNwZWN0b3Ivc3RvcmFnZS1wYW5lbC1kb20tc3RvcmFnZS5odG1sOgorCiAyMDExLTA5LTE1ICBa b2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBVbnJl dmlld2VkIGdhcmRlbmluZy4gQWRkaW5nIG5ldyB0ZXN0IGV4cGVjdGF0aW9ucy4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRyZWUvcmVzb3Vy Y2UtdHJlZS10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3Vy Y2UtdHJlZS9yZXNvdXJjZS10cmVlLXRlc3QuanMKaW5kZXggYmE0NTQyOC4uYmFkNzViZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9y ZXNvdXJjZS10cmVlLXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZS10cmVlLXRlc3QuanMKQEAgLTYzLDcgKzYzLDcgQEAg SW5zcGVjdG9yVGVzdC5kdW1wUmVzb3VyY2VzVHJlZSA9IGZ1bmN0aW9uKCkKICAgICAgICAgICAg IGR1bXAoY2hpbGRyZW5baV0sIHByZWZpeCArICIgICAgIik7CiAgICAgfQogCi0gICAgV2ViSW5z cGVjdG9yLmN1cnJlbnRQYW5lbCA9IFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzOworICAg IFdlYkluc3BlY3Rvci5zZXRDdXJyZW50UGFuZWwoV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJj ZXMpOwogICAgIGR1bXAoV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VzTGlz dFRyZWVFbGVtZW50LCAiIik7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9kZWJ1Z2dlci1leHBhbmQtc2NvcGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1leHBhbmQtc2NvcGUuaHRtbAppbmRleCA2NDE0MDI1Li5k NWYwNGQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdn ZXItZXhwYW5kLXNjb3BlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L2RlYnVnZ2VyLWV4cGFuZC1zY29wZS5odG1sCkBAIC0zNSw3ICszNSw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgIHsKICAgICAgICAgLy8gRXhwYW5kIGFsbCBidXQgZ2xvYmFsIHNjb3Blcy4gRXhw YW5kaW5nIGdsb2JhbCBzY29wZSB0YWtlcyBmb3IgdG9vIGxvbmcKICAgICAgICAgLy8gc28gd2Ug a2VlcCBpdCBjb2xsYXBzZWQuCi0gICAgICAgIHZhciBzZWN0aW9ucyA9IFdlYkluc3BlY3Rvci5j dXJyZW50UGFuZWwuc2lkZWJhclBhbmVzLnNjb3BlY2hhaW4uX3NlY3Rpb25zOworICAgICAgICB2 YXIgc2VjdGlvbnMgPSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCkuc2lkZWJhclBhbmVzLnNj b3BlY2hhaW4uX3NlY3Rpb25zOwogICAgICAgICAvLyBnbG9iYWwgc2NvcGUgaXMgYWx3YXlzIHRo ZSBsYXN0IG9uZS4KICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWN0aW9ucy5sZW5ndGgg LSAxOyBpKyspCiAgICAgICAgICAgICBzZWN0aW9uc1tpXS5leHBhbmQoKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1wcm90by1wcm9wZXJ0eS5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXByb3RvLXByb3Bl cnR5Lmh0bWwKaW5kZXggOGI2YTQ0Mi4uNTJjNTgxNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXByb3RvLXByb3BlcnR5Lmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXByb3RvLXByb3BlcnR5Lmh0bWwK QEAgLTMwLDcgKzMwLDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAKICAgICBmdW5jdGlvbiBz dGVwMihjYWxsRnJhbWVzKQogICAgIHsKLSAgICAgICAgdmFyIHNlY3Rpb25zID0gV2ViSW5zcGVj dG9yLmN1cnJlbnRQYW5lbC5zaWRlYmFyUGFuZXMuc2NvcGVjaGFpbi5fc2VjdGlvbnM7CisgICAg ICAgIHZhciBzZWN0aW9ucyA9IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKS5zaWRlYmFyUGFu ZXMuc2NvcGVjaGFpbi5fc2VjdGlvbnM7CiAgICAgICAgIHZhciBsb2NhbFNjb3BlID0gc2VjdGlv bnNbMF0ucHJvcGVydGllc1RyZWVPdXRsaW5lOwogICAgICAgICB2YXIgcHJvcGVydGllcyA9IFsK ICAgICAgICAgICAgIGxvY2FsU2NvcGUsIFsibyIsICJfX3Byb3RvX18iLCAiX19wcm90b19fIl0s CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3RvcmFnZS1wYW5lbC1kb20tc3Rv cmFnZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0b3JhZ2UtcGFuZWwtZG9tLXN0b3Jh Z2UuaHRtbAppbmRleCBiMmIzZjQ5Li40Nzc4NzFlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3RvcmFnZS1wYW5lbC1kb20tc3RvcmFnZS5odG1sCisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9zdG9yYWdlLXBhbmVsLWRvbS1zdG9yYWdlLmh0bWwKQEAgLTMwLDcgKzMwLDcg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGlmIChzdG9yYWdlcykgewogICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBzdG9yYWdlcy5sZW5ndGg7IGkrKykgewogICAgICAgICAgICAg ICAgIHZhciBzdG9yYWdlID0gc3RvcmFnZXNbaV07Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmN1cnJlbnRQYW5lbC5zaG93RE9NU3RvcmFnZShzdG9yYWdlKTsKKyAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCkuc2hvd0RPTVN0b3JhZ2Uoc3RvcmFnZSk7CiAg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkRpZCBzaG93OiAiICsgbmFt ZShzdG9yYWdlKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDU4OWYxYWYuLmRmY2JlYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0OCBAQAorMjAxMS0wOS0x NiAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogY2hhbmdlIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgZ2V0dGVyL3NldHRl ciB0byBmdW5jdGlvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02ODI0MgorCisgICAgICAgIFRoaXMgaXMgbmVjZXNzYXJ5IGZvciB0aGUgcGFuZWwg c3dpdGNoaW5nIHBlcmZvcm1hbmNlIHRlc3RzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EcmF3ZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZS5zaG93LmFuaW1hdGlvbkZpbmlz aGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EcmF3ZXIucHJvdG90eXBlLnNob3cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUuaGlkZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZS5fYW5pbWF0ZURyYXdlckhlaWdodC5hbmltYXRpb25G aW5pc2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZS5fYW5pbWF0 ZURyYXdlckhlaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZS5f c3RhdHVzQmFyRHJhZ2dpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlw ZS5zd2l0Y2hUb0FuZEZvY3VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZS5zaG93QW5jaG9yTG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2VhcmNoQ29u dHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3Rv dHlwZS51cGRhdGVTZWFyY2hNYXRjaGVzQ291bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNl YXJjaENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZUN1cnJlbnRNYXRjaEluZGV4KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS51cGRhdGVTZWFyY2hM YWJlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUu aGFuZGxlU2hvcnRjdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIu cHJvdG90eXBlLl9wZXJmb3JtU2VhcmNoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Rvb2xiYXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVG9vbGJhci5jcmVhdGVQYW5lbFRv b2xiYXJJdGVtLm9uVG9vbGJhckl0ZW1DbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U b29sYmFyLmNyZWF0ZVBhbmVsVG9vbGJhckl0ZW0pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuX3VwZGF0ZUZvY3VzZWROb2RlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci53aW5kb3dSZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRvY3VtZW50 S2V5RG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDYW5Db3B5KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5kb2N1bWVudENvcHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNo b3dQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc3RhcnRVc2VySW5pdGlhdGVkRGVidWdn aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5pbnNwZWN0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uSW5QYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu X3Rvb2xiYXJJdGVtQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWxIaXN0b3J5 LnByb3RvdHlwZS5nb0JhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsSGlzdG9yeS5w cm90b3R5cGUuZ29Gb3J3YXJkKToKKwogMjAxMS0wOS0xNSAgS2Vpc2hpIEhhdHRvcmkgIDxrZWlz aGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEJ1aWxkIGZpeDogUmVtb3ZlIHVz ZSBvZiBHcmFwaGljc0NvbnRleHQ6OnNldElzQWNjZWxlcmF0ZWRDb250ZXh0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRHJhd2VyLmpzCmluZGV4IDY4NWE2NmYuLmY1MzYy ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRHJhd2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRHJhd2VyLmpzCkBA IC0xMjIsOCArMTIyLDggQEAgV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgZnVuY3Rpb24gYW5pbWF0aW9uRmluaXNoZWQoKQogICAgICAgICB7Ci0gICAgICAgICAg ICBpZiAoInVwZGF0ZVN0YXR1c0Jhckl0ZW1zIiBpbiBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVs KQotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwudXBkYXRlU3RhdHVz QmFySXRlbXMoKTsKKyAgICAgICAgICAgIGlmICgidXBkYXRlU3RhdHVzQmFySXRlbXMiIGluIFdl Ykluc3BlY3Rvci5jdXJyZW50UGFuZWwoKSkKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu Y3VycmVudFBhbmVsKCkudXBkYXRlU3RhdHVzQmFySXRlbXMoKTsKICAgICAgICAgICAgIGlmICh0 aGlzLnZpc2libGVWaWV3LmFmdGVyU2hvdykKICAgICAgICAgICAgICAgICB0aGlzLnZpc2libGVW aWV3LmFmdGVyU2hvdygpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2FuaW1hdGluZzsKQEAg LTE2MCw4ICsxNjAsOCBAQCBXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgLy8gbGlrZSBFbGVtZW50cyBpbiB0aGVpciB1cGRhdGVTdGF0dXNCYXJJdGVtcyBjYWxsIHdp bGwgc2l6ZSB0aGluZ3MgdG8gZml0IHRoZSBmaW5hbCBsb2NhdGlvbi4KICAgICAgICAgdGhpcy5f bWFpblN0YXR1c0Jhci5zdHlsZS5zZXRQcm9wZXJ0eSgicGFkZGluZy1sZWZ0IiwgKGFuY2hvcmVk SXRlbXMub2Zmc2V0V2lkdGggLSAxKSArICJweCIpOwogICAgICAgICBkb2N1bWVudC5ib2R5LnJl bW92ZVN0eWxlQ2xhc3MoImRyYXdlci12aXNpYmxlIik7Ci0gICAgICAgIGlmICgidXBkYXRlU3Rh dHVzQmFySXRlbXMiIGluIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwpCi0gICAgICAgICAgICBX ZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsLnVwZGF0ZVN0YXR1c0Jhckl0ZW1zKCk7CisgICAgICAg IGlmICgidXBkYXRlU3RhdHVzQmFySXRlbXMiIGluIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwo KSkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKS51cGRhdGVTdGF0dXNC YXJJdGVtcygpOwogICAgICAgICBkb2N1bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoImRyYXdlci12 aXNpYmxlIik7CiAKICAgICAgICAgdmFyIGFuaW1hdGlvbnMgPSBbCkBAIC0xNzksNyArMTc5LDcg QEAgV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24g YW5pbWF0aW9uRmluaXNoZWQoKQogICAgICAgICB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iu Y3VycmVudFBhbmVsLmRvUmVzaXplKCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVu dFBhbmVsKCkuZG9SZXNpemUoKTsKICAgICAgICAgICAgIHRoaXMuX21haW5TdGF0dXNCYXIuaW5z ZXJ0QmVmb3JlKGFuY2hvcmVkSXRlbXMsIHRoaXMuX21haW5TdGF0dXNCYXIuZmlyc3RDaGlsZCk7 CiAgICAgICAgICAgICB0aGlzLl9tYWluU3RhdHVzQmFyLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJw YWRkaW5nLWxlZnQiKTsKIApAQCAtMjkzLDcgKzI5Myw3IEBAIFdlYkluc3BlY3Rvci5EcmF3ZXIu cHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIGFuaW1hdGlvbkZpbmlzaGVkKCkKICAg ICAgICAgewotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbC5kb1Jlc2l6ZSgp OworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCgpLmRvUmVzaXplKCk7CiAg ICAgICAgICAgICBkZWxldGUgdGhpcy5fYW5pbWF0aW5nOwogICAgICAgICAgICAgZGVsZXRlIHRo aXMuX2N1cnJlbnRBbmltYXRpb247CiAgICAgICAgICAgICB0aGlzLnN0YXRlID0gZmluYWxTdGF0 ZTsKQEAgLTM0Myw4ICszNDMsOCBAQCBXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZSA9IHsK IAogICAgICAgICB0aGlzLl9tYWluRWxlbWVudC5zdHlsZS5ib3R0b20gPSBoZWlnaHQgKyAicHgi OwogICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gaGVpZ2h0ICsgInB4IjsKLSAg ICAgICAgaWYgKFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwpCi0gICAgICAgICAgICBXZWJJbnNw ZWN0b3IuY3VycmVudFBhbmVsLmRvUmVzaXplKCk7CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3Iu Y3VycmVudFBhbmVsKCkpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCku ZG9SZXNpemUoKTsKIAogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICBl dmVudC5zdG9wUHJvcGFnYXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRleCA3MTE3ODNjLi5lMGI2NGQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVs LmpzCkBAIC0yOTcsNyArMjk3LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgLy8gUmVzZXQgc2VhcmNoIHJlc3RvcmUuCiAgICAgICAg IFdlYkluc3BlY3Rvci5zZWFyY2hDb250cm9sbGVyLmNhbmNlbFNlYXJjaCgpOwotICAgICAgICBX ZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsID0gdGhpczsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNl dEN1cnJlbnRQYW5lbCh0aGlzKTsKICAgICAgICAgdGhpcy5zZWxlY3RET01Ob2RlKG5vZGUsIHRy dWUpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDg4NTEzM2QuLjc3M2FkYmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpA QCAtMzMwLDcgKzMzMCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIGlmIChyZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu VHlwZS5YSFIpIHsKICAgICAgICAgICAgIC8vIFNob3cgWEhScyBpbiB0aGUgbmV0d29yayBwYW5l bCBvbmx5LgogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yayAmJiBX ZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuY2FuU2hvd0FuY2hvckxvY2F0aW9uKGFuY2hvcikp IHsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsID0gV2ViSW5zcGVj dG9yLnBhbmVscy5uZXR3b3JrOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZXRDdXJy ZW50UGFuZWwoV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrKTsKICAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuc2hvd0FuY2hvckxvY2F0aW9uKGFuY2hvcik7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGI2OGIxNzAuLjQwZmRl MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCkBAIC00NzMsNyArNDczLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fdXBkYXRlRGVidWdnZXJCdXR0b25zKCk7CiAK LSAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCA9IHRoaXM7CisgICAgICAgIFdlYklu c3BlY3Rvci5zZXRDdXJyZW50UGFuZWwodGhpcyk7CiAKICAgICAgICAgdGhpcy5zaWRlYmFyUGFu ZXMuY2FsbHN0YWNrLnVwZGF0ZShjYWxsRnJhbWVzLCBkZXRhaWxzKTsKICAgICAgICAgdGhpcy5z aWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lID0gdGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwuc2VsZWN0ZWRDYWxsRnJhbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NlYXJjaENvbnRyb2xsZXIuanMKaW5kZXggZjk2MGVhYy4uYjRh MzlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWFy Y2hDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2VhcmNoQ29udHJvbGxlci5qcwpAQCAtNDQsMjMgKzQ0LDIzIEBAIFdlYkluc3BlY3Rvci5TZWFy Y2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGVTZWFyY2hNYXRjaGVzQ291bnQ6 IGZ1bmN0aW9uKG1hdGNoZXMsIHBhbmVsKQogICAgIHsKICAgICAgICAgaWYgKCFwYW5lbCkKLSAg ICAgICAgICAgIHBhbmVsID0gV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbDsKKyAgICAgICAgICAg IHBhbmVsID0gV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCgpOwogCiAgICAgICAgIHBhbmVsLmN1 cnJlbnRTZWFyY2hNYXRjaGVzID0gbWF0Y2hlczsKIAotICAgICAgICBpZiAocGFuZWwgPT09IFdl Ykluc3BlY3Rvci5jdXJyZW50UGFuZWwpCi0gICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hN YXRjaGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJbmRleChXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVs LmN1cnJlbnRRdWVyeSAmJiBtYXRjaGVzKTsKKyAgICAgICAgaWYgKHBhbmVsID09PSBXZWJJbnNw ZWN0b3IuY3VycmVudFBhbmVsKCkpCisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWFyY2hNYXRj aGVzQ291bnRBbmRDdXJyZW50TWF0Y2hJbmRleChXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCku Y3VycmVudFF1ZXJ5ICYmIG1hdGNoZXMpOwogICAgIH0sCiAKICAgICB1cGRhdGVDdXJyZW50TWF0 Y2hJbmRleDogZnVuY3Rpb24oY3VycmVudE1hdGNoSW5kZXgsIHBhbmVsKQogICAgIHsKLSAgICAg ICAgaWYgKHBhbmVsID09PSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKQorICAgICAgICBpZiAo cGFuZWwgPT09IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKSkKICAgICAgICAgICAgIHRoaXMu X3VwZGF0ZVNlYXJjaE1hdGNoZXNDb3VudEFuZEN1cnJlbnRNYXRjaEluZGV4KHBhbmVsLmN1cnJl bnRTZWFyY2hNYXRjaGVzLCBjdXJyZW50TWF0Y2hJbmRleCk7CiAgICAgfSwKIAogICAgIHVwZGF0 ZVNlYXJjaExhYmVsOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgcGFuZWxOYW1lID0g V2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCAmJiBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsLnRv b2xiYXJJdGVtTGFiZWw7CisgICAgICAgIHZhciBwYW5lbE5hbWUgPSBXZWJJbnNwZWN0b3IuY3Vy cmVudFBhbmVsKCkgJiYgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCgpLnRvb2xiYXJJdGVtTGFi ZWw7CiAgICAgICAgIGlmICghcGFuZWxOYW1lKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB2YXIgbmV3TGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlYXJjaCAlcyIsIHBhbmVs TmFtZSk7CkBAIC0xMDQsNyArMTA0LDcgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBjYXNl ICJVKzAwNDciOiAvLyBHIGtleQotICAgICAgICAgICAgICAgIHZhciBjdXJyZW50UGFuZWwgPSBX ZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsOworICAgICAgICAgICAgICAgIHZhciBjdXJyZW50UGFu ZWwgPSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCk7CiAKICAgICAgICAgICAgICAgICBpZiAo aXNNYWMgJiYgZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuY3RybEtleSAmJiAhZXZlbnQuYWx0S2V5 KSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChldmVudC5zaGlmdEtleSkgewpAQCAtMTI1LDcg KzEyNSw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgaWYgKCF0aGlzLl9jdXJyZW50UXVlcnkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgcGFuZWwgPSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsOworICAgICAgICBwYW5lbCA9 IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKTsKICAgICAgICAgaWYgKHBhbmVsLnBlcmZvcm1T ZWFyY2gpIHsKICAgICAgICAgICAgIGZ1bmN0aW9uIHBlcmZvcm1QYW5lbFNlYXJjaCgpCiAgICAg ICAgICAgICB7CkBAIC0yNTYsNyArMjU2LDcgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xs ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgdmFyIGN1cnJlbnRQYW5lbCA9IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWw7CisgICAgICAg IHZhciBjdXJyZW50UGFuZWwgPSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCk7CiAgICAgICAg IGlmICghcmVwZWF0U2VhcmNoICYmIHF1ZXJ5ID09PSBjdXJyZW50UGFuZWwuY3VycmVudFF1ZXJ5 ICYmIGN1cnJlbnRQYW5lbC5jdXJyZW50UXVlcnkgPT09IHRoaXMuX2N1cnJlbnRRdWVyeSkgewog ICAgICAgICAgICAgLy8gV2hlbiB0aGlzIGlzIHRoZSBzYW1lIHF1ZXJ5IGFuZCBhIGZvcmNlZCBz ZWFyY2gsIGp1bXAgdG8gdGhlIG5leHQKICAgICAgICAgICAgIC8vIHNlYXJjaCByZXN1bHQgZm9y IGEgZ29vZCB1c2VyIGV4cGVyaWVuY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Rvb2xiYXIuanMKaW5kZXggMzEyMjNlMS4uOGViNTEwYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Ub29sYmFyLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5qcwpAQCAtMTUzLDcgKzE1Myw3IEBA IFdlYkluc3BlY3Rvci5Ub29sYmFyLmNyZWF0ZVBhbmVsVG9vbGJhckl0ZW0gPSBmdW5jdGlvbihw YW5lbCkKICAgICBmdW5jdGlvbiBvblRvb2xiYXJJdGVtQ2xpY2tlZCgpCiAgICAgewogICAgICAg ICBXZWJJbnNwZWN0b3IudG9vbGJhci5fdXBkYXRlRHJvcGRvd25CdXR0b25BbmRIaWRlRHJvcGRv d24oKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCA9IHBhbmVsOworICAgICAg ICBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVudFBhbmVsKHBhbmVsKTsKICAgICB9CiAgICAgdG9vbGJh ckl0ZW0uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBvblRvb2xiYXJJdGVtQ2xpY2tlZCk7CiAK QEAgLTE2Miw3ICsxNjIsNyBAQCBXZWJJbnNwZWN0b3IuVG9vbGJhci5jcmVhdGVQYW5lbFRvb2xi YXJJdGVtID0gZnVuY3Rpb24ocGFuZWwpCiAgICAgaWYgKCJ0b29sYmFySXRlbUxhYmVsIiBpbiBw YW5lbCkKICAgICAgICAgdG9vbGJhckl0ZW0uY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLWxh YmVsIikudGV4dENvbnRlbnQgPSBwYW5lbC50b29sYmFySXRlbUxhYmVsOwogCi0gICAgaWYgKHBh bmVsID09PSBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKQorICAgIGlmIChwYW5lbCA9PT0gV2Vi SW5zcGVjdG9yLmN1cnJlbnRQYW5lbCgpKQogICAgICAgICB0b29sYmFySXRlbS5hZGRTdHlsZUNs YXNzKCJ0b2dnbGVkLW9uIik7CiAKICAgICByZXR1cm4gdG9vbGJhckl0ZW07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDRjNmY5YTgu LjQ5MGRhZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCkBAIC0xMTgsMTIgKzExOCwxMiBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAg ICAgICAgICAgdGhpcy5fcHJldmlvdXNGb2N1c0VsZW1lbnQuYmx1cigpOwogICAgIH0sCiAKLSAg ICBnZXQgY3VycmVudFBhbmVsKCkKKyAgICBjdXJyZW50UGFuZWw6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9jdXJyZW50UGFuZWw7CiAgICAgfSwKIAotICAgIHNldCBj dXJyZW50UGFuZWwoeCkKKyAgICBzZXRDdXJyZW50UGFuZWw6IGZ1bmN0aW9uKHgpCiAgICAgewog ICAgICAgICBpZiAodGhpcy5fY3VycmVudFBhbmVsID09PSB4KQogICAgICAgICAgICAgcmV0dXJu OwpAQCAtNDAyLDcgKzQwMiw3IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAKICAgICBfdXBkYXRl Rm9jdXNlZE5vZGU6IGZ1bmN0aW9uKG5vZGVJZCkKICAgICB7Ci0gICAgICAgIHRoaXMuY3VycmVu dFBhbmVsID0gdGhpcy5wYW5lbHMuZWxlbWVudHM7CisgICAgICAgIHRoaXMuc2V0Q3VycmVudFBh bmVsKHRoaXMucGFuZWxzLmVsZW1lbnRzKTsKICAgICAgICAgdGhpcy5wYW5lbHMuZWxlbWVudHMu dXBkYXRlRm9jdXNlZE5vZGUobm9kZUlkKTsKICAgICB9LAogCkBAIC02MDUsOCArNjA1LDggQEAg V2ViSW5zcGVjdG9yLmRpc3BhdGNoTWVzc2FnZUZyb21CYWNrZW5kID0gZnVuY3Rpb24obWVzc2Fn ZU9iamVjdCkKIAogV2ViSW5zcGVjdG9yLndpbmRvd1Jlc2l6ZSA9IGZ1bmN0aW9uKGV2ZW50KQog ewotICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCkKLSAgICAgICAgdGhpcy5jdXJyZW50UGFuZWwu ZG9SZXNpemUoKTsKKyAgICBpZiAodGhpcy5jdXJyZW50UGFuZWwoKSkKKyAgICAgICAgdGhpcy5j dXJyZW50UGFuZWwoKS5kb1Jlc2l6ZSgpOwogICAgIHRoaXMuZHJhd2VyLmRvUmVzaXplKCk7CiAg ICAgdGhpcy50b29sYmFyLnJlc2l6ZSgpOwogfQpAQCAtNzU2LDggKzc1Niw4IEBAIFdlYkluc3Bl Y3Rvci5kb2N1bWVudEtleURvd24gPSBmdW5jdGlvbihldmVudCkKICAgICAgICAgfQogICAgIH0K IAotICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCkgewotICAgICAgICB0aGlzLmN1cnJlbnRQYW5l bC5oYW5kbGVTaG9ydGN1dChldmVudCk7CisgICAgaWYgKHRoaXMuY3VycmVudFBhbmVsKCkpIHsK KyAgICAgICAgdGhpcy5jdXJyZW50UGFuZWwoKS5oYW5kbGVTaG9ydGN1dChldmVudCk7CiAgICAg ICAgIGlmIChldmVudC5oYW5kbGVkKSB7CiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVs dCgpOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtODA4LDcgKzgwOCw3IEBAIFdlYkluc3BlY3Rv ci5kb2N1bWVudEtleURvd24gPSBmdW5jdGlvbihldmVudCkKICAgICAgICAgICAgICAgICB2YXIg aXNSb3RhdGVMZWZ0ID0gZXZlbnQuY3RybEtleSAmJiAhZXZlbnQuc2hpZnRLZXkgJiYgIWV2ZW50 Lm1ldGFLZXkgJiYgIWV2ZW50LmFsdEtleTsKIAogICAgICAgICAgICAgaWYgKGlzUm90YXRlTGVm dCkgewotICAgICAgICAgICAgICAgIHZhciBpbmRleCA9IHRoaXMucGFuZWxPcmRlci5pbmRleE9m KHRoaXMuY3VycmVudFBhbmVsKTsKKyAgICAgICAgICAgICAgICB2YXIgaW5kZXggPSB0aGlzLnBh bmVsT3JkZXIuaW5kZXhPZih0aGlzLmN1cnJlbnRQYW5lbCgpKTsKICAgICAgICAgICAgICAgICBp bmRleCA9IChpbmRleCA9PT0gMCkgPyB0aGlzLnBhbmVsT3JkZXIubGVuZ3RoIC0gMSA6IGluZGV4 IC0gMTsKICAgICAgICAgICAgICAgICB0aGlzLnBhbmVsT3JkZXJbaW5kZXhdLnRvb2xiYXJJdGVt LmNsaWNrKCk7CiAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKQEAgLTgy NSw3ICs4MjUsNyBAQCBXZWJJbnNwZWN0b3IuZG9jdW1lbnRLZXlEb3duID0gZnVuY3Rpb24oZXZl bnQpCiAgICAgICAgICAgICAgICAgdmFyIGlzUm90YXRlUmlnaHQgPSBldmVudC5jdHJsS2V5ICYm ICFldmVudC5zaGlmdEtleSAmJiAhZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuYWx0S2V5OwogCiAg ICAgICAgICAgICBpZiAoaXNSb3RhdGVSaWdodCkgewotICAgICAgICAgICAgICAgIHZhciBpbmRl eCA9IHRoaXMucGFuZWxPcmRlci5pbmRleE9mKHRoaXMuY3VycmVudFBhbmVsKTsKKyAgICAgICAg ICAgICAgICB2YXIgaW5kZXggPSB0aGlzLnBhbmVsT3JkZXIuaW5kZXhPZih0aGlzLmN1cnJlbnRQ YW5lbCgpKTsKICAgICAgICAgICAgICAgICBpbmRleCA9IChpbmRleCArIDEpICUgdGhpcy5wYW5l bE9yZGVyLmxlbmd0aDsKICAgICAgICAgICAgICAgICB0aGlzLnBhbmVsT3JkZXJbaW5kZXhdLnRv b2xiYXJJdGVtLmNsaWNrKCk7CiAgICAgICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQo KTsKQEAgLTg1MCwxNCArODUwLDE0IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudEtleURvd24gPSBm dW5jdGlvbihldmVudCkKIAogV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2FuQ29weSA9IGZ1bmN0aW9u KGV2ZW50KQogewotICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCAmJiB0aGlzLmN1cnJlbnRQYW5l bC5oYW5kbGVDb3B5RXZlbnQpCisgICAgaWYgKHRoaXMuY3VycmVudFBhbmVsKCkgJiYgdGhpcy5j dXJyZW50UGFuZWwoKS5oYW5kbGVDb3B5RXZlbnQpCiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZh dWx0KCk7CiB9CiAKIFdlYkluc3BlY3Rvci5kb2N1bWVudENvcHkgPSBmdW5jdGlvbihldmVudCkK IHsKLSAgICBpZiAodGhpcy5jdXJyZW50UGFuZWwgJiYgdGhpcy5jdXJyZW50UGFuZWwuaGFuZGxl Q29weUV2ZW50KQotICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbC5oYW5kbGVDb3B5RXZlbnQoZXZl bnQpOworICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCgpICYmIHRoaXMuY3VycmVudFBhbmVsKCku aGFuZGxlQ29weUV2ZW50KQorICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbCgpLmhhbmRsZUNvcHlF dmVudChldmVudCk7CiB9CiAKIFdlYkluc3BlY3Rvci5jb250ZXh0TWVudUV2ZW50RmlyZWQgPSBm dW5jdGlvbihldmVudCkKQEAgLTEwMTksMTIgKzEwMTksMTIgQEAgV2ViSW5zcGVjdG9yLnNob3dQ YW5lbCA9IGZ1bmN0aW9uKHBhbmVsKQogICAgICAgICBlbHNlCiAgICAgICAgICAgICBwYW5lbCA9 ICJlbGVtZW50cyI7CiAgICAgfQotICAgIHRoaXMuY3VycmVudFBhbmVsID0gdGhpcy5wYW5lbHNb cGFuZWxdOworICAgIHRoaXMuc2V0Q3VycmVudFBhbmVsKHRoaXMucGFuZWxzW3BhbmVsXSk7CiB9 CiAKIFdlYkluc3BlY3Rvci5zdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmcgPSBmdW5jdGlvbigp CiB7Ci0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVscy5zY3JpcHRzOworICAgIHRo aXMuc2V0Q3VycmVudFBhbmVsKHRoaXMucGFuZWxzLnNjcmlwdHMpOwogICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmVuYWJsZURlYnVnZ2VyKCk7CiB9CiAKQEAgLTExNjAsMTAgKzExNjAs MTAgQEAgV2ViSW5zcGVjdG9yLmluc3BlY3QgPSBmdW5jdGlvbihwYXlsb2FkLCBoaW50cykKICAg ICB9CiAKICAgICBpZiAoaGludHMuZGF0YWJhc2VJZCkgewotICAgICAgICBXZWJJbnNwZWN0b3Iu Y3VycmVudFBhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXM7CisgICAgICAgIFdl Ykluc3BlY3Rvci5zZXRDdXJyZW50UGFuZWwoV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMp OwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5zZWxlY3REYXRhYmFzZSho aW50cy5kYXRhYmFzZUlkKTsKICAgICB9IGVsc2UgaWYgKGhpbnRzLmRvbVN0b3JhZ2VJZCkgewot ICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVscy5y ZXNvdXJjZXM7CisgICAgICAgIFdlYkluc3BlY3Rvci5zZXRDdXJyZW50UGFuZWwoV2ViSW5zcGVj dG9yLnBhbmVscy5yZXNvdXJjZXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291 cmNlcy5zZWxlY3RET01TdG9yYWdlKGhpbnRzLmRvbVN0b3JhZ2VJZCk7CiAgICAgfQogCkBAIC0x MjIwLDEwICsxMjIwLDEwIEBAIFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uSW5QYW5l bCA9IGZ1bmN0aW9uKGFuY2hvciwgcGFuZWwpCiAgICAgICAgIGFuY2hvci5hZGRTdHlsZUNsYXNz KCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7CiAgICAgfQogCi0gICAgdGhpcy5jdXJyZW50 UGFuZWwgPSBwYW5lbDsKKyAgICB0aGlzLnNldEN1cnJlbnRQYW5lbChwYW5lbCk7CiAgICAgaWYg KHRoaXMuZHJhd2VyKQogICAgICAgICB0aGlzLmRyYXdlci5pbW1lZGlhdGVseUZpbmlzaEFuaW1h dGlvbigpOwotICAgIHRoaXMuY3VycmVudFBhbmVsLnNob3dBbmNob3JMb2NhdGlvbihhbmNob3Ip OworICAgIHRoaXMuY3VycmVudFBhbmVsKCkuc2hvd0FuY2hvckxvY2F0aW9uKGFuY2hvcik7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE2MDYsNyArMTYwNiw3IEBAIFdlYkluc3BlY3Rvci5z dGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50LCBjb25maWcpCiBXZWJJbnNwZWN0b3IuX3Rv b2xiYXJJdGVtQ2xpY2tlZCA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZhciB0b29sYmFySXRl bSA9IGV2ZW50LmN1cnJlbnRUYXJnZXQ7Ci0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0b29sYmFy SXRlbS5wYW5lbDsKKyAgICB0aGlzLnNldEN1cnJlbnRQYW5lbCh0b29sYmFySXRlbS5wYW5lbCk7 CiB9CiAKIFdlYkluc3BlY3Rvci5QYW5lbEhpc3RvcnkgPSBmdW5jdGlvbigpCkBAIC0xNjI0LDcg KzE2MjQsNyBAQCBXZWJJbnNwZWN0b3IuUGFuZWxIaXN0b3J5LnByb3RvdHlwZSA9IHsKICAgICBn b0JhY2s6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX2luSGlzdG9yeSA9IHRydWU7 Ci0gICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxz W3RoaXMuX2hpc3RvcnlbLS10aGlzLl9oaXN0b3J5SXRlcmF0b3JdXTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLnNldEN1cnJlbnRQYW5lbChXZWJJbnNwZWN0b3IucGFuZWxzW3RoaXMuX2hpc3Rvcnlb LS10aGlzLl9oaXN0b3J5SXRlcmF0b3JdXSk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pbkhpc3Rv cnk7CiAgICAgfSwKIApAQCAtMTYzNiw3ICsxNjM2LDcgQEAgV2ViSW5zcGVjdG9yLlBhbmVsSGlz dG9yeS5wcm90b3R5cGUgPSB7CiAgICAgZ29Gb3J3YXJkOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICB0aGlzLl9pbkhpc3RvcnkgPSB0cnVlOwotICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVu dFBhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVsc1t0aGlzLl9oaXN0b3J5WysrdGhpcy5faGlzdG9y eUl0ZXJhdG9yXV07CisgICAgICAgIFdlYkluc3BlY3Rvci5zZXRDdXJyZW50UGFuZWwoV2ViSW5z cGVjdG9yLnBhbmVsc1t0aGlzLl9oaXN0b3J5WysrdGhpcy5faGlzdG9yeUl0ZXJhdG9yXV0pOwog ICAgICAgICBkZWxldGUgdGhpcy5faW5IaXN0b3J5OwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggN2RkMmFhNy4uNGYxZmYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wOS0xNiAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNs b0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY2hhbmdlIFdlYkluc3Bl Y3Rvci5jdXJyZW50UGFuZWwgZ2V0dGVyL3NldHRlciB0byBmdW5jdGlvbnMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODI0MgorCisgICAgICAgIFRo aXMgaXMgbmVjZXNzYXJ5IGZvciB0aGUgcGFuZWwgc3dpdGNoaW5nIHBlcmZvcm1hbmNlIHRlc3Rz LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3Jj L2pzL1Rlc3RzLmpzOgorICAgICAgICAoLlRlc3RTdWl0ZS5wcm90b3R5cGUuc2hvd1BhbmVsKToK KwogMjAxMS0wOS0xNCAgSGFvIFpoZW5nICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJlbW92ZSBzb21lIGRlcGVuZGVuY2llcyBvZiBEUlQgZm9yIEFuZHJvaWQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9UZXN0cy5qcyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL2pzL1Rlc3RzLmpzCmluZGV4IDM4YzEwNmIuLjNjNmRhZTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Rlc3RzLmpzCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Rlc3RzLmpzCkBAIC0xNzcsNyArMTc3LDcgQEAgVGVz dFN1aXRlLnByb3RvdHlwZS5zaG93UGFuZWwgPSBmdW5jdGlvbihwYW5lbE5hbWUpCiAgICAgdmFy IHRvb2xiYXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidG9vbGJhciIpOwogICAgIHZhciBi dXR0b24gPSB0b29sYmFyLmdldEVsZW1lbnRzQnlDbGFzc05hbWUocGFuZWxOYW1lKVswXTsKICAg ICBidXR0b24uY2xpY2soKTsKLSAgICB0aGlzLmFzc2VydEVxdWFscyhXZWJJbnNwZWN0b3IucGFu ZWxzW3BhbmVsTmFtZV0sIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwpOworICAgIHRoaXMuYXNz ZXJ0RXF1YWxzKFdlYkluc3BlY3Rvci5wYW5lbHNbcGFuZWxOYW1lXSwgV2ViSW5zcGVjdG9yLmN1 cnJlbnRQYW5lbCgpKTsKIH07CiAKIApAQCAtMjUyLDcgKzI1Miw3IEBAIFRlc3RTdWl0ZS5wcm90 b3R5cGUudGVzdFNob3dTY3JpcHRzVGFiID0gZnVuY3Rpb24oKQogVGVzdFN1aXRlLnByb3RvdHlw ZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVkT25JbnNwZWN0ZWRQYWdlUmVmcmVzaCA9IGZ1bmN0 aW9uKCkKIHsKICAgICB2YXIgdGVzdCA9IHRoaXM7Ci0gICAgdGhpcy5hc3NlcnRFcXVhbHMoV2Vi SW5zcGVjdG9yLnBhbmVscy5lbGVtZW50cywgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCwgIkVs ZW1lbnRzIHBhbmVsIHNob3VsZCBiZSBjdXJyZW50IG9uZS4iKTsKKyAgICB0aGlzLmFzc2VydEVx dWFscyhXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLCBXZWJJbnNwZWN0b3IuY3VycmVudFBh bmVsKCksICJFbGVtZW50cyBwYW5lbCBzaG91bGQgYmUgY3VycmVudCBvbmUuIik7CiAKICAgICB0 aGlzLmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLCAicmVzZXQiLCB3YWl0 VW50aWxTY3JpcHRJc1BhcnNlZCk7CiAKQEAgLTM2NCw4ICszNjQsOCBAQCBUZXN0U3VpdGUucHJv dG90eXBlLnRlc3RQYXVzZVdoZW5Mb2FkaW5nRGV2VG9vbHMgPSBmdW5jdGlvbigpCiAKIAogICAg IC8vIFNjcmlwdCBleGVjdXRpb24gY2FuIGFscmVhZHkgYmUgcGF1c2VkLgotICAgIGlmIChXZWJJ bnNwZWN0b3IuY3VycmVudFBhbmVsLnBhdXNlZCkgewotICAgICAgICB2YXIgY2FsbEZyYW1lID0g V2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbC5fcHJlc2VudGF0aW9uTW9kZWwuc2VsZWN0ZWRDYWxs RnJhbWU7CisgICAgaWYgKFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKS5wYXVzZWQpIHsKKyAg ICAgICAgdmFyIGNhbGxGcmFtZSA9IFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwoKS5fcHJlc2Vu dGF0aW9uTW9kZWwuc2VsZWN0ZWRDYWxsRnJhbWU7CiAgICAgICAgIHRoaXMuYXNzZXJ0RXF1YWxz KGV4cGVjdGF0aW9ucy5mdW5jdGlvbnNPblN0YWNrWzBdLCBjYWxsRnJhbWUuZnVuY3Rpb25OYW1l KTsKICAgICAgICAgdmFyIGNhbGxiYWNrSW52b2tlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9j aGVja1NvdXJjZUZyYW1lV2hlbkxvYWRlZChleHBlY3RhdGlvbnMsIGZ1bmN0aW9uKCkgewpAQCAt NTkyLDcgKzU5Miw3IEBAIFRlc3RTdWl0ZS5wcm90b3R5cGUuc2hvd01haW5QYWdlU2NyaXB0U291 cmNlXyA9IGZ1bmN0aW9uKHNjcmlwdE5hbWUsIGNhbGxiYWNrKQogICAgICAgICBzY3JpcHRSZXNv dXJjZSA9IG9wdGlvbnNbcGFnZVNjcmlwdEluZGV4XS5yZXByZXNlbnRlZE9iamVjdDsKIAogICAg ICAgICAvLyBDdXJyZW50IHBhbmVsIGlzICJTY3JpcHRzIi4KLSAgICAgICAgV2ViSW5zcGVjdG9y LmN1cnJlbnRQYW5lbC5fc2hvd1NjcmlwdE9yUmVzb3VyY2Uoc2NyaXB0UmVzb3VyY2UpOworICAg ICAgICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsKCkuX3Nob3dTY3JpcHRPclJlc291cmNlKHNj cmlwdFJlc291cmNlKTsKICAgICAgICAgdGVzdC5hc3NlcnRFcXVhbHMocGFnZVNjcmlwdEluZGV4 LCBzY3JpcHRTZWxlY3Quc2VsZWN0ZWRJbmRleCwgIlVuZXhwZWN0ZWQgc2VsZWN0ZWQgb3B0aW9u IGluZGV4LiIpOwogICAgIH0KIApAQCAtNzExLDcgKzcxMSw3IEBAIFRlc3RTdWl0ZS5wcm90b3R5 cGUuX2NoZWNrU291cmNlRnJhbWVXaGVuTG9hZGVkID0gZnVuY3Rpb24oZXhwZWN0YXRpb25zLCBj YWxsYmFjCiB7CiAgICAgdmFyIHRlc3QgPSB0aGlzOwogCi0gICAgdmFyIGZyYW1lID0gV2ViSW5z cGVjdG9yLmN1cnJlbnRQYW5lbC52aXNpYmxlVmlldzsKKyAgICB2YXIgZnJhbWUgPSBXZWJJbnNw ZWN0b3IuY3VycmVudFBhbmVsKCkudmlzaWJsZVZpZXc7CiAKICAgICBpZiAoZnJhbWUuX3RleHRW aWV3ZXIpCiAgICAgICAgIGNoZWNrRXhlY0xpbmUoKTsK