86632 2012-05-16 07:41:26 -0700 Web Inspector: Support script snippets saving. 2012-05-16 09:11:01 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75094 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 625426 0 vsevik 2012-05-16 07:41:26 -0700 Patch to follow 625445 1 142264 vsevik 2012-05-16 08:12:23 -0700 Created attachment 142264 Patch 625474 2 142264 pfeldman 2012-05-16 08:39:01 -0700 Comment on attachment 142264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142264&action=review > Source/WebCore/inspector/front-end/ScriptSnippetModel.js:299 > + * @param {WebInspector.ContentProvider} contentProvider Wrong indent. > Source/WebCore/inspector/front-end/ScriptSnippetModel.js:323 > + callback(); Why conditional? 625525 3 vsevik 2012-05-16 09:11:01 -0700 Committed r117299: <http://trac.webkit.org/changeset/117299> 142264 2012-05-16 08:12:23 -0700 2012-05-16 08:39:01 -0700 Patch bug-86632-20120516191222.patch text/plain 18206 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3Mjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRhYjRjMGEyOWY2MzUy OWNlNWQ2MGU0ZTA1ODJjYTBhYzgyOWY1YS4uMjYxNjgyOTk0NDczY2RjMmJmZDcwOTRmNWE0MDgx MjM1ZWZhNjMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEyLTA1LTE2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFN1cHBvcnQgc2NyaXB0IHNuaXBwZXRzIHNhdmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NjMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgU25pcHBldEphdmFTY3JpcHRTb3VyY2Ug ZXh0ZW5kaW5nIEphdmFTY3JpcHRTb3VyY2UgYW5kIG92ZXJyaWRpbmcgaXNFZGl0YWJsZSgpIGFu ZCBjb21taXRXb3JraW5nQ29weSgpIG1ldGhvZHMuCisgICAgICAgIFNjcmlwdFNuaXBwZXRNb2Rl bCBub3cgY3JlYXRlcyBpbnN0YW5jZXMgb2YgdGhpcyBuZXcgY2xhc3MgZm9yIHNuaXBwZXRzLgor ICAgICAgICBBbHNvIG1hcHMgaW4gU2NyaXB0U25pcHBldE1vZGVsIHNpbXBsaWZpZWQuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFNuaXBwZXRNb2RlbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUuX2FkZFNjcmlwdFNuaXBwZXQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUuZGVsZXRlU2Ny aXB0U25pcHBldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnBy b3RvdHlwZS5yZW5hbWVTY3JpcHRTbmlwcGV0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRTbmlwcGV0TW9kZWwucHJvdG90eXBlLnNldFNjcmlwdFNuaXBwZXRDb250ZW50KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlLl91aVNvdXJjZUNv ZGVMaXN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90 eXBlLl9yZWxlYXNlZFVJU291cmNlQ29kZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBw ZXRKYXZhU2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNj cmlwdFNvdXJjZS5wcm90b3R5cGUuaXNFZGl0YWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U25pcHBldEphdmFTY3JpcHRTb3VyY2UucHJvdG90eXBlLmNvbW1pdFdvcmtpbmdDb3B5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZS5wcm90b3R5cGUuZ2V0 IHNuaXBwZXRJZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zZXQgX2Zp bGVSZW5hbWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl Ll9zbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQuY2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3NuaXBwZXRDcmVhdGlvblJlcXVlc3RlZCk6CisK KzIwMTItMDUtMTYgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogSW1wbGVtZW50IHNuaXBwZXQgY3JlYXRpb24vcmVuYW1pbmcg aW4gU2NyaXB0c05hdmlnYXRvci4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgyNjIyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKaW5kZXggYjMyOTA3ZWQ0YmQxNTVm YzU3YTMzYjAwN2Y3MGNjZjJmZmEwNjk5MC4uNzVkZTZkOGJjMjU0YTllNTlhZGVlNzk4ZjFhZjYx ZDMwM2I3MWM2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAgLTM2LDggKzM2LDcgQEAgV2ViSW5zcGVj dG9yLlNjcmlwdFNuaXBwZXRNb2RlbCA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLl91aVNvdXJj ZUNvZGVGb3JTY3JpcHRJZCA9IHt9OwogICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZSA9 IG5ldyBNYXAoKTsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JTbmlwcGV0ID0gbmV3IE1hcCgp OwotICAgIHRoaXMuX3NuaXBwZXRGb3JVSVNvdXJjZUNvZGUgPSBuZXcgTWFwKCk7CisgICAgdGhp cy5fc25pcHBldEphdmFTY3JpcHRTb3VyY2VGb3JTbmlwcGV0SWQgPSB7fTsKICAgICAKICAgICB0 aGlzLl9zbmlwcGV0U3RvcmFnZSA9IG5ldyBXZWJJbnNwZWN0b3IuU25pcHBldFN0b3JhZ2UoInNj cmlwdCIsICJTY3JpcHQgc25pcHBldCAjIik7CiAgICAgdGhpcy5fbGFzdFNuaXBwZXRFdmFsdWF0 aW9uSW5kZXhTZXR0aW5nID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNyZWF0ZVNldHRpbmcoImxh c3RTbmlwcGV0RXZhbHVhdGlvbkluZGV4IiwgMCk7CkBAIC02MSw3ICs2MCw3IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioK LSAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfQorICAgICAqIEByZXR1 cm4ge1dlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZX0KICAgICAgKi8KICAgICBj cmVhdGVTY3JpcHRTbmlwcGV0OiBmdW5jdGlvbigpCiAgICAgewpAQCAtNzEsNjMgKzcwLDYyIEBA IFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlID0gewogCiAgICAgLyoq CiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU25pcHBldH0gc25pcHBldAotICAgICAqIEBy ZXR1cm4ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9CisgICAgICogQHJldHVybiB7V2ViSW5z cGVjdG9yLlNuaXBwZXRKYXZhU2NyaXB0U291cmNlfQogICAgICAqLwogICAgIF9hZGRTY3JpcHRT bmlwcGV0OiBmdW5jdGlvbihzbmlwcGV0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29k ZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZShzbmlwcGV0Lm5hbWUsIG5ldyBX ZWJJbnNwZWN0b3IuU25pcHBldENvbnRlbnRQcm92aWRlcihzbmlwcGV0KSwgdGhpcy5fc25pcHBl dFNjcmlwdE1hcHBpbmcsIHRydWUpOwotICAgICAgICB1aVNvdXJjZUNvZGUuaXNTbmlwcGV0ID0g dHJ1ZTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldC5wdXQoc25pcHBldCwg dWlTb3VyY2VDb2RlKTsKLSAgICAgICAgdGhpcy5fc25pcHBldEZvclVJU291cmNlQ29kZS5wdXQo dWlTb3VyY2VDb2RlLCBzbmlwcGV0KTsKLSAgICAgICAgdGhpcy5fc25pcHBldFNjcmlwdE1hcHBp bmcuX2ZpcmVVSVNvdXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGUpOwotICAgICAgICByZXR1cm4g dWlTb3VyY2VDb2RlOworICAgICAgICB2YXIgc25pcHBldEphdmFTY3JpcHRTb3VyY2UgPSBuZXcg V2ViSW5zcGVjdG9yLlNuaXBwZXRKYXZhU2NyaXB0U291cmNlKHNuaXBwZXQuaWQsIHNuaXBwZXQu bmFtZSwgbmV3IFdlYkluc3BlY3Rvci5TbmlwcGV0Q29udGVudFByb3ZpZGVyKHNuaXBwZXQpLCB0 aGlzKTsKKyAgICAgICAgdGhpcy5fc25pcHBldEphdmFTY3JpcHRTb3VyY2VGb3JTbmlwcGV0SWRb c25pcHBldC5pZF0gPSBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZTsKKyAgICAgICAgdGhpcy5fc25p cHBldFNjcmlwdE1hcHBpbmcuX2ZpcmVVSVNvdXJjZUNvZGVBZGRlZChzbmlwcGV0SmF2YVNjcmlw dFNvdXJjZSk7CisgICAgICAgIHJldHVybiBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZTsKICAgICB9 LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1 aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlw dFNvdXJjZX0gc25pcHBldEphdmFTY3JpcHRTb3VyY2UKICAgICAgKi8KLSAgICBkZWxldGVTY3Jp cHRTbmlwcGV0OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgZGVsZXRlU2NyaXB0U25pcHBl dDogZnVuY3Rpb24oc25pcHBldEphdmFTY3JpcHRTb3VyY2UpCiAgICAgewotICAgICAgICB2YXIg c25pcHBldCA9IHRoaXMuX3NuaXBwZXRGb3JVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7 CisgICAgICAgIHZhciBzbmlwcGV0ID0gdGhpcy5fc25pcHBldFN0b3JhZ2Uuc25pcHBldEZvcklk KHNuaXBwZXRKYXZhU2NyaXB0U291cmNlLnNuaXBwZXRJZCk7CiAgICAgICAgIHRoaXMuX3NuaXBw ZXRTdG9yYWdlLmRlbGV0ZVNuaXBwZXQoc25pcHBldCk7Ci0gICAgICAgIHRoaXMuX3JlbGVhc2VT bmlwcGV0U2NyaXB0KHVpU291cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZv clNuaXBwZXQucmVtb3ZlKHNuaXBwZXQpOwotICAgICAgICB0aGlzLl9zbmlwcGV0Rm9yVUlTb3Vy Y2VDb2RlLnJlbW92ZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICB0aGlzLl9zbmlwcGV0U2NyaXB0 TWFwcGluZy5fZmlyZVVJU291cmNlQ29kZVJlbW92ZWQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAg dGhpcy5fcmVsZWFzZVNuaXBwZXRTY3JpcHQoc25pcHBldEphdmFTY3JpcHRTb3VyY2UpOworICAg ICAgICBkZWxldGUgdGhpcy5fc25pcHBldEphdmFTY3JpcHRTb3VyY2VGb3JTbmlwcGV0SWRbc25p cHBldC5pZF07CisgICAgICAgIHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLl9maXJlVUlTb3Vy Y2VDb2RlUmVtb3ZlZChzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSk7CiAgICAgfSwKIAogICAgIC8q KgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2Rl CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU25pcHBldEphdmFTY3JpcHRTb3VyY2V9IHNu aXBwZXRKYXZhU2NyaXB0U291cmNlCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld05hbWUKICAg ICAgKi8KLSAgICByZW5hbWVTY3JpcHRTbmlwcGV0OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIG5l d05hbWUpCisgICAgcmVuYW1lU2NyaXB0U25pcHBldDogZnVuY3Rpb24oc25pcHBldEphdmFTY3Jp cHRTb3VyY2UsIG5ld05hbWUpCiAgICAgewotICAgICAgICB2YXIgc25pcHBldCA9IHRoaXMuX3Nu aXBwZXRGb3JVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSkKKyAgICAgICAgdmFyIHNuaXBw ZXQgPSB0aGlzLl9zbmlwcGV0U3RvcmFnZS5zbmlwcGV0Rm9ySWQoc25pcHBldEphdmFTY3JpcHRT b3VyY2Uuc25pcHBldElkKTsKICAgICAgICAgaWYgKCFzbmlwcGV0IHx8ICFuZXdOYW1lIHx8IHNu aXBwZXQubmFtZSA9PT0gbmV3TmFtZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgc25p cHBldC5uYW1lID0gbmV3TmFtZTsKLSAgICAgICAgdWlTb3VyY2VDb2RlLnVybENoYW5nZWQoc25p cHBldC5uYW1lKTsKKyAgICAgICAgc25pcHBldEphdmFTY3JpcHRTb3VyY2UudXJsQ2hhbmdlZChz bmlwcGV0Lm5hbWUpOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlNuaXBwZXRKYXZhU2NyaXB0U291cmNlfSBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZQogICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CiAgICAgICovCi0gICAgc2V0U2NyaXB0U25p cHBldENvbnRlbnQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgbmV3Q29udGVudCkKKyAgICBzZXRT Y3JpcHRTbmlwcGV0Q29udGVudDogZnVuY3Rpb24oc25pcHBldEphdmFTY3JpcHRTb3VyY2UsIG5l d0NvbnRlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9zbmlwcGV0Rm9yVUlTb3VyY2VDb2RlLmdl dCh1aVNvdXJjZUNvZGUpLmNvbnRlbnQgPSBuZXdDb250ZW50OworICAgICAgICB2YXIgc25pcHBl dCA9IHRoaXMuX3NuaXBwZXRTdG9yYWdlLnNuaXBwZXRGb3JJZChzbmlwcGV0SmF2YVNjcmlwdFNv dXJjZS5zbmlwcGV0SWQpOworICAgICAgICBzbmlwcGV0LmNvbnRlbnQgPSBuZXdDb250ZW50Owor ICAgICAgICBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZS5jb250ZW50Q2hhbmdlZChuZXdDb250ZW50 KTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TbmlwcGV0 SmF2YVNjcmlwdFNvdXJjZX0gc25pcHBldEphdmFTY3JpcHRTb3VyY2UKICAgICAgKi8KLSAgICBl dmFsdWF0ZVNjcmlwdFNuaXBwZXQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICBldmFsdWF0 ZVNjcmlwdFNuaXBwZXQ6IGZ1bmN0aW9uKHNuaXBwZXRKYXZhU2NyaXB0U291cmNlKQogICAgIHsK LSAgICAgICAgdGhpcy5fcmVsZWFzZVNuaXBwZXRTY3JpcHQodWlTb3VyY2VDb2RlKTsKKyAgICAg ICAgdGhpcy5fcmVsZWFzZVNuaXBwZXRTY3JpcHQoc25pcHBldEphdmFTY3JpcHRTb3VyY2UpOwog ICAgICAgICB2YXIgZXZhbHVhdGlvbkluZGV4ID0gdGhpcy5fbGFzdFNuaXBwZXRFdmFsdWF0aW9u SW5kZXhTZXR0aW5nLmdldCgpICsgMTsKICAgICAgICAgdGhpcy5fbGFzdFNuaXBwZXRFdmFsdWF0 aW9uSW5kZXhTZXR0aW5nLnNldChldmFsdWF0aW9uSW5kZXgpOwogCi0gICAgICAgIHZhciBzbmlw cGV0ID0gdGhpcy5fc25pcHBldEZvclVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAg ICAgICAgdmFyIHNuaXBwZXQgPSB0aGlzLl9zbmlwcGV0U3RvcmFnZS5zbmlwcGV0Rm9ySWQoc25p cHBldEphdmFTY3JpcHRTb3VyY2Uuc25pcHBldElkKTsKICAgICAgICAgdmFyIHNvdXJjZVVSTCA9 IHRoaXMuX3NvdXJjZVVSTEZvclNuaXBwZXQoc25pcHBldCwgZXZhbHVhdGlvbkluZGV4KTsKICAg ICAgICAgc25pcHBldC5fbGFzdEV2YWx1YXRpb25Tb3VyY2VVUkwgPSBzb3VyY2VVUkw7CiAgICAg ICAgIHZhciBleHByZXNzaW9uID0gIlxuLy9AIHNvdXJjZVVSTD0iICsgc291cmNlVVJMICsgIlxu IiArIHNuaXBwZXQuY29udGVudDsKQEAgLTE3NCw4ICsxNzIsOSBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfdWlTb3VyY2VDb2Rl TGlzdDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHJlc3VsdCA9IHRoaXMuX3VpU291 cmNlQ29kZUZvclNuaXBwZXQudmFsdWVzKCk7Ci0gICAgICAgIHJlc3VsdCA9IHJlc3VsdC5jb25j YXQodGhpcy5fcmVsZWFzZWRVSVNvdXJjZUNvZGVzKCkpOworICAgICAgICB2YXIgcmVzdWx0ID0g dGhpcy5fcmVsZWFzZWRVSVNvdXJjZUNvZGVzKCk7CisgICAgICAgIGZvciAodmFyIHNuaXBwZXRJ ZCBpbiB0aGlzLl9zbmlwcGV0SmF2YVNjcmlwdFNvdXJjZUZvclNuaXBwZXRJZCkKKyAgICAgICAg ICAgIHJlc3VsdC5wdXNoKHRoaXMuX3NuaXBwZXRKYXZhU2NyaXB0U291cmNlRm9yU25pcHBldElk W3NuaXBwZXRJZF0pOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0sCiAKQEAgLTE4Nyw5 ICsxODYsOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwogICAgICAgICBmb3IgKHZhciBzY3JpcHRJZCBpbiB0 aGlzLl91aVNvdXJjZUNvZGVGb3JTY3JpcHRJZCkgewogICAgICAgICAgICAgdmFyIHVpU291cmNl Q29kZSA9IHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdElkXTsKLSAgICAgICAg ICAgIGlmICh1aVNvdXJjZUNvZGUuaXNTbmlwcGV0KQotICAgICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICAgICAgcmVzdWx0LnB1c2godWlTb3VyY2VDb2RlKTsKKyAgICAgICAgICAgIGlm ICghdWlTb3VyY2VDb2RlLmlzU25pcHBldCkKKyAgICAgICAgICAgICAgICByZXN1bHQucHVzaCh1 aVNvdXJjZUNvZGUpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSwK QEAgLTE5OSwxNiArMTk3LDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJv dG90eXBlID0gewogICAgICAqLwogICAgIF9hZGRTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkKICAg ICB7Ci0gICAgICAgIHZhciBzbmlwcGV0ID0gdGhpcy5fc25pcHBldEZvclNvdXJjZVVSTChzY3Jp cHQuc291cmNlVVJMKTsKLSAgICAgICAgaWYgKCFzbmlwcGV0KSB7CisgICAgICAgIHZhciBzbmlw cGV0SWQgPSB0aGlzLl9zbmlwcGV0SWRGb3JTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZVVSTCk7Cisg ICAgICAgIHZhciBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSA9IHRoaXMuX3NuaXBwZXRKYXZhU2Ny aXB0U291cmNlRm9yU25pcHBldElkW3NuaXBwZXRJZF07CisgICAgICAgIGlmICghc25pcHBldEph dmFTY3JpcHRTb3VyY2UpIHsKICAgICAgICAgICAgIHRoaXMuX2NyZWF0ZVVJU291cmNlQ29kZUZv clNjcmlwdChzY3JpcHQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAg IHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl91aVNvdXJjZUNvZGVGb3JTbmlwcGV0LmdldChzbmlw cGV0KTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29k ZS5nZXQodWlTb3VyY2VDb2RlKSk7Ci0KLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU2Ny aXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9IHVpU291cmNlQ29kZTsKLSAgICAgICAgdGhpcy5fc2Ny aXB0Rm9yVUlTb3VyY2VDb2RlLnB1dCh1aVNvdXJjZUNvZGUsIHNjcmlwdCk7CisgICAgICAgIAor ICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fc2NyaXB0Rm9yVUlTb3VyY2VDb2RlLmdldChz bmlwcGV0SmF2YVNjcmlwdFNvdXJjZSkpOworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JT Y3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gc25pcHBldEphdmFTY3JpcHRTb3VyY2U7CisgICAg ICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQoc25pcHBldEphdmFTY3JpcHRTb3Vy Y2UsIHNjcmlwdCk7CiAgICAgICAgIHNjcmlwdC5zZXRTb3VyY2VNYXBwaW5nKHRoaXMuX3NuaXBw ZXRTY3JpcHRNYXBwaW5nKTsKICAgICB9LAogCkBAIC0yMjYsMTYgKzIyNCwxNiBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoq Ci0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZX0gc25p cHBldEphdmFTY3JpcHRTb3VyY2UKICAgICAgKi8KLSAgICBfcmVsZWFzZVNuaXBwZXRTY3JpcHQ6 IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICBfcmVsZWFzZVNuaXBwZXRTY3JpcHQ6IGZ1bmN0 aW9uKHNuaXBwZXRKYXZhU2NyaXB0U291cmNlKQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9 IHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAg dmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5nZXQoc25pcHBldEphdmFT Y3JpcHRTb3VyY2UpOwogICAgICAgICBpZiAoIXNjcmlwdCkKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICBkZWxldGUgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU2NyaXB0SWRbc2NyaXB0LnNj cmlwdElkXTsKLSAgICAgICAgdGhpcy5fc2NyaXB0Rm9yVUlTb3VyY2VDb2RlLnJlbW92ZSh1aVNv dXJjZUNvZGUpOworICAgICAgICB0aGlzLl9zY3JpcHRGb3JVSVNvdXJjZUNvZGUucmVtb3ZlKHNu aXBwZXRKYXZhU2NyaXB0U291cmNlKTsKIAogICAgICAgICB0aGlzLl9jcmVhdGVVSVNvdXJjZUNv ZGVGb3JTY3JpcHQoc2NyaXB0KTsKICAgICB9LApAQCAtMjk1LDYgKzI5Myw1MCBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuT2JqZWN0LnByb3RvdAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlfQorICogQHBhcmFtIHtzdHJpbmd9IHNuaXBwZXRJ ZAorICogQHBhcmFtIHtzdHJpbmd9IHNuaXBwZXROYW1lCisgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5Db250ZW50UHJvdmlkZXJ9IGNvbnRlbnRQcm92aWRlcgorICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsfSBzY3JpcHRTbmlwcGV0TW9kZWwKKyAqLworV2ViSW5z cGVjdG9yLlNuaXBwZXRKYXZhU2NyaXB0U291cmNlID0gZnVuY3Rpb24oc25pcHBldElkLCBzbmlw cGV0TmFtZSwgY29udGVudFByb3ZpZGVyLCBzY3JpcHRTbmlwcGV0TW9kZWwpCit7CisgICAgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UuY2FsbCh0aGlzLCBzbmlwcGV0TmFtZSwgY29udGVu dFByb3ZpZGVyLCBzY3JpcHRTbmlwcGV0TW9kZWwuc2NyaXB0TWFwcGluZywgdHJ1ZSk7CisgICAg dGhpcy5fc25pcHBldElkID0gc25pcHBldElkOworICAgIHRoaXMuX3NjcmlwdFNuaXBwZXRNb2Rl bCA9IHNjcmlwdFNuaXBwZXRNb2RlbDsKKyAgICB0aGlzLmlzU25pcHBldCA9IHRydWU7Cit9CisK K1dlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZS5wcm90b3R5cGUgPSB7CisgICAg LyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KKyAgICAgKi8KKyAgICBpc0VkaXRhYmxlOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9LAorCisgICAgY29t bWl0V29ya2luZ0NvcHk6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsgIAorICAgICAgICBpZiAo dGhpcy5pc0RpcnR5KCkpIHsKKyAgICAgICAgICAgIHRoaXMuX3NjcmlwdFNuaXBwZXRNb2RlbC5z ZXRTY3JpcHRTbmlwcGV0Q29udGVudCh0aGlzLCB0aGlzLndvcmtpbmdDb3B5KCkpOworICAgICAg ICAgICAgY2FsbGJhY2soKTsKKyAgICAgICAgfQorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBA cmV0dXJuIHtzdHJpbmd9CisgICAgICovCisgICAgZ2V0IHNuaXBwZXRJZCgpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5fc25pcHBldElkOworICAgIH0KK30KKworV2ViSW5zcGVjdG9yLlNu aXBwZXRKYXZhU2NyaXB0U291cmNlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdFNvdXJjZS5wcm90b3R5cGU7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCiAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWx9IHNjcmlwdFNuaXBwZXRNb2Rl bAogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5nfQogICovCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4 IDRmYjE3OGNhZGZmODAyZmQyZTMyYzM4ZDg2NWIyMzhmOTIyM2Q4ZjQuLjhhNmMxNWQxZDFkMTMz YzI0YjQ4ZTVhODMyZTNiY2I5MWYzYTE1YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC05NzAsMjggKzk3MCwyOSBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9maWxlUmVuYW1l ZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAvKiog QHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGEudWlTb3VyY2VD b2RlOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhLnVpU291cmNlQ29kZTsKICAgICAgICAgdmFyIG5h bWUgPSAvKiogQHR5cGUge3N0cmluZ30gKi8gZXZlbnQuZGF0YS5uYW1lOwogICAgICAgICBpZiAo IXVpU291cmNlQ29kZS5pc1NuaXBwZXQpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIFdl Ykluc3BlY3Rvci5zY3JpcHRTbmlwcGV0TW9kZWwucmVuYW1lU2NyaXB0U25pcHBldCh1aVNvdXJj ZUNvZGUsIG5hbWUpOworICAgICAgICB2YXIgc25pcHBldEphdmFTY3JpcHRTb3VyY2UgPSAvKiog QHR5cGUge1dlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZX0gKi8gdWlTb3VyY2VD b2RlOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLnJlbmFtZVNjcmlw dFNuaXBwZXQoc25pcHBldEphdmFTY3JpcHRTb3VyY2UsIG5hbWUpOwogICAgIH0sCiAgICAgICAg IAogICAgIF9zbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAg ICAgIHZhciB1aVNvdXJjZUNvZGUgPSBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLmNy ZWF0ZVNjcmlwdFNuaXBwZXQoKTsKLSAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUxpbmUodWlTb3Vy Y2VDb2RlKTsKKyAgICAgICAgdmFyIHNuaXBwZXRKYXZhU2NyaXB0U291cmNlID0gV2ViSW5zcGVj dG9yLnNjcmlwdFNuaXBwZXRNb2RlbC5jcmVhdGVTY3JpcHRTbmlwcGV0KCk7CisgICAgICAgIHRo aXMuX3Nob3dTb3VyY2VMaW5lKHNuaXBwZXRKYXZhU2NyaXB0U291cmNlKTsKICAgICAgICAgCiAg ICAgICAgIHZhciBzaG91bGRIaWRlTmF2aWdhdG9yID0gIXRoaXMuX25hdmlnYXRvckNvbnRyb2xs ZXIuaXNOYXZpZ2F0b3JQaW5uZWQoKTsKICAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRvckNvbnRy b2xsZXIuaXNOYXZpZ2F0b3JIaWRkZW4oKSkKICAgICAgICAgICAgIHRoaXMuX25hdmlnYXRvckNv bnRyb2xsZXIuc2hvd05hdmlnYXRvck92ZXJsYXkoKTsKLSAgICAgICAgdGhpcy5fbmF2aWdhdG9y LnJlbmFtZSh1aVNvdXJjZUNvZGUsIGNhbGxiYWNrLmJpbmQodGhpcykpOworICAgICAgICB0aGlz Ll9uYXZpZ2F0b3IucmVuYW1lKHNuaXBwZXRKYXZhU2NyaXB0U291cmNlLCBjYWxsYmFjay5iaW5k KHRoaXMpKTsKICAgICAKICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soKQogICAgICAgICB7CiAg ICAgICAgICAgICBpZiAoc2hvdWxkSGlkZU5hdmlnYXRvcikKICAgICAgICAgICAgICAgICB0aGlz Ll9uYXZpZ2F0b3JDb250cm9sbGVyLmhpZGVOYXZpZ2F0b3JPdmVybGF5KCk7Ci0gICAgICAgICAg ICB0aGlzLl9zaG93U291cmNlTGluZSh1aVNvdXJjZUNvZGUpOworICAgICAgICAgICAgdGhpcy5f c2hvd1NvdXJjZUxpbmUoc25pcHBldEphdmFTY3JpcHRTb3VyY2UpOwogICAgICAgICB9CiAgICAg fQogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGY5YzEwNzU0NjdiYTUxMGQxMmVkODcxY2I4MGE0ZjAzNzBhMmU3OTYuLmNj ZTQ1NDYzZGNmYTcwM2VjY2Q5MTgwY2QyMjZiMzRkMzQ5YzViYjEgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAxMi0wNS0xNiAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBTdXBwb3J0IHNjcmlwdCBzbmlwcGV0cyBzYXZpbmcu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjYzMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL2RlYnVnZ2VyL3NjcmlwdC1zbmlwcGV0LW1vZGVsLmh0bWw6CisKIDIwMTItMDUtMTYgIEFy cGl0YSBCYWh1Z3VuYSAgPGFycGl0YWJhaHVndW5hQGdtYWlsLmNvbT4KIAogICAgICAgICAiYm9y ZGVyOiBjb2xsYXBzZSIgKyAiZGlzcGxheTogbm9uZSIgcm93cyBpbiB0aGUgdGJvZHkgd2hpbGUg aGF2aW5nIHRoZWFkIG9yIHRmb290IGRvZXNuJ3QgcmVuZGVyIHRoZSBvcHBvc2l0ZSBib3JkZXIK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtc25pcHBl dC1tb2RlbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1zbmlw cGV0LW1vZGVsLmh0bWwKaW5kZXggNTJjMWQyZWFlY2M2MmRlYTdjZjc0ZmM4MThkNTBlOTZjY2Nm YjhkZi4uNTJkYjEyNDMzZGJkNmU5ZmUyMGRmOTVjODUzYWI4ZTBhODlkY2MxZiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1zbmlwcGV0LW1vZGVsLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1zbmlwcGV0LW1v ZGVsLmh0bWwKQEAgLTIxLDI4ICsyMSwyOCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgewog ICAgICAgICAgICAgcmVzZXRTbmlwcGV0c1NldHRpbmdzKCk7CiAKLSAgICAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGUxID0gV2ViSW5zcGVjdG9yLnNjcmlwdFNuaXBwZXRNb2RlbC5jcmVhdGVTY3Jp cHRTbmlwcGV0KCk7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVs LnJlbmFtZVNjcmlwdFNuaXBwZXQodWlTb3VyY2VDb2RlMSwgIlNuaXBwZXQxIik7CisgICAgICAg ICAgICB2YXIgc25pcHBldEphdmFTY3JpcHRTb3VyY2UxID0gV2ViSW5zcGVjdG9yLnNjcmlwdFNu aXBwZXRNb2RlbC5jcmVhdGVTY3JpcHRTbmlwcGV0KCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0 b3Iuc2NyaXB0U25pcHBldE1vZGVsLnJlbmFtZVNjcmlwdFNuaXBwZXQoc25pcHBldEphdmFTY3Jp cHRTb3VyY2UxLCAiU25pcHBldDEiKTsKICAgICAgICAgICAgIHZhciBjb250ZW50ID0gIiI7CiAg ICAgICAgICAgICBjb250ZW50ICs9ICIvLyBUaGlzIHNuaXBwZXQgZG9lcyBub3RoaW5nLlxuIjsK ICAgICAgICAgICAgIGNvbnRlbnQgKz0gInZhciBpID0gMisyO1xuIjsKLSAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5zY3JpcHRTbmlwcGV0TW9kZWwuc2V0U2NyaXB0U25pcHBldENvbnRlbnQodWlT b3VyY2VDb2RlMSwgY29udGVudCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25p cHBldE1vZGVsLnNldFNjcmlwdFNuaXBwZXRDb250ZW50KHNuaXBwZXRKYXZhU2NyaXB0U291cmNl MSwgY29udGVudCk7CiAKLSAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUyID0gV2ViSW5zcGVj dG9yLnNjcmlwdFNuaXBwZXRNb2RlbC5jcmVhdGVTY3JpcHRTbmlwcGV0KCk7Ci0gICAgICAgICAg ICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLnJlbmFtZVNjcmlwdFNuaXBwZXQodWlT b3VyY2VDb2RlMSwgIlNuaXBwZXQyIik7CisgICAgICAgICAgICB2YXIgc25pcHBldEphdmFTY3Jp cHRTb3VyY2UyID0gV2ViSW5zcGVjdG9yLnNjcmlwdFNuaXBwZXRNb2RlbC5jcmVhdGVTY3JpcHRT bmlwcGV0KCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLnJl bmFtZVNjcmlwdFNuaXBwZXQoc25pcHBldEphdmFTY3JpcHRTb3VyY2UyLCAiU25pcHBldDIiKTsK ICAgICAgICAgICAgIGNvbnRlbnQgPSAiIjsKICAgICAgICAgICAgIGNvbnRlbnQgKz0gIi8vIFRo aXMgc25pcHBldCBjcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCBkb2VzIG5vdGhpbmcuXG4iOwogICAg ICAgICAgICAgY29udGVudCArPSAiZnVuY3Rpb24gZG9lc05vdGhpbmcoKVxuIjsKICAgICAgICAg ICAgIGNvbnRlbnQgKz0gIntcbiI7CiAgICAgICAgICAgICBjb250ZW50ICs9ICIgICAgdmFyICBp ID0gMisyO1xuIjsKICAgICAgICAgICAgIGNvbnRlbnQgKz0gIn1cbiI7Ci0gICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLnNldFNjcmlwdFNuaXBwZXRDb250ZW50KHVp U291cmNlQ29kZTIsIGNvbnRlbnQpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNjcmlwdFNu aXBwZXRNb2RlbC5zZXRTY3JpcHRTbmlwcGV0Q29udGVudChzbmlwcGV0SmF2YVNjcmlwdFNvdXJj ZTIsIGNvbnRlbnQpOwogCi0gICAgICAgICAgICBmdW5jdGlvbiBldmFsdWF0ZVNuaXBwZXRBbmRE dW1wRXZhbHVhdGlvbkRldGFpbHModWlTb3VyY2VDb2RlLCBjYWxsYmFjaykKKyAgICAgICAgICAg IGZ1bmN0aW9uIGV2YWx1YXRlU25pcHBldEFuZER1bXBFdmFsdWF0aW9uRGV0YWlscyhzbmlwcGV0 SmF2YVNjcmlwdFNvdXJjZSwgY2FsbGJhY2spCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5TbmlwcGV0U2NyaXB0TWFw cGluZy5wcm90b3R5cGUsICJhZGRTY3JpcHQiLCBkdW1wU2NyaXB0KTsKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLmV2YWx1YXRlU2NyaXB0U25pcHBldCh1 aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgICAgIHZhciBzbmlwcGV0ID0gV2ViSW5zcGVjdG9y LnNjcmlwdFNuaXBwZXRNb2RlbC5fc25pcHBldEZvclVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VD b2RlKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLmV2 YWx1YXRlU2NyaXB0U25pcHBldChzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSk7CisgICAgICAgICAg ICAgICAgdmFyIHNuaXBwZXQgPSBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1vZGVsLl9zbmlw cGV0U3RvcmFnZS5zbmlwcGV0Rm9ySWQoc25pcHBldEphdmFTY3JpcHRTb3VyY2Uuc25pcHBldElk KTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTGFzdCBldmFsdWF0 aW9uIHNvdXJjZSB1cmwgZm9yIHNuaXBwZXQ6ICIgKyBzbmlwcGV0Ll9sYXN0RXZhbHVhdGlvblNv dXJjZVVSTCk7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoc25p cHBldCwgV2ViSW5zcGVjdG9yLnNjcmlwdFNuaXBwZXRNb2RlbC5fc25pcHBldEZvclNvdXJjZVVS TChzbmlwcGV0Ll9sYXN0RXZhbHVhdGlvblNvdXJjZVVSTCksICJTbmlwcGV0IGNhbiBub3QgYmUg aWRlbnRpZmllZCBieSBpdHMgZXZhbHVhdGlvbiBzb3VyY2VVUkwuIik7CiAKQEAgLTUzLDE2ICs1 MywxNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 CiAKLSAgICAgICAgICAgIGV2YWx1YXRlU25pcHBldEFuZER1bXBFdmFsdWF0aW9uRGV0YWlscyh1 aVNvdXJjZUNvZGUxLCBzdGVwMik7CisgICAgICAgICAgICBldmFsdWF0ZVNuaXBwZXRBbmREdW1w RXZhbHVhdGlvbkRldGFpbHMoc25pcHBldEphdmFTY3JpcHRTb3VyY2UxLCBzdGVwMik7CiAKICAg ICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAyKCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAg ICBldmFsdWF0ZVNuaXBwZXRBbmREdW1wRXZhbHVhdGlvbkRldGFpbHModWlTb3VyY2VDb2RlMiwg c3RlcDMpOworICAgICAgICAgICAgICAgIGV2YWx1YXRlU25pcHBldEFuZER1bXBFdmFsdWF0aW9u RGV0YWlscyhzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZTIsIHN0ZXAzKTsKICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDMoKQogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIGV2YWx1YXRlU25pcHBldEFuZER1bXBFdmFsdWF0aW9uRGV0YWlscyh1aVNvdXJjZUNv ZGUxLCBuZXh0KTsKKyAgICAgICAgICAgICAgICBldmFsdWF0ZVNuaXBwZXRBbmREdW1wRXZhbHVh dGlvbkRldGFpbHMoc25pcHBldEphdmFTY3JpcHRTb3VyY2UxLCBuZXh0KTsKICAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIF0pOwo=