80396 2012-03-06 01:23:32 -0800 Web Inspector: prepare for extracting ScriptMapping implementation from DebuggerPresentationModel. 2012-03-06 04:40:06 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 571627 0 podivilov 2012-03-06 01:23:32 -0800 Web Inspector: prepare for extracting ScriptMapping implementation from DebuggerPresentationModel. Limit RawSourceCode usages to a subset of methods. This subset will be moved to ScriptMapping implementation in a separate change. 571630 1 130327 podivilov 2012-03-06 01:25:31 -0800 Created attachment 130327 Patch [depends on bug 80395] 571708 2 130327 vsevik 2012-03-06 03:55:15 -0800 Comment on attachment 130327 Patch [depends on bug 80395] View in context: https://bugs.webkit.org/attachment.cgi?id=130327&action=review > LayoutTests/ChangeLog:8 > + * inspector/debugger/breakpoint-manager.html: Looks like you should re-prepare ChangeLog. 571727 3 podivilov 2012-03-06 04:40:06 -0800 Committed r109905: <http://trac.webkit.org/changeset/109905> 130327 2012-03-06 01:25:31 -0800 2012-03-06 03:55:15 -0800 Patch [depends on bug 80395] patch text/plain 17095 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNjY0ZTM4Li4wZDQ5ZmNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDMt MDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogcHJlcGFyZSBmb3IgZXh0cmFjdGluZyBTY3JpcHRNYXBwaW5nIGltcGxl bWVudGF0aW9uIGZyb20gRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMzk2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvYnJl YWtwb2ludC1tYW5hZ2VyLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2NhbGxz dGFjay1wbGFjYXJkcy1kaXNjYXJkZWQuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdn ZXIvbGlua2lmaWVyLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3Jhdy1zb3Vy Y2UtY29kZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29k ZS5odG1sOgorCiAyMDEyLTAzLTA2ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSByZWZlcmVuY2UgdG8gUmF3 U291cmNlQ29kZSBmcm9tIFVJU291cmNlQ29kZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9jYWxsc3RhY2stcGxhY2FyZHMtZGlzY2FyZGVkLmh0bWwgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY2FsbHN0YWNrLXBsYWNhcmRzLWRpc2NhcmRlZC5o dG1sCmluZGV4IDQ1NjY5YmYuLjQ0NjM4NGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9jYWxsc3RhY2stcGxhY2FyZHMtZGlzY2FyZGVkLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NhbGxzdGFjay1wbGFjYXJkcy1kaXNjYXJkZWQu aHRtbApAQCAtMjEsNyArMjEsNyBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKICAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiUmVjZWl2ZWQgRGVidWdnZXJQYXVzZWQgZXZl bnQuIik7CiAgICAgICAgICAgICAgICAgdmFyIGNhbGxGcmFtZSA9IGV2ZW50LmRhdGEuY2FsbEZy YW1lc1swXTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiRnVuY3Rp b24gbmFtZTogIiArIGNhbGxGcmFtZS5fY2FsbEZyYW1lLmZ1bmN0aW9uTmFtZSk7Ci0gICAgICAg ICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSBjYWxsRnJhbWUuX3Jhd1NvdXJjZUNvZGU7Cisg ICAgICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5fcmF3U291cmNlQ29kZUZvclNjcmlwdElkW2NhbGxGcmFtZS5fY2Fs bEZyYW1lLmxvY2F0aW9uLnNjcmlwdElkXTsKICAgICAgICAgICAgICAgICB2YXIgbGlzdGVuZXJz ID0gcmF3U291cmNlQ29kZS5fbGlzdGVuZXJzW1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2 ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZF07CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIkxpc3RlbmVycyBsZW5ndGg6ICIgKyBsaXN0ZW5lcnMubGVuZ3RoKTsK ICAgICAgICAgICAgICAgICBpZiAocHJldmlvdXNMaXN0ZW5lckxlbmd0aCAhPT0gdW5kZWZpbmVk ICYmIGxpc3RlbmVycy5sZW5ndGggIT09IHByZXZpb3VzTGlzdGVuZXJMZW5ndGgpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKaW5kZXggZTYxNzhmNC4u OWI3OTExMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtp Zmllci5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIu aHRtbApAQCAtMzQsNyArMzQsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBmdW5jdGlvbiBkZWJ1 Z2dlclRlc3QoKQogICAgIHsKICAgICAgICAgbGlua2lmaWVyID0gV2ViSW5zcGVjdG9yLmRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuY3JlYXRlTGlua2lmaWVyKCk7Ci0gICAgICAgIHJhd1NvdXJj ZUNvZGUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5fcmF3U291cmNl Q29kZUZvclNjcmlwdFdpdGhVUkwoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwpOworICAg ICAgICByYXdTb3VyY2VDb2RlID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuX3Jhd1NvdXJjZUNvZGVGb3JVUkxbV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkxdOwog CiAgICAgICAgIHZhciBjb3VudDEgPSBsaXN0ZW5lcnNDb3VudChyYXdTb3VyY2VDb2RlKTsKICAg ICAgICAgbGluayA9IGxpbmtpZmllci5saW5raWZ5TG9jYXRpb24oV2ViSW5zcGVjdG9yLmluc3Bl Y3RlZFBhZ2VVUkwsIDIwLCAwLCAiZHVtbXktY2xhc3MiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NTJhMjc3 Li5lZjI3ZDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQgQEAKIDIwMTItMDMtMDYgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogcHJlcGFyZSBmb3IgZXh0cmFjdGluZyBTY3JpcHRNYXBwaW5nIGltcGxlbWVudGF0aW9u IGZyb20gRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMzk2CisKKyAgICAgICAgTGltaXQgUmF3U291cmNl Q29kZSB1c2FnZXMgdG8gYSBzdWJzZXQgb2YgbWV0aG9kcy4gVGhpcyBzdWJzZXQgd2lsbCBiZSBt b3ZlZCB0byBTY3JpcHRNYXBwaW5nIGltcGxlbWVudGF0aW9uIGluIGEgc2VwYXJhdGUgY2hhbmdl LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmNyZWF0ZVBsYWNhcmQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90 eXBlLmNyZWF0ZUxpdmVMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3BhcnNlZFNjcmlwdFNvdXJjZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2ZhaWxl ZFRvUGFyc2VTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNldFNjcmlwdFNvdXJjZS5kaWRFZGl0U2NyaXB0U291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnBy b3RvdHlwZS5zZXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9mb3JjZVVwZGF0ZVNvdXJjZU1hcHBpbmcpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl Ll9hZGRDb25zb2xlTWVzc2FnZVRvU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGVidWdnZXJQYXVzZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNldCBz ZWxlY3RlZENhbGxGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2Fs bEZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUucHJv dG90eXBlLnVpTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuQ2FsbEZyYW1lUGxhY2FyZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuY2FuU2V0Q29u dGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbFJl c291cmNlQmluZGluZy5wcm90b3R5cGUuc2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuX3Vp U291cmNlQ29kZUZvclJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLkxpbmtpZmllci5wcm90b3R5cGUubGlua2lmeVJhd0xvY2F0aW9uKToK KworMjAxMi0wMy0wNiAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4K KwogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgcmVmZXJlbmNlIHRvIFJhd1NvdXJjZUNv ZGUgZnJvbSBVSVNvdXJjZUNvZGUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04MDM5NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXgg YjkwMDNhYS4uNjQwNzk5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtNDIs NiArNDIsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9IGZ1bmN0 aW9uKCkKICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yRG9jdW1lbnRVUkwgPSB7fTsKICAgICB0 aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlID0gbmV3IE1hcCgpOwogICAgIHRoaXMu X3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMgPSBbXTsKKyAgICB0aGlzLl9mb3JtYXRTb3VyY2UgPSBm YWxzZTsKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5C cmVha3BvaW50TWFuYWdlcihXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuYnJlYWtwb2ludHMsIHRoaXMu X2JyZWFrcG9pbnRBZGRlZC5iaW5kKHRoaXMpLCB0aGlzLl9icmVha3BvaW50UmVtb3ZlZC5iaW5k KHRoaXMpLCBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbCwgdGhpcyk7CiAKQEAgLTkyLDcgKzkz LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIGNyZWF0ZVBsYWNhcmQ6IGZ1bmN0aW9uKGNhbGxGcmFtZSkKICAgICB7 Ci0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuQ2FsbEZyYW1lUGxhY2FyZChjYWxsRnJhbWUpOworICAgICAgICByZXR1cm4gbmV3IFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkNhbGxGcmFtZVBsYWNhcmQoY2FsbEZy YW1lLCB0aGlzKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xMTgsMTIgKzExOSwyNCBAQCBXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgfSwK IAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7RGVidWdnZXJBZ2VudC5Mb2NhdGlvbn0gcmF3TG9j YXRpb24KKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKX0g dXBkYXRlRGVsZWdhdGUKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29k ZS5MaXZlTG9jYXRpb259CisgICAgICovCisgICAgY3JlYXRlTGl2ZUxvY2F0aW9uOiBmdW5jdGlv bihyYXdMb2NhdGlvbiwgdXBkYXRlRGVsZWdhdGUpCisgICAgeworICAgICAgICB2YXIgcmF3U291 cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRJZFtyYXdMb2NhdGlvbi5zY3Jp cHRJZF07CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuTGl2 ZUxvY2F0aW9uKHJhd1NvdXJjZUNvZGUsIHJhd0xvY2F0aW9uLCB1cGRhdGVEZWxlZ2F0ZSk7Cisg ICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVu dAogICAgICAqLwogICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKICAgICAgICAgdmFyIHNjcmlwdCA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0g Ki8gZXZlbnQuZGF0YTsKICAgICAgICAgdGhpcy5fYWRkU2NyaXB0KHNjcmlwdCk7CisgICAgICAg IHRoaXMuX2FkZFBlbmRpbmdDb25zb2xlTWVzc2FnZXNUb1NjcmlwdChzY3JpcHQpOwogICAgIH0s CiAKICAgICAvKioKQEAgLTEzMSw4ICsxNDQsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2ZhaWxlZFRvUGFyc2VT Y3JpcHRTb3VyY2U6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9 IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0gKi8gZXZlbnQuZGF0YTsKLSAgICAgICAg dGhpcy5fYWRkU2NyaXB0KHNjcmlwdCk7CisgICAgICAgIHRoaXMuX3BhcnNlZFNjcmlwdFNvdXJj ZShldmVudCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTY2LDggKzE3OCw2IEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KGlzSW5saW5lU2NyaXB0KQogICAgICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3Vt ZW50VVJMW3NjcmlwdC5zb3VyY2VVUkxdID0gcmF3U291cmNlQ29kZTsKIAotICAgICAgICB0aGlz Ll9hZGRQZW5kaW5nQ29uc29sZU1lc3NhZ2VzVG9TY3JpcHQoc2NyaXB0KTsKLQogICAgICAgICBp ZiAocmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGVMaXN0KCkubGVuZ3RoKQogICAgICAgICAgICAg dGhpcy5fdWlTb3VyY2VDb2RlTGlzdENoYW5nZWQocmF3U291cmNlQ29kZSwgW10sIHJhd1NvdXJj ZUNvZGUudWlTb3VyY2VDb2RlTGlzdCgpKTsKICAgICAgICAgcmF3U291cmNlQ29kZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5VSVNvdXJjZUNvZGVM aXN0Q2hhbmdlZCwgdGhpcy5faGFuZGxlVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRoaXMpOwpA QCAtMjgzLDcgKzI5Myw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmIChlcnJvcikKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJj ZUZvclVSTCh1aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdl Ykluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChzY3JpcHQuc291cmNlVVJMKTsKICAgICAgICAgICAg IGlmIChyZXNvdXJjZSkKICAgICAgICAgICAgICAgICByZXNvdXJjZS5hZGRSZXZpc2lvbihuZXdT b3VyY2UpOwogCkBAIC0zNDUsNiArMzU1LDE1IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHBh cmFtIHtEZWJ1Z2dlckFnZW50LkxvY2F0aW9ufSByYXdMb2NhdGlvbgorICAgICAqLworICAgIF9m b3JjZVVwZGF0ZVNvdXJjZU1hcHBpbmc6IGZ1bmN0aW9uKHJhd0xvY2F0aW9uKQorICAgIHsKKyAg ICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0SWRb cmF3TG9jYXRpb24uc2NyaXB0SWRdOworICAgICAgICByYXdTb3VyY2VDb2RlLmZvcmNlVXBkYXRl U291cmNlTWFwcGluZygpOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5FdmVudH0gZXZlbnQKICAgICAgKi8KICAgICBfY29uc29sZU1lc3NhZ2VBZGRlZDog ZnVuY3Rpb24oZXZlbnQpCkBAIC0zNjYsMTQgKzM4NSwxNSBAQCBXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2FkZENvbnNv bGVNZXNzYWdlVG9TY3JpcHQ6IGZ1bmN0aW9uKG1lc3NhZ2UsIHNjcmlwdCkKICAgICB7Ci0gICAg ICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdChzY3Jp cHQpOwogICAgICAgICBmdW5jdGlvbiB1cGRhdGVMb2NhdGlvbih1aUxvY2F0aW9uKQogICAgICAg ICB7CiAgICAgICAgICAgICB2YXIgcHJlc2VudGF0aW9uTWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0 b3IuUHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2UodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUsIHVp TG9jYXRpb24ubGluZU51bWJlciwgbWVzc2FnZSk7CiAgICAgICAgICAgICB0aGlzLl9wcmVzZW50 YXRpb25Db25zb2xlTWVzc2FnZXMucHVzaChwcmVzZW50YXRpb25NZXNzYWdlKTsKICAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5Db25zb2xlTWVzc2FnZUFkZGVkLCBwcmVzZW50YXRpb25N ZXNzYWdlKTsKICAgICAgICAgfQotICAgICAgICB2YXIgbGl2ZUxvY2F0aW9uID0gcmF3U291cmNl Q29kZS5jcmVhdGVMaXZlTG9jYXRpb24obWVzc2FnZS5sb2NhdGlvbiwgdXBkYXRlTG9jYXRpb24u YmluZCh0aGlzKSk7CisgICAgICAgIHZhciByYXdMb2NhdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3Iu RGVidWdnZXJNb2RlbC5Mb2NhdGlvbihtZXNzYWdlLmxvY2F0aW9uLmxpbmVOdW1iZXIsIG1lc3Nh Z2UubG9jYXRpb24uY29sdW1uTnVtYmVyKTsKKyAgICAgICAgcmF3TG9jYXRpb24uc2NyaXB0SWQg PSBzY3JpcHQuc2NyaXB0SWQ7CisgICAgICAgIHZhciBsaXZlTG9jYXRpb24gPSB0aGlzLmNyZWF0 ZUxpdmVMb2NhdGlvbihyYXdMb2NhdGlvbiwgdXBkYXRlTG9jYXRpb24uYmluZCh0aGlzKSk7CiAg ICAgICAgIGxpdmVMb2NhdGlvbi5pbml0KCk7CiAgICAgICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdl TGl2ZUxvY2F0aW9ucy5wdXNoKGxpdmVMb2NhdGlvbik7CiAgICAgfSwKQEAgLTU0NywxMSArNTY3 LDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzID0gW107CiAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgY2FsbEZyYW1lcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAg dmFyIGNhbGxGcmFtZSA9IGNhbGxGcmFtZXNbaV07Ci0gICAgICAgICAgICB2YXIgc2NyaXB0ID0g V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxv Y2F0aW9uLnNjcmlwdElkKTsKLSAgICAgICAgICAgIGlmICghc2NyaXB0KQotICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9yYXdT b3VyY2VDb2RlRm9yU2NyaXB0KHNjcmlwdCk7Ci0gICAgICAgICAgICB0aGlzLl9wcmVzZW50YXRp b25DYWxsRnJhbWVzLnB1c2gobmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUo Y2FsbEZyYW1lLCBpLCB0aGlzLCByYXdTb3VyY2VDb2RlKSk7CisgICAgICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxvY2F0 aW9uLnNjcmlwdElkKSkKKyAgICAgICAgICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJh bWVzLnB1c2gobmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUoY2FsbEZyYW1l LCBpLCB0aGlzKSk7CiAgICAgICAgIH0KICAgICAgICAgdmFyIGRldGFpbHMgPSBXZWJJbnNwZWN0 b3IuZGVidWdnZXJNb2RlbC5kZWJ1Z2dlclBhdXNlZERldGFpbHM7CiAgICAgICAgIHRoaXMuc2Vs ZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzWzBdOwpAQCAtNTgw LDE0ICs1OTcsMTQgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJv dG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lKQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1NvdXJj ZUNvZGUuZm9yY2VVcGRhdGVTb3VyY2VNYXBwaW5nKCk7CisgICAgICAgIHRoaXMuX2ZvcmNlVXBk YXRlU291cmNlTWFwcGluZyhjYWxsRnJhbWUuX2NhbGxGcmFtZS5sb2NhdGlvbik7CiAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cy5DYWxsRnJhbWVTZWxlY3RlZCwgY2FsbEZyYW1lKTsKIAogICAg ICAgICBmdW5jdGlvbiB1cGRhdGVFeGVjdXRpb25MaW5lKHVpTG9jYXRpb24pCiAgICAgICAgIHsK ICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdWlM b2NhdGlvbik7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fZXhlY3V0aW9uTGluZUxpdmVMb2Nh dGlvbiA9IHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1NvdXJjZUNvZGUuY3JlYXRlTGl2ZUxv Y2F0aW9uKGNhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uLCB1cGRhdGVFeGVjdXRpb25MaW5l LmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9leGVjdXRpb25MaW5lTGl2ZUxvY2F0aW9uID0g dGhpcy5jcmVhdGVMaXZlTG9jYXRpb24oY2FsbEZyYW1lLl9jYWxsRnJhbWUubG9jYXRpb24sIHVw ZGF0ZUV4ZWN1dGlvbkxpbmUuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkxp bmVMaXZlTG9jYXRpb24uaW5pdCgpOwogICAgIH0sCiAKQEAgLTY0OSwyMiArNjY2LDYgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gc291cmNlVVJMCi0gICAgICovCi0g ICAgX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRXaXRoVVJMOiBmdW5jdGlvbihzb3VyY2VVUkwpCi0g ICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmF3U291cmNlQ29kZUZvclVSTFtzb3VyY2VVUkxd OwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TY3JpcHR9 IHNjcmlwdAotICAgICAqLwotICAgIF9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0OiBmdW5jdGlvbihz Y3JpcHQpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlw dElkW3NjcmlwdC5zY3JpcHRJZF07Ci0gICAgfSwKLQotICAgIC8qKgogICAgICAqIEBwYXJhbSB7 c3RyaW5nfSB1cmwKICAgICAgKiBAcGFyYW0ge0RlYnVnZ2VyQWdlbnQuTG9jYXRpb259IHJhd0xv Y2F0aW9uCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlNjcmlwdH0KQEAgLTcyNCwxNSAr NzI1LDEzIEBAIFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZSA9IGZ1bmN0 aW9uKHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgb3JpCiAgKiBAY29uc3RydWN0b3IKICAqIEBw YXJhbSB7RGVidWdnZXJBZ2VudC5DYWxsRnJhbWV9IGNhbGxGcmFtZQogICogQHBhcmFtIHtudW1i ZXJ9IGluZGV4Ci0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsfSBtb2RlbAotICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291 cmNlQ29kZQorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcGluZ30gc2NyaXB0TWFw cGluZwogICovCi1XZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lID0gZnVuY3Rpb24o Y2FsbEZyYW1lLCBpbmRleCwgbW9kZWwsIHJhd1NvdXJjZUNvZGUpCitXZWJJbnNwZWN0b3IuUHJl c2VudGF0aW9uQ2FsbEZyYW1lID0gZnVuY3Rpb24oY2FsbEZyYW1lLCBpbmRleCwgc2NyaXB0TWFw cGluZykKIHsKICAgICB0aGlzLl9jYWxsRnJhbWUgPSBjYWxsRnJhbWU7CiAgICAgdGhpcy5faW5k ZXggPSBpbmRleDsKLSAgICB0aGlzLl9tb2RlbCA9IG1vZGVsOwotICAgIHRoaXMuX3Jhd1NvdXJj ZUNvZGUgPSByYXdTb3VyY2VDb2RlOworICAgIHRoaXMuX3NjcmlwdE1hcHBpbmcgPSBzY3JpcHRN YXBwaW5nOwogfQogCiBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlw ZSA9IHsKQEAgLTc2OSwxNCArNzY4LDYgQEAgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxG cmFtZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge1dl Ykluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfQotICAgICAqLwotICAgIGdldCByYXdTb3VyY2VDb2Rl KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9yYXdTb3VyY2VDb2RlOwotICAgIH0sCi0K LSAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gY29kZQogICAgICAqIEBwYXJhbSB7c3Ry aW5nfSBvYmplY3RHcm91cAogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gaW5jbHVkZUNvbW1hbmRM aW5lQVBJCkBAIC04MTMsNyArODA0LDcgQEAgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxG cmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjYWxsYmFjayh1aUxvY2F0aW9uKTsKICAg ICAgICAgICAgIGxpdmVMb2NhdGlvbi5kaXNwb3NlKCk7CiAgICAgICAgIH0KLSAgICAgICAgdmFy IGxpdmVMb2NhdGlvbiA9IHRoaXMuX3Jhd1NvdXJjZUNvZGUuY3JlYXRlTGl2ZUxvY2F0aW9uKHRo aXMuX2NhbGxGcmFtZS5sb2NhdGlvbiwgbG9jYXRpb25VcGRhdGVkLmJpbmQodGhpcykpOworICAg ICAgICB2YXIgbGl2ZUxvY2F0aW9uID0gdGhpcy5fc2NyaXB0TWFwcGluZy5jcmVhdGVMaXZlTG9j YXRpb24odGhpcy5fY2FsbEZyYW1lLmxvY2F0aW9uLCBsb2NhdGlvblVwZGF0ZWQuYmluZCh0aGlz KSk7CiAgICAgICAgIGxpdmVMb2NhdGlvbi5pbml0KCk7CiAgICAgfQogfQpAQCAtODIyLDExICs4 MTMsMTIgQEAgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUgPSB7 CiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUGxhY2FyZH0KICAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZX0gY2FsbEZyYW1lCisg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nfSBzY3JpcHRNYXBwaW5nCiAgKi8K LVdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkNhbGxGcmFtZVBsYWNhcmQg PSBmdW5jdGlvbihjYWxsRnJhbWUpCitXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5DYWxsRnJhbWVQbGFjYXJkID0gZnVuY3Rpb24oY2FsbEZyYW1lLCBzY3JpcHRNYXBwaW5n KQogewogICAgIFdlYkluc3BlY3Rvci5QbGFjYXJkLmNhbGwodGhpcywgY2FsbEZyYW1lLl9jYWxs RnJhbWUuZnVuY3Rpb25OYW1lIHx8IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKGFub255bW91cyBm dW5jdGlvbikiKSwgIiIpOwotICAgIHRoaXMuX2xpdmVMb2NhdGlvbiA9IGNhbGxGcmFtZS5fcmF3 U291cmNlQ29kZS5jcmVhdGVMaXZlTG9jYXRpb24oY2FsbEZyYW1lLl9jYWxsRnJhbWUubG9jYXRp b24sIHRoaXMuX3VwZGF0ZS5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLl9saXZlTG9jYXRpb24gPSBz Y3JpcHRNYXBwaW5nLmNyZWF0ZUxpdmVMb2NhdGlvbihjYWxsRnJhbWUuX2NhbGxGcmFtZS5sb2Nh dGlvbiwgdGhpcy5fdXBkYXRlLmJpbmQodGhpcykpOwogICAgIHRoaXMuX2xpdmVMb2NhdGlvbi5p bml0KCk7CiB9CiAKQEAgLTg2MSwxMCArODUzLDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgICAqLwogICAg IGNhblNldENvbnRlbnQ6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKLSAgICAgICAgdmFyIHJh d1NvdXJjZUNvZGUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5fcmF3U291cmNlQ29kZUZvclNj cmlwdFdpdGhVUkwocmVzb3VyY2UudXJsKQotICAgICAgICBpZiAoIXJhd1NvdXJjZUNvZGUpCi0g ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHJldHVybiB0aGlzLl9wcmVzZW50YXRp b25Nb2RlbC5jYW5FZGl0U2NyaXB0U291cmNlKHJhd1NvdXJjZUNvZGUudWlTb3VyY2VDb2RlTGlz dCgpWzBdKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZv clJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgcmV0dXJuIHVpU291cmNlQ29kZSAmJiB0aGlz Ll9wcmVzZW50YXRpb25Nb2RlbC5jYW5FZGl0U2NyaXB0U291cmNlKHVpU291cmNlQ29kZSk7CiAg ICAgfSwKIAogICAgIC8qKgpAQCAtODc4LDEzICs4NjgsMjggQEAgV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgICAg ICBpZiAoIW1ham9yQ2hhbmdlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBy YXdTb3VyY2VDb2RlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuX3Jhd1NvdXJjZUNvZGVGb3JT Y3JpcHRXaXRoVVJMKHJlc291cmNlLnVybCk7Ci0gICAgICAgIGlmICghcmF3U291cmNlQ29kZSkg eworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9yUmVzb3Vy Y2UocmVzb3VyY2UpOworICAgICAgICBpZiAoIXVpU291cmNlQ29kZSkgewogICAgICAgICAgICAg dXNlckNhbGxiYWNrKCJSZXNvdXJjZSBpcyBub3QgZWRpdGFibGUiKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHJlc291cmNlLnJlcXVlc3RDb250ZW50KHRoaXMu X3NldENvbnRlbnRXaXRoSW5pdGlhbENvbnRlbnQuYmluZCh0aGlzLCByYXdTb3VyY2VDb2RlLnVp U291cmNlQ29kZUxpc3QoKVswXSwgY29udGVudCwgdXNlckNhbGxiYWNrKSk7CisgICAgICAgIHJl c291cmNlLnJlcXVlc3RDb250ZW50KHRoaXMuX3NldENvbnRlbnRXaXRoSW5pdGlhbENvbnRlbnQu YmluZCh0aGlzLCB1aVNvdXJjZUNvZGUsIGNvbnRlbnQsIHVzZXJDYWxsYmFjaykpOworICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZXNvdXJjZX0gcmVzb3Vy Y2UKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfQorICAgICAqLwor ICAgIF91aVNvdXJjZUNvZGVGb3JSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgewor ICAgICAgICB2YXIgc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0c0Zv clVSTChyZXNvdXJjZS51cmwpWzBdOworICAgICAgICBpZiAoIXNjcmlwdCkKKyAgICAgICAgICAg IHJldHVybiBudWxsOworICAgICAgICB2YXIgcmF3TG9jYXRpb24gPSBuZXcgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTW9kZWwuTG9jYXRpb24oMCwgMCk7CisgICAgICAgIHJhd0xvY2F0aW9uLnNjcmlw dElkID0gc2NyaXB0LnNjcmlwdElkOworICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IHRoaXMuX3By ZXNlbnRhdGlvbk1vZGVsLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKHJhd0xvY2F0aW9uKTsKKyAg ICAgICAgcmV0dXJuIHVpTG9jYXRpb24gPyB1aUxvY2F0aW9uLnVpU291cmNlQ29kZSA6IG51bGw7 CiAgICAgfSwKIAogICAgIC8qKgpAQCAtOTkyLDkgKzk5Nyw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLkxpbmtpZmllci5wcm90b3R5cGUgPSB7CiAgICAgbGlua2lm eVJhd0xvY2F0aW9uOiBmdW5jdGlvbihyYXdMb2NhdGlvbiwgY2xhc3NlcykKICAgICB7CiAgICAg ICAgIHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSgiIiwgIiIsIGNs YXNzZXMsIGZhbHNlKTsKLSAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLnNjcmlwdEZvclNvdXJjZUlEKHJhd0xvY2F0aW9uLnNjcmlwdElkKTsKLSAgICAgICAg dmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9tb2RlbC5fcmF3U291cmNlQ29kZUZvclNjcmlwdChz Y3JpcHQpOwotICAgICAgICB2YXIgbGl2ZUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5jcmVhdGVM aXZlTG9jYXRpb24ocmF3TG9jYXRpb24sIHRoaXMuX3VwZGF0ZUFuY2hvci5iaW5kKHRoaXMsIGFu Y2hvcikpOworICAgICAgICB2YXIgbGl2ZUxvY2F0aW9uID0gdGhpcy5fbW9kZWwuY3JlYXRlTGl2 ZUxvY2F0aW9uKHJhd0xvY2F0aW9uLCB0aGlzLl91cGRhdGVBbmNob3IuYmluZCh0aGlzLCBhbmNo b3IpKTsKICAgICAgICAgbGl2ZUxvY2F0aW9uLmluaXQoKTsKICAgICAgICAgdGhpcy5fbGl2ZUxv Y2F0aW9ucy5wdXNoKGxpdmVMb2NhdGlvbik7CiAgICAgICAgIHJldHVybiBhbmNob3I7Cg==