81904 2012-03-22 06:52:38 -0700 Web Inspector: Introduce ScriptBound/ScriptUnbound events in ScriptMapping. 2012-03-22 07:48:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 585212 0 vsevik 2012-03-22 06:52:38 -0700 This is another step on the way to cleaner BreakpointManager logic. 585216 1 133250 vsevik 2012-03-22 06:58:35 -0700 Created attachment 133250 Patch 585222 2 133250 podivilov 2012-03-22 07:04:16 -0700 Comment on attachment 133250 Patch looks good. 585236 3 133250 pfeldman 2012-03-22 07:24:39 -0700 Comment on attachment 133250 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133250&action=review > Source/WebCore/ChangeLog:8 > + This is another step on the way to cleaner BreakpointManager logic. I see. But why do we need it and what happens inside? 585248 4 133256 vsevik 2012-03-22 07:30:40 -0700 Created attachment 133256 Patch 585271 5 vsevik 2012-03-22 07:48:17 -0700 Committed r111694: <http://trac.webkit.org/changeset/111694> 133250 2012-03-22 06:58:35 -0700 2012-03-22 07:30:27 -0700 Patch bug-81904-20120322175834.patch text/plain 13750 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q3Yjg3YjAwOThkNTkx MzljODA4NzNkYTMwODllNTI5ZTAwYWMyZi4uNjllMjgzYWM4NjIxNjU5YzAxNTc4YmYyMDUwNjBm YjU5ZWEyNzg2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTAzLTIyICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEludHJvZHVjZSBTY3JpcHRCb3VuZC9TY3JpcHRVbmJvdW5kIGV2ZW50cyBpbiBTY3JpcHRN YXBwaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODE5MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGFub3RoZXIgc3RlcCBvbiB0aGUgd2F5IHRvIGNsZWFuZXIgQnJlYWtwb2ludE1hbmFn ZXIgbG9naWMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0 TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcu cHJvdG90eXBlLl91aVNvdXJjZUNvZGVzRm9yU291cmNlTWFwKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlLmFkZFNjcmlwdC5nZXQgdGhpcyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5h ZGRTY3JpcHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5w cm90b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VT Y3JpcHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFw cGluZy5wcm90b3R5cGUuX3VpU291cmNlQ29kZUNoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NYWlu U2NyaXB0TWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcu cHJvdG90eXBlLl91cGRhdGVMaXZlTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1h aW5TY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5faGFuZGxlVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5faGFu ZGxlU2NyaXB0Qm91bmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5faGFuZGxlU2NyaXB0VW5ib3VuZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TbmlwcGV0c01vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRz U2NyaXB0TWFwcGluZy5wcm90b3R5cGUuYWRkU2NyaXB0LmdldCB0aGlzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9zbmlwcGV0QWRkZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUu X2NyZWF0ZVVJU291cmNlQ29kZUZvclNjcmlwdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU25p cHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fc25pcHBldFJlbW92ZWQuZ2V0IHRoaXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX3Nu aXBwZXRSZW1vdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBp bmcucHJvdG90eXBlLnJlc2V0KToKKwogMjAxMi0wMy0yMiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxk bWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIENTUyBhbmQg SmF2YVNjcmlwdCBmaWxlcyBlZGl0YWJsZSBieSBkZWZhdWx0LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5q cwppbmRleCA2YzZlNmIyNjVhMDdkODM2ZGNhNjRkMGE0Zjc4NDkwZDlhMDFjYjI5Li43ODIzMzdj ODI0MDU5N2ZhN2Y1MDI4Y2FlM2Y3MTU3MTMzZTJhYTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5q cwpAQCAtNzksNiArNzksMTkgQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlNvdXJjZU1hcFBhcnNlcn0gc291cmNlTWFwCisgICAgICogQHJldHVybiB7QXJyYXkuPFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fQorICAgICAqLworICAgIF91aVNvdXJjZUNvZGVzRm9y U291cmNlTWFwOiBmdW5jdGlvbihzb3VyY2VNYXApCisgICAgeworICAgICAgICB2YXIgcmVzdWx0 ID0gW10KKyAgICAgICAgdmFyIHNvdXJjZVVSTHMgPSBzb3VyY2VNYXAuc291cmNlcygpOworICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNvdXJjZVVSTHMubGVuZ3RoOyArK2kpCisgICAgICAg ICAgICByZXN1bHQucHVzaCh0aGlzLl91aVNvdXJjZUNvZGVCeVVSTFtzb3VyY2VVUkxzW2ldXSk7 CisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0gc2NyaXB0CiAgICAgICovCiAgICAgYWRkU2NyaXB0OiBm dW5jdGlvbihzY3JpcHQpCkBAIC04Nyw4ICsxMDAsOSBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAodGhpcy5fc2NyaXB0Rm9y U291cmNlTWFwLmdldChzb3VyY2VNYXApKSB7CiAgICAgICAgICAgICB0aGlzLl9zb3VyY2VNYXBG b3JTY3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gc291cmNlTWFwOwotICAgICAgICAgICAgdmFy IGRhdGEgPSB7IHJlbW92ZWRJdGVtczogW10sIGFkZGVkSXRlbXM6IFtdLCBzY3JpcHRJZHM6IFtz Y3JpcHQuc2NyaXB0SWRdIH07Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENo YW5nZWQsIGRhdGEpOworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl91aVNv dXJjZUNvZGVzRm9yU291cmNlTWFwKHNvdXJjZU1hcCk7CisgICAgICAgICAgICB2YXIgZGF0YSA9 IHsgc2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2RlczogdWlTb3VyY2VDb2Rl cyB9OworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNjcmlwdEJvdW5kLCBkYXRhKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCkBAIC0xMDksOCArMTIzLDEwIEBAIFdlYkluc3BlY3Rvci5D b21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3NvdXJj ZU1hcEZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSBzb3VyY2VNYXA7CiAgICAgICAgIHRo aXMuX3NjcmlwdEZvclNvdXJjZU1hcC5wdXQoc291cmNlTWFwLCBzY3JpcHQpOwotICAgICAgICB2 YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogdWlTb3VyY2VDb2RlTGlz dCwgc2NyaXB0SWRzOiBbc2NyaXB0LnNjcmlwdElkXSB9OworICAgICAgICB2YXIgZGF0YSA9IHsg cmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogdWlTb3VyY2VDb2RlTGlzdCB9OwogICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGlu Zy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIGRhdGEpOworICAgICAgICB2YXIgZGF0 YSA9IHsgc2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2RlczogdWlTb3VyY2VD b2RlTGlzdCB9OworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuU2NyaXB0Qm91bmQsIGRhdGEpOwogICAgIH0sCiAK ICAgICAvKioKQEAgLTEzNCw3ICsxNTAsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRN YXBwaW5nLnByb3RvdHlwZSA9IHsKIAogICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiB0aGlzLnVpU291cmNlQ29kZUxpc3QoKSwg YWRkZWRJdGVtczogW10sIHNjcmlwdElkczogW10gfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJl bW92ZWRJdGVtczogdGhpcy51aVNvdXJjZUNvZGVMaXN0KCksIGFkZGVkSXRlbXM6IFtdIH07CiAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRN YXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CiAKICAgICAgICAg dGhpcy5fc291cmNlTWFwQnlVUkwgPSB7fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKaW5kZXggNjJk NGNkZWY2YjFiYTZhYTU3MjI5MmQyMGI0OWZjOWM1NmY4YjA0NS4uYmZjMmE5YTE1YjAwOGQ3ZWNj MzAxOWRmOTBlYjEwMzIxNGMzMzM2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKQEAgLTEzOSw4 ICsxMzksMjMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBzY3JpcHRJZHMucHVzaChyYXdTb3VyY2VDb2RlLl9zY3JpcHRzW2ld LnNjcmlwdElkKTsKICAgICAgICAgdmFyIHJlbW92ZWRJdGVtcyA9IHJlbW92ZWRJdGVtID8gW3Jl bW92ZWRJdGVtXSA6IFtdOwogICAgICAgICB2YXIgYWRkZWRJdGVtcyA9IGFkZGVkSXRlbSA/IFth ZGRlZEl0ZW1dIDogW107Ci0gICAgICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IHJlbW92 ZWRJdGVtcywgYWRkZWRJdGVtczogYWRkZWRJdGVtcywgc2NyaXB0SWRzOiBzY3JpcHRJZHMgfTsK KworICAgICAgICBpZiAocmVtb3ZlZEl0ZW0pIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgc2NyaXB0SWRzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgdmFyIGRhdGEg PSB7IHNjcmlwdElkOiBzY3JpcHRJZHNbaV0sIHVpU291cmNlQ29kZXM6IFtyZW1vdmVkSXRlbV0g fTsKKyAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuU2NyaXB0VW5ib3VuZCwgZGF0YSk7CisgICAgICAg ICAgICB9CisgICAgICAgIH0KKworICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBy ZW1vdmVkSXRlbXMsIGFkZGVkSXRlbXM6IGFkZGVkSXRlbXMgfTsKICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJ U291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsKKworICAgICAgICBpZiAoYWRkZWRJdGVtKSB7 CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNjcmlwdElkcy5sZW5ndGg7ICsraSkg eworICAgICAgICAgICAgICAgIHZhciBkYXRhID0geyBzY3JpcHRJZDogc2NyaXB0SWRzW2ldLCB1 aVNvdXJjZUNvZGVzOiBbYWRkZWRJdGVtXSB9OworICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5TY3Jp cHRCb3VuZCwgZGF0YSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9LAogCiAgICAg LyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dE1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1h cHBpbmcuanMKaW5kZXggYjUyNzA4YjRhNjkxNWM5ZDBhMzI5ZmY4NDNlOTRlZDFjZTcyNGU0Ni4u MTgxZTdhMmEyMmY2YzY3MmIxZWY0YzI3MjQyNzVmZjE3ZWVkMjNmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRNYXBwaW5nLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0TWFwcGluZy5qcwpAQCAtMzcs NyArMzcsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKIH0KIAog V2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzID0gewotICAgIFVJU291cmNlQ29kZUxp c3RDaGFuZ2VkOiAidXMtc291cmNlLWNvZGUtbGlzdC1jaGFuZ2VkIgorICAgIFVJU291cmNlQ29k ZUxpc3RDaGFuZ2VkOiAidWktc291cmNlLWNvZGUtbGlzdC1jaGFuZ2VkIiwKKyAgICBTY3JpcHRC b3VuZDogInNjcmlwdC1ib3VuZCIsCisgICAgU2NyaXB0VW5ib3VuZDogInNjcmlwdC11bmJvdW5k IiwKIH0KIAogV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewpAQCAtNzgs OCArODAsMTEgQEAgV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5nID0gZnVuY3Rpb24oKQog ICAgIHRoaXMuX3NuaXBwZXRzTWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU25pcHBldHNTY3Jp cHRNYXBwaW5nKCk7CiAgICAgdGhpcy5fbWFwcGluZ3MucHVzaCh0aGlzLl9zbmlwcGV0c01hcHBp bmcpOwogCi0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9tYXBwaW5ncy5sZW5ndGg7ICsr aSkKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX21hcHBpbmdzLmxlbmd0aDsgKytpKSB7 CiAgICAgICAgIHRoaXMuX21hcHBpbmdzW2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzLl9oYW5k bGVVSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX21hcHBpbmdz W2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNj cmlwdEJvdW5kLCB0aGlzLl9oYW5kbGVTY3JpcHRCb3VuZCwgdGhpcyk7CisgICAgICAgIHRoaXMu X21hcHBpbmdzW2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcu RXZlbnRzLlNjcmlwdFVuYm91bmQsIHRoaXMuX2hhbmRsZVNjcmlwdFVuYm91bmQsIHRoaXMpOwor ICAgIH0KIAogICAgIHRoaXMuX21hcHBpbmdGb3JTY3JpcHRJZCA9IHt9OwogICAgIHRoaXMuX21h cHBpbmdGb3JVSVNvdXJjZUNvZGUgPSBuZXcgTWFwKCk7CkBAIC04Nyw3ICs5Miw3IEBAIFdlYklu c3BlY3Rvci5NYWluU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9y Lk1haW5TY3JpcHRNYXBwaW5nLkV2ZW50cyA9IHsKLSAgICBVSVNvdXJjZUNvZGVMaXN0Q2hhbmdl ZDogInVzLXNvdXJjZS1jb2RlLWxpc3QtY2hhbmdlZCIKKyAgICBVSVNvdXJjZUNvZGVMaXN0Q2hh bmdlZDogInVpLXNvdXJjZS1jb2RlLWxpc3QtY2hhbmdlZCIKIH0KIAogV2ViSW5zcGVjdG9yLk1h aW5TY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKQEAgLTEzMywxMyArMTM4LDExIEBAIFdlYklu c3BlY3Rvci5NYWluU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlz Ll9saXZlTG9jYXRpb25zRm9yU2NyaXB0SWRbc2NyaXB0SWRdLnJlbW92ZShsaXZlTG9jYXRpb24p OwogICAgIH0sCiAKLSAgICBfdXBkYXRlTGl2ZUxvY2F0aW9uczogZnVuY3Rpb24oc2NyaXB0SWRz KQorICAgIF91cGRhdGVMaXZlTG9jYXRpb246IGZ1bmN0aW9uKHNjcmlwdElkKQogICAgIHsKLSAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRJZHMubGVuZ3RoOyArK2kpIHsKLSAgICAg ICAgICAgIHZhciBsaXZlTG9jYXRpb25zID0gdGhpcy5fbGl2ZUxvY2F0aW9uc0ZvclNjcmlwdElk W3NjcmlwdElkc1tpXV07Ci0gICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGxpdmVMb2Nh dGlvbnMubGVuZ3RoOyArK2opCi0gICAgICAgICAgICAgICAgbGl2ZUxvY2F0aW9uc1tqXS5fdXBk YXRlKCk7Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIGxpdmVMb2NhdGlvbnMgPSB0aGlzLl9saXZl TG9jYXRpb25zRm9yU2NyaXB0SWRbc2NyaXB0SWRdOworICAgICAgICBmb3IgKHZhciBqID0gMDsg aiA8IGxpdmVMb2NhdGlvbnMubGVuZ3RoOyArK2opCisgICAgICAgICAgICBsaXZlTG9jYXRpb25z W2pdLl91cGRhdGUoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTUsMTUgKzE5OCwzMiBAQCBX ZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICB2YXIg c2NyaXB0TWFwcGluZyA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmd9ICov IGV2ZW50LnRhcmdldDsKICAgICAgICAgdmFyIHJlbW92ZWRJdGVtcyA9IC8qKiBAdHlwZSB7QXJy YXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLyBldmVudC5kYXRhWyJyZW1vdmVkSXRl bXMiXTsKICAgICAgICAgdmFyIGFkZGVkSXRlbXMgPSAvKiogQHR5cGUge0FycmF5LjxXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8gZXZlbnQuZGF0YVsiYWRkZWRJdGVtcyJdOwotICAgICAg ICB2YXIgc2NyaXB0SWRzID0gLyoqIEB0eXBlIHtBcnJheS48bnVtYmVyPn0gKi8gZXZlbnQuZGF0 YVsic2NyaXB0SWRzIl07CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkSXRl bXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLl9tYXBwaW5nRm9yVUlTb3VyY2VDb2Rl LnJlbW92ZShyZW1vdmVkSXRlbXNbaV0pOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFk ZGVkSXRlbXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLl9tYXBwaW5nRm9yVUlTb3Vy Y2VDb2RlLnB1dChhZGRlZEl0ZW1zW2ldLCBzY3JpcHRNYXBwaW5nKTsKLSAgICAgICAgdGhpcy5f dXBkYXRlTGl2ZUxvY2F0aW9ucyhzY3JpcHRJZHMpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291 cmNlQ29kZUxpc3RDaGFuZ2VkLCBldmVudC5kYXRhKTsKICAgICB9LAorICAgIAorICAgIC8qKgor ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF9o YW5kbGVTY3JpcHRCb3VuZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgc2Ny aXB0SWQgPSAvKiogQHR5cGUge251bWJlcn0gKi8gZXZlbnQuZGF0YS5zY3JpcHRJZDsKKyAgICAg ICAgdGhpcy5fdXBkYXRlTGl2ZUxvY2F0aW9uKHNjcmlwdElkKTsKKyAgICB9LAorICAgIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLwor ICAgIF9oYW5kbGVTY3JpcHRVbmJvdW5kOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IHZhciBzY3JpcHRJZCA9IC8qKiBAdHlwZSB7bnVtYmVyfSAqLyBldmVudC5kYXRhLnNjcmlwdElk OworICAgICAgICB0aGlzLl91cGRhdGVMaXZlTG9jYXRpb24oc2NyaXB0SWQpOworICAgIH0sCisK IAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gZm9ybWF0U291cmNlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMKaW5k ZXggYTkwMGU5MGE5Y2E4YTZjMDlkMjUwN2MxYWZkNDM5ZWJlZmEwYTMyZS4uODFmMWI1ZjBmYTcz ODI0NjhmMjEzMDcyYzQwNzczNDA3NDU3ZDk2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU25pcHBldHNNb2RlbC5qcwpAQCAtMzYzLDggKzM2Myw4IEBA IFdlYkluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl91aVNvdXJjZUNvZGVGb3JTY3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gdWlTb3Vy Y2VDb2RlOwogICAgICAgICB0aGlzLl9zbmlwcGV0Rm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElk XSA9IHNuaXBwZXQ7CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQodWlT b3VyY2VDb2RlLCBzY3JpcHQpOwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBb XSwgYWRkZWRJdGVtczogW10sIHNjcmlwdElkczogW3NjcmlwdC5zY3JpcHRJZF0gfTsKLSAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBp bmcuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsgICAgICAgIAorICAgICAg ICB2YXIgZGF0YSA9IHsgc2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2Rlczog W3VpU291cmNlQ29kZV0gfTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNjcmlwdEJvdW5kLCBkYXRhKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0zODAsNyArMzgwLDcgQEAgV2ViSW5zcGVjdG9yLlNuaXBwZXRz U2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0VkaXRh YmxlID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldC5wdXQoc25p cHBldCwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLnNuaXBwZXQgPSBzbmlw cGV0OwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczog W3VpU291cmNlQ29kZV0sIHNjcmlwdElkczogW10gfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJl bW92ZWRJdGVtczogW10sIGFkZGVkSXRlbXM6IFt1aVNvdXJjZUNvZGVdIH07CiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2 ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CiAgICAgfSwKIApAQCAtNDAwLDEw ICs0MDAsMTUgQEAgV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGUoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNvdXJjZVVSTCwgbmV3IFdlYklu c3BlY3Rvci5TY3JpcHRDb250ZW50UHJvdmlkZXIoc2NyaXB0KSk7CiAgICAgICAgIHVpU291cmNl Q29kZS5pc1NuaXBwZXRFdmFsdWF0aW9uID0gdHJ1ZTsKKyAgICAgICAgdmFyIG9sZFVJU291cmNl Q29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF07CiAg ICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSB1 aVNvdXJjZUNvZGU7CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQodWlT b3VyY2VDb2RlLCBzY3JpcHQpOwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBb XSwgYWRkZWRJdGVtczogW3VpU291cmNlQ29kZV0sIHNjcmlwdElkczogW3NjcmlwdC5zY3JpcHRJ ZF0gfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHNjcmlwdElkOiBzY3JpcHQuc2NyaXB0SWQsIHVp U291cmNlQ29kZXM6IFtvbGRVSVNvdXJjZUNvZGVdIH07CisgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5TY3JpcHRV bmJvdW5kLCBkYXRhKTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJlbW92ZWRJdGVtczogW10sIGFk ZGVkSXRlbXM6IFt1aVNvdXJjZUNvZGVdIH07CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVM aXN0Q2hhbmdlZCwgZGF0YSk7CisgICAgICAgIHZhciBkYXRhID0geyBzY3JpcHRJZDogc2NyaXB0 LnNjcmlwdElkLCB1aVNvdXJjZUNvZGVzOiBbdWlTb3VyY2VDb2RlXSB9OworICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVu dHMuU2NyaXB0Qm91bmQsIGRhdGEpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTQzMiw3ICs0Mzcs NyBAQCBXZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclNuaXBwZXQuZ2V0 KHNuaXBwZXQpOwogICAgICAgICB0aGlzLl9yZWxlYXNlU25pcHBldFNjcmlwdChzbmlwcGV0KTsK ICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldC5yZW1vdmUoc25pcHBldCk7Ci0g ICAgICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IFt1aVNvdXJjZUNvZGVdLCBhZGRlZEl0 ZW1zOiBbXSwgc2NyaXB0SWRzOiBbXSB9OworICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0 ZW1zOiBbdWlTb3VyY2VDb2RlXSwgYWRkZWRJdGVtczogW10gfTsKICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJ U291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsKICAgICB9LAogCkBAIC00NDIsNyArNDQ3LDcg QEAgV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMuX3NuaXBwZXRGb3JTY3JpcHRJZCA9IHt9OwogICAgICAgICB0aGlzLl91aVNvdXJj ZUNvZGVGb3JTY3JpcHRJZCA9IHt9OwogICAgICAgICB0aGlzLl9zY3JpcHRGb3JVSVNvdXJjZUNv ZGUgPSBuZXcgTWFwKCk7Ci0gICAgICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IHJlbW92 ZWRVSVNvdXJjZUNvZGVzLCBhZGRlZEl0ZW1zOiBbXSwgc2NyaXB0SWRzOiBbXSB9OworICAgICAg ICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiByZW1vdmVkVUlTb3VyY2VDb2RlcywgYWRkZWRJ dGVtczogW10gfTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRh KTsKICAgICB9CiB9Cg== 133256 2012-03-22 07:30:40 -0700 2012-03-22 07:31:32 -0700 Patch bug-81904-20120322183038.patch text/plain 14032 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q3Yjg3YjAwOThkNTkx MzljODA4NzNkYTMwODllNTI5ZTAwYWMyZi4uY2JiNDE1MTYxOTI5ZDI4N2U4YmY3NGU4MDg4OTNk YmYzMmM5NjRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTAzLTIyICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEludHJvZHVjZSBTY3JpcHRCb3VuZC9TY3JpcHRVbmJvdW5kIGV2ZW50cyBpbiBTY3JpcHRN YXBwaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODE5MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGFub3RoZXIgc3RlcCBvbiB0aGUgd2F5IHRvIGNsZWFuZXIgQnJlYWtwb2ludE1hbmFn ZXIgbG9naWMuCisgICAgICAgIEhlcmUgd2UgZXh0cmFjdCBTY3JpcHRCb3VuZC9TY3JpcHRVbmJv dW5kIGV2ZW50cyBmcm9tIFVJU291cmNlQ29kZUxpc3RDaGFuZ2VkIGV2ZW50LgorICAgICAgICBU aGlzIGFsbG93cyB1cyB0byBoYW5kbGUgc2NyaXB0LXVpU291cmNlQ29kZSBiaW5kaW5nIHNlcGFy YXRlbHkgZnJvbQorICAgICAgICB1aVNvdXJjZUNvZGUgY3JlYXRpb24vZGVsZXRpb24gYW5kIHRv IGhhbmRsZSB1bmJpbmRpbmcgdGhhdCB3YXMgbm90CisgICAgICAgIHBvc3NpYmxlIGF0IGFsbCBi ZWZvcmUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFw cGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJv dG90eXBlLl91aVNvdXJjZUNvZGVzRm9yU291cmNlTWFwKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlLmFkZFNjcmlwdC5nZXQgdGhpcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5hZGRT Y3JpcHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90 b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3Jp cHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGlu Zy5wcm90b3R5cGUuX3VpU291cmNlQ29kZUNoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NYWluU2Ny aXB0TWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcucHJv dG90eXBlLl91cGRhdGVMaXZlTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5T Y3JpcHRNYXBwaW5nLnByb3RvdHlwZS5faGFuZGxlVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5faGFuZGxl U2NyaXB0Qm91bmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5nLnBy b3RvdHlwZS5faGFuZGxlU2NyaXB0VW5ib3VuZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TbmlwcGV0c01vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2Ny aXB0TWFwcGluZy5wcm90b3R5cGUuYWRkU2NyaXB0LmdldCB0aGlzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9zbmlwcGV0QWRkZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2Ny ZWF0ZVVJU291cmNlQ29kZUZvclNjcmlwdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU25pcHBl dHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fc25pcHBldFJlbW92ZWQuZ2V0IHRoaXMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX3NuaXBw ZXRSZW1vdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcu cHJvdG90eXBlLnJlc2V0KToKKwogMjAxMi0wMy0yMiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIENTUyBhbmQgSmF2 YVNjcmlwdCBmaWxlcyBlZGl0YWJsZSBieSBkZWZhdWx0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwpp bmRleCA2YzZlNmIyNjVhMDdkODM2ZGNhNjRkMGE0Zjc4NDkwZDlhMDFjYjI5Li43ODIzMzdjODI0 MDU5N2ZhN2Y1MDI4Y2FlM2Y3MTU3MTMzZTJhYTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwpA QCAtNzksNiArNzksMTkgQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90 b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlNvdXJjZU1hcFBhcnNlcn0gc291cmNlTWFwCisgICAgICogQHJldHVybiB7QXJyYXkuPFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGU+fQorICAgICAqLworICAgIF91aVNvdXJjZUNvZGVzRm9yU291 cmNlTWFwOiBmdW5jdGlvbihzb3VyY2VNYXApCisgICAgeworICAgICAgICB2YXIgcmVzdWx0ID0g W10KKyAgICAgICAgdmFyIHNvdXJjZVVSTHMgPSBzb3VyY2VNYXAuc291cmNlcygpOworICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHNvdXJjZVVSTHMubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICByZXN1bHQucHVzaCh0aGlzLl91aVNvdXJjZUNvZGVCeVVSTFtzb3VyY2VVUkxzW2ldXSk7Cisg ICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlNjcmlwdH0gc2NyaXB0CiAgICAgICovCiAgICAgYWRkU2NyaXB0OiBmdW5j dGlvbihzY3JpcHQpCkBAIC04Nyw4ICsxMDAsOSBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3Jp cHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAodGhpcy5fc2NyaXB0Rm9yU291 cmNlTWFwLmdldChzb3VyY2VNYXApKSB7CiAgICAgICAgICAgICB0aGlzLl9zb3VyY2VNYXBGb3JT Y3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gc291cmNlTWFwOwotICAgICAgICAgICAgdmFyIGRh dGEgPSB7IHJlbW92ZWRJdGVtczogW10sIGFkZGVkSXRlbXM6IFtdLCBzY3JpcHRJZHM6IFtzY3Jp cHQuc2NyaXB0SWRdIH07Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5n ZWQsIGRhdGEpOworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl91aVNvdXJj ZUNvZGVzRm9yU291cmNlTWFwKHNvdXJjZU1hcCk7CisgICAgICAgICAgICB2YXIgZGF0YSA9IHsg c2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2RlczogdWlTb3VyY2VDb2RlcyB9 OworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNjcmlwdEJvdW5kLCBkYXRhKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCkBAIC0xMDksOCArMTIzLDEwIEBAIFdlYkluc3BlY3Rvci5Db21w aWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3NvdXJjZU1h cEZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSBzb3VyY2VNYXA7CiAgICAgICAgIHRoaXMu X3NjcmlwdEZvclNvdXJjZU1hcC5wdXQoc291cmNlTWFwLCBzY3JpcHQpOwotICAgICAgICB2YXIg ZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogdWlTb3VyY2VDb2RlTGlzdCwg c2NyaXB0SWRzOiBbc2NyaXB0LnNjcmlwdElkXSB9OworICAgICAgICB2YXIgZGF0YSA9IHsgcmVt b3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogdWlTb3VyY2VDb2RlTGlzdCB9OwogICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5F dmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIGRhdGEpOworICAgICAgICB2YXIgZGF0YSA9 IHsgc2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2RlczogdWlTb3VyY2VDb2Rl TGlzdCB9OworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuU2NyaXB0Qm91bmQsIGRhdGEpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTEzNCw3ICsxNTAsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBw aW5nLnByb3RvdHlwZSA9IHsKIAogICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiB0aGlzLnVpU291cmNlQ29kZUxpc3QoKSwgYWRk ZWRJdGVtczogW10sIHNjcmlwdElkczogW10gfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJlbW92 ZWRJdGVtczogdGhpcy51aVNvdXJjZUNvZGVMaXN0KCksIGFkZGVkSXRlbXM6IFtdIH07CiAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBw aW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CiAKICAgICAgICAgdGhp cy5fc291cmNlTWFwQnlVUkwgPSB7fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKaW5kZXggNjJkNGNk ZWY2YjFiYTZhYTU3MjI5MmQyMGI0OWZjOWM1NmY4YjA0NS4uYmZjMmE5YTE1YjAwOGQ3ZWNjMzAx OWRmOTBlYjEwMzIxNGMzMzM2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKQEAgLTEzOSw4ICsx MzksMjMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICBzY3JpcHRJZHMucHVzaChyYXdTb3VyY2VDb2RlLl9zY3JpcHRzW2ldLnNj cmlwdElkKTsKICAgICAgICAgdmFyIHJlbW92ZWRJdGVtcyA9IHJlbW92ZWRJdGVtID8gW3JlbW92 ZWRJdGVtXSA6IFtdOwogICAgICAgICB2YXIgYWRkZWRJdGVtcyA9IGFkZGVkSXRlbSA/IFthZGRl ZEl0ZW1dIDogW107Ci0gICAgICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IHJlbW92ZWRJ dGVtcywgYWRkZWRJdGVtczogYWRkZWRJdGVtcywgc2NyaXB0SWRzOiBzY3JpcHRJZHMgfTsKKwor ICAgICAgICBpZiAocmVtb3ZlZEl0ZW0pIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgc2NyaXB0SWRzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgdmFyIGRhdGEgPSB7 IHNjcmlwdElkOiBzY3JpcHRJZHNbaV0sIHVpU291cmNlQ29kZXM6IFtyZW1vdmVkSXRlbV0gfTsK KyAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuU2NyaXB0TWFwcGluZy5FdmVudHMuU2NyaXB0VW5ib3VuZCwgZGF0YSk7CisgICAgICAgICAg ICB9CisgICAgICAgIH0KKworICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiByZW1v dmVkSXRlbXMsIGFkZGVkSXRlbXM6IGFkZGVkSXRlbXMgfTsKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291 cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsKKworICAgICAgICBpZiAoYWRkZWRJdGVtKSB7Cisg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNjcmlwdElkcy5sZW5ndGg7ICsraSkgewor ICAgICAgICAgICAgICAgIHZhciBkYXRhID0geyBzY3JpcHRJZDogc2NyaXB0SWRzW2ldLCB1aVNv dXJjZUNvZGVzOiBbYWRkZWRJdGVtXSB9OworICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5TY3JpcHRC b3VuZCwgZGF0YSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9LAogCiAgICAgLyoq CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1h cHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1hcHBp bmcuanMKaW5kZXggYjUyNzA4YjRhNjkxNWM5ZDBhMzI5ZmY4NDNlOTRlZDFjZTcyNGU0Ni4uMTgx ZTdhMmEyMmY2YzY3MmIxZWY0YzI3MjQyNzVmZjE3ZWVkMjNmMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRNYXBwaW5nLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0TWFwcGluZy5qcwpAQCAtMzcsNyAr MzcsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKIH0KIAogV2Vi SW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzID0gewotICAgIFVJU291cmNlQ29kZUxpc3RD aGFuZ2VkOiAidXMtc291cmNlLWNvZGUtbGlzdC1jaGFuZ2VkIgorICAgIFVJU291cmNlQ29kZUxp c3RDaGFuZ2VkOiAidWktc291cmNlLWNvZGUtbGlzdC1jaGFuZ2VkIiwKKyAgICBTY3JpcHRCb3Vu ZDogInNjcmlwdC1ib3VuZCIsCisgICAgU2NyaXB0VW5ib3VuZDogInNjcmlwdC11bmJvdW5kIiwK IH0KIAogV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewpAQCAtNzgsOCAr ODAsMTEgQEAgV2ViSW5zcGVjdG9yLk1haW5TY3JpcHRNYXBwaW5nID0gZnVuY3Rpb24oKQogICAg IHRoaXMuX3NuaXBwZXRzTWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRN YXBwaW5nKCk7CiAgICAgdGhpcy5fbWFwcGluZ3MucHVzaCh0aGlzLl9zbmlwcGV0c01hcHBpbmcp OwogCi0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9tYXBwaW5ncy5sZW5ndGg7ICsraSkK KyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX21hcHBpbmdzLmxlbmd0aDsgKytpKSB7CiAg ICAgICAgIHRoaXMuX21hcHBpbmdzW2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNj cmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzLl9oYW5kbGVV SVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX21hcHBpbmdzW2ld LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNjcmlw dEJvdW5kLCB0aGlzLl9oYW5kbGVTY3JpcHRCb3VuZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX21h cHBpbmdzW2ldLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZl bnRzLlNjcmlwdFVuYm91bmQsIHRoaXMuX2hhbmRsZVNjcmlwdFVuYm91bmQsIHRoaXMpOworICAg IH0KIAogICAgIHRoaXMuX21hcHBpbmdGb3JTY3JpcHRJZCA9IHt9OwogICAgIHRoaXMuX21hcHBp bmdGb3JVSVNvdXJjZUNvZGUgPSBuZXcgTWFwKCk7CkBAIC04Nyw3ICs5Miw3IEBAIFdlYkluc3Bl Y3Rvci5NYWluU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLk1h aW5TY3JpcHRNYXBwaW5nLkV2ZW50cyA9IHsKLSAgICBVSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZDog InVzLXNvdXJjZS1jb2RlLWxpc3QtY2hhbmdlZCIKKyAgICBVSVNvdXJjZUNvZGVMaXN0Q2hhbmdl ZDogInVpLXNvdXJjZS1jb2RlLWxpc3QtY2hhbmdlZCIKIH0KIAogV2ViSW5zcGVjdG9yLk1haW5T Y3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKQEAgLTEzMywxMyArMTM4LDExIEBAIFdlYkluc3Bl Y3Rvci5NYWluU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9s aXZlTG9jYXRpb25zRm9yU2NyaXB0SWRbc2NyaXB0SWRdLnJlbW92ZShsaXZlTG9jYXRpb24pOwog ICAgIH0sCiAKLSAgICBfdXBkYXRlTGl2ZUxvY2F0aW9uczogZnVuY3Rpb24oc2NyaXB0SWRzKQor ICAgIF91cGRhdGVMaXZlTG9jYXRpb246IGZ1bmN0aW9uKHNjcmlwdElkKQogICAgIHsKLSAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRJZHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAg ICAgIHZhciBsaXZlTG9jYXRpb25zID0gdGhpcy5fbGl2ZUxvY2F0aW9uc0ZvclNjcmlwdElkW3Nj cmlwdElkc1tpXV07Ci0gICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGxpdmVMb2NhdGlv bnMubGVuZ3RoOyArK2opCi0gICAgICAgICAgICAgICAgbGl2ZUxvY2F0aW9uc1tqXS5fdXBkYXRl KCk7Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIGxpdmVMb2NhdGlvbnMgPSB0aGlzLl9saXZlTG9j YXRpb25zRm9yU2NyaXB0SWRbc2NyaXB0SWRdOworICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8 IGxpdmVMb2NhdGlvbnMubGVuZ3RoOyArK2opCisgICAgICAgICAgICBsaXZlTG9jYXRpb25zW2pd Ll91cGRhdGUoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTUsMTUgKzE5OCwzMiBAQCBXZWJJ bnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2Ny aXB0TWFwcGluZyA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmd9ICovIGV2 ZW50LnRhcmdldDsKICAgICAgICAgdmFyIHJlbW92ZWRJdGVtcyA9IC8qKiBAdHlwZSB7QXJyYXku PFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLyBldmVudC5kYXRhWyJyZW1vdmVkSXRlbXMi XTsKICAgICAgICAgdmFyIGFkZGVkSXRlbXMgPSAvKiogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlPn0gKi8gZXZlbnQuZGF0YVsiYWRkZWRJdGVtcyJdOwotICAgICAgICB2 YXIgc2NyaXB0SWRzID0gLyoqIEB0eXBlIHtBcnJheS48bnVtYmVyPn0gKi8gZXZlbnQuZGF0YVsi c2NyaXB0SWRzIl07CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkSXRlbXMu bGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLl9tYXBwaW5nRm9yVUlTb3VyY2VDb2RlLnJl bW92ZShyZW1vdmVkSXRlbXNbaV0pOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFkZGVk SXRlbXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLl9tYXBwaW5nRm9yVUlTb3VyY2VD b2RlLnB1dChhZGRlZEl0ZW1zW2ldLCBzY3JpcHRNYXBwaW5nKTsKLSAgICAgICAgdGhpcy5fdXBk YXRlTGl2ZUxvY2F0aW9ucyhzY3JpcHRJZHMpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTWFpblNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNl Q29kZUxpc3RDaGFuZ2VkLCBldmVudC5kYXRhKTsKICAgICB9LAorICAgIAorICAgIC8qKgorICAg ICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5k bGVTY3JpcHRCb3VuZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgc2NyaXB0 SWQgPSAvKiogQHR5cGUge251bWJlcn0gKi8gZXZlbnQuZGF0YS5zY3JpcHRJZDsKKyAgICAgICAg dGhpcy5fdXBkYXRlTGl2ZUxvY2F0aW9uKHNjcmlwdElkKTsKKyAgICB9LAorICAgIAorICAgIC8q KgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAg IF9oYW5kbGVTY3JpcHRVbmJvdW5kOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZh ciBzY3JpcHRJZCA9IC8qKiBAdHlwZSB7bnVtYmVyfSAqLyBldmVudC5kYXRhLnNjcmlwdElkOwor ICAgICAgICB0aGlzLl91cGRhdGVMaXZlTG9jYXRpb24oc2NyaXB0SWQpOworICAgIH0sCisKIAog ICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gZm9ybWF0U291cmNlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMKaW5kZXgg YTkwMGU5MGE5Y2E4YTZjMDlkMjUwN2MxYWZkNDM5ZWJlZmEwYTMyZS4uODFmMWI1ZjBmYTczODI0 NjhmMjEzMDcyYzQwNzczNDA3NDU3ZDk2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU25pcHBldHNNb2RlbC5qcwpAQCAtMzYzLDggKzM2Myw4IEBAIFdl Ykluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl91aVNvdXJjZUNvZGVGb3JTY3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gdWlTb3VyY2VD b2RlOwogICAgICAgICB0aGlzLl9zbmlwcGV0Rm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9 IHNuaXBwZXQ7CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQodWlTb3Vy Y2VDb2RlLCBzY3JpcHQpOwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwg YWRkZWRJdGVtczogW10sIHNjcmlwdElkczogW3NjcmlwdC5zY3JpcHRJZF0gfTsKLSAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcu RXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsgICAgICAgIAorICAgICAgICB2 YXIgZGF0YSA9IHsgc2NyaXB0SWQ6IHNjcmlwdC5zY3JpcHRJZCwgdWlTb3VyY2VDb2RlczogW3Vp U291cmNlQ29kZV0gfTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlNjcmlwdEJvdW5kLCBkYXRhKTsKICAgICB9 LAogCiAgICAgLyoqCkBAIC0zODAsNyArMzgwLDcgQEAgV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2Ny aXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0VkaXRhYmxl ID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldC5wdXQoc25pcHBl dCwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLnNuaXBwZXQgPSBzbmlwcGV0 OwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwgYWRkZWRJdGVtczogW3Vp U291cmNlQ29kZV0sIHNjcmlwdElkczogW10gfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJlbW92 ZWRJdGVtczogW10sIGFkZGVkSXRlbXM6IFt1aVNvdXJjZUNvZGVdIH07CiAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50 cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CiAgICAgfSwKIApAQCAtNDAwLDEwICs0 MDAsMTUgQEAgV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7 CiAgICAgewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNvdXJjZVVSTCwgbmV3IFdlYkluc3Bl Y3Rvci5TY3JpcHRDb250ZW50UHJvdmlkZXIoc2NyaXB0KSk7CiAgICAgICAgIHVpU291cmNlQ29k ZS5pc1NuaXBwZXRFdmFsdWF0aW9uID0gdHJ1ZTsKKyAgICAgICAgdmFyIG9sZFVJU291cmNlQ29k ZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF07CiAgICAg ICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSB1aVNv dXJjZUNvZGU7CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQodWlTb3Vy Y2VDb2RlLCBzY3JpcHQpOwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiBbXSwg YWRkZWRJdGVtczogW3VpU291cmNlQ29kZV0sIHNjcmlwdElkczogW3NjcmlwdC5zY3JpcHRJZF0g fTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHNjcmlwdElkOiBzY3JpcHQuc2NyaXB0SWQsIHVpU291 cmNlQ29kZXM6IFtvbGRVSVNvdXJjZUNvZGVdIH07CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5TY3JpcHRVbmJv dW5kLCBkYXRhKTsKKyAgICAgICAgdmFyIGRhdGEgPSB7IHJlbW92ZWRJdGVtczogW10sIGFkZGVk SXRlbXM6IFt1aVNvdXJjZUNvZGVdIH07CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0 Q2hhbmdlZCwgZGF0YSk7CisgICAgICAgIHZhciBkYXRhID0geyBzY3JpcHRJZDogc2NyaXB0LnNj cmlwdElkLCB1aVNvdXJjZUNvZGVzOiBbdWlTb3VyY2VDb2RlXSB9OworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZy5FdmVudHMu U2NyaXB0Qm91bmQsIGRhdGEpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTQzMiw3ICs0MzcsNyBA QCBXZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdmFyIHVpU291cmNlQ29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclNuaXBwZXQuZ2V0KHNu aXBwZXQpOwogICAgICAgICB0aGlzLl9yZWxlYXNlU25pcHBldFNjcmlwdChzbmlwcGV0KTsKICAg ICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldC5yZW1vdmUoc25pcHBldCk7Ci0gICAg ICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IFt1aVNvdXJjZUNvZGVdLCBhZGRlZEl0ZW1z OiBbXSwgc2NyaXB0SWRzOiBbXSB9OworICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1z OiBbdWlTb3VyY2VDb2RlXSwgYWRkZWRJdGVtczogW10gfTsKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291 cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsKICAgICB9LAogCkBAIC00NDIsNyArNDQ3LDcgQEAg V2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX3NuaXBwZXRGb3JTY3JpcHRJZCA9IHt9OwogICAgICAgICB0aGlzLl91aVNvdXJjZUNv ZGVGb3JTY3JpcHRJZCA9IHt9OwogICAgICAgICB0aGlzLl9zY3JpcHRGb3JVSVNvdXJjZUNvZGUg PSBuZXcgTWFwKCk7Ci0gICAgICAgIHZhciBkYXRhID0geyByZW1vdmVkSXRlbXM6IHJlbW92ZWRV SVNvdXJjZUNvZGVzLCBhZGRlZEl0ZW1zOiBbXSwgc2NyaXB0SWRzOiBbXSB9OworICAgICAgICB2 YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiByZW1vdmVkVUlTb3VyY2VDb2RlcywgYWRkZWRJdGVt czogW10gfTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlNjcmlwdE1hcHBpbmcuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCBkYXRhKTsK ICAgICB9CiB9Cg==