113311 2013-03-26 08:08:04 -0700 Web Inspector: Distinguish breakpoints and breakpoint locations in BreakpointManager API 2013-03-26 10:24:47 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 863673 0 vsevik 2013-03-26 08:08:04 -0700 Patch to follow 863703 1 195094 vsevik 2013-03-26 08:49:21 -0700 Created attachment 195094 Patch 863793 2 195094 webkit.review.bot 2013-03-26 10:24:44 -0700 Comment on attachment 195094 Patch Clearing flags on attachment: 195094 Committed r146903: <http://trac.webkit.org/changeset/146903> 863794 3 webkit.review.bot 2013-03-26 10:24:47 -0700 All reviewed patches have been landed. Closing bug. 195094 2013-03-26 08:49:21 -0700 2013-03-26 10:24:43 -0700 Patch bug-113311-20130326194503.patch text/plain 21069 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzg1ZWEyMTU1M2I3N2M2 YTA5ZWQwZmJhYmQ0YWVjMjczY2IzMTdjOC4uZWYwNjlmZGQ3ZGVkZmJlYzg0ODZjNjZjNjlkZjM2 MzI1YjcxM2FlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTAzLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERpc3Rpbmd1aXNoIGJyZWFrcG9pbnRzIGFuZCBicmVha3BvaW50IGxvY2F0aW9ucyBpbiBC cmVha3BvaW50TWFuYWdlciBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMzMxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1hZGUgaW5kZXBlbmRlbnQgaGFuZGxpbmcgb2YgYnJlYWtwb2ludHMgYW5k IGJyZWFrcG9pbnQgbG9jYXRpb24gaW4gYnJlYWtwb2ludCBtYW5hZ2VyIGNvbnNpc3RlbnQuCisg ICAgICAgIEphdmFTY3JpcHRTb3VyY2VGcmFtZSBub3cgcmVtb3ZlcyBicmVha3BvaW50cyBvcmln aW5hbGx5IHNldCBpbiBpdCBiYXNlZCBvbiBwcmltYXJ5IFVJIGxvY2F0aW9uLgorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUuYnJlYWtwb2ludHNGb3JVSVNv dXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3Rv dHlwZS5hbGxCcmVha3BvaW50cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1h bmFnZXIucHJvdG90eXBlLmJyZWFrcG9pbnRMb2NhdGlvbnNGb3JVSVNvdXJjZUNvZGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5hbGxCcmVha3Bv aW50TG9jYXRpb25zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5w cm90b3R5cGUuX3Byb2plY3RXaWxsUmVzZXQuZ2V0IGZvcik6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl9wcm9qZWN0V2lsbFJlc2V0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLm9uVUlTb3Vy Y2VDb2RlQ29udGVudENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRT b3VyY2VGcmFtZS5wcm90b3R5cGUuX3Jlc3RvcmVCcmVha3BvaW50c0FmdGVyRWRpdGluZyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fcmVt b3ZlQWxsQnJlYWtwb2ludHMpOgorCisyMDEzLTAzLTI2ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2 aWtAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVJU291cmNlQ29kZXMg YXJlIGxlYWtpbmcgb24gcmVsb2FkIHNvbWV0aW1lcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzMxMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwppbmRleCBjNmY5 NGU2NWNhMjIxMGZiYzg4ZTA5ZDRkY2FmNWM4MTRhYjQwYWQ1Li42NzBiMjA3ZDdmNjU5YmM1ZmEw ZDhkMjkwOGNhYzljN2Q3MjNhMzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKQEAgLTE2MCwzNiArMTYwLDUw IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgfSwK IAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyLkJyZWFrcG9pbnQsIFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKX0gZmlsdGVyCi0g ICAgICogQHJldHVybiB7QXJyYXkuPHticmVha3BvaW50OiBXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dE1hbmFnZXIuQnJlYWtwb2ludCwgdWlMb2NhdGlvbjogV2ViSW5zcGVjdG9yLlVJTG9jYXRpb259 Pn0KKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29k ZQorICAgICAqIEByZXR1cm4ge0FycmF5LjxXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIu QnJlYWtwb2ludD59CiAgICAgICovCi0gICAgX2ZpbHRlcmVkQnJlYWtwb2ludExvY2F0aW9uczog ZnVuY3Rpb24oZmlsdGVyKQorICAgIGJyZWFrcG9pbnRzRm9yVUlTb3VyY2VDb2RlOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUpCiAgICAgewogICAgICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgICAg IHZhciBicmVha3BvaW50cyA9IC8qKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rvci5CcmVha3Bv aW50TWFuYWdlci5CcmVha3BvaW50Pn0gKi8odGhpcy5fYnJlYWtwb2ludHMua2V5cygpKTsKICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50cy5sZW5ndGg7ICsraSkgewogICAg ICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSBicmVha3BvaW50c1tpXTsKLSAgICAgICAgICAgIGZv ciAodmFyIHN0cmluZ2lmaWVkTG9jYXRpb24gaW4gYnJlYWtwb2ludC5fdWlMb2NhdGlvbnMpIHsK LSAgICAgICAgICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IGJyZWFrcG9pbnQuX3VpTG9jYXRpb25z W3N0cmluZ2lmaWVkTG9jYXRpb25dOwotICAgICAgICAgICAgICAgIGlmIChmaWx0ZXIoYnJlYWtw b2ludCwgdWlMb2NhdGlvbikpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHticmVh a3BvaW50OiBicmVha3BvaW50LCB1aUxvY2F0aW9uOiB1aUxvY2F0aW9ufSk7Ci0gICAgICAgICAg ICB9CisgICAgICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IGJyZWFrcG9pbnQuX3ByaW1hcnlVSUxv Y2F0aW9uOworICAgICAgICAgICAgaWYgKHVpTG9jYXRpb24udWlTb3VyY2VDb2RlID09PSB1aVNv dXJjZUNvZGUpCisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2goYnJlYWtwb2ludCk7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9LAogCiAgICAgLyoqCisgICAgICog QHJldHVybiB7QXJyYXkuPFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5CcmVha3BvaW50 Pn0KKyAgICAgKi8KKyAgICBhbGxCcmVha3BvaW50czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdmFyIHJlc3VsdCA9IFtdOworICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSAvKiogQHR5cGUg e0FycmF5LjxXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2ludD59ICovKHRo aXMuX2JyZWFrcG9pbnRzLmtleXMoKSk7CisgICAgICAgIHJldHVybiBicmVha3BvaW50czsKKyAg ICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcmV0dXJuIHtBcnJheS48e2JyZWFrcG9pbnQ6IFdlYklu c3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5CcmVha3BvaW50LCB1aUxvY2F0aW9uOiBXZWJJbnNw ZWN0b3IuVUlMb2NhdGlvbn0+fQogICAgICAqLwogICAgIGJyZWFrcG9pbnRMb2NhdGlvbnNGb3JV SVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKICAgICB7Ci0gICAgICAgIGZ1bmN0 aW9uIGZpbHRlcihicmVha3BvaW50LCB1aUxvY2F0aW9uKQotICAgICAgICB7Ci0gICAgICAgICAg ICByZXR1cm4gdWlMb2NhdGlvbi51aVNvdXJjZUNvZGUgPT09IHVpU291cmNlQ29kZTsKKyAgICAg ICAgdmFyIHJlc3VsdCA9IFtdOworICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSAvKiogQHR5cGUg e0FycmF5LjxXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2ludD59ICovKHRo aXMuX2JyZWFrcG9pbnRzLmtleXMoKSk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYnJl YWtwb2ludHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gYnJl YWtwb2ludHNbaV07CisgICAgICAgICAgICB2YXIgdWlMb2NhdGlvbnMgPSBPYmplY3QudmFsdWVz KGJyZWFrcG9pbnQuX3VpTG9jYXRpb25zKTsKKyAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBq IDwgdWlMb2NhdGlvbnMubGVuZ3RoOyArK2opIHsKKyAgICAgICAgICAgICAgICB2YXIgdWlMb2Nh dGlvbiA9IHVpTG9jYXRpb25zW2pdOworICAgICAgICAgICAgICAgIGlmICh1aUxvY2F0aW9uLnVp U291cmNlQ29kZSA9PT0gdWlTb3VyY2VDb2RlKQorICAgICAgICAgICAgICAgICAgICByZXN1bHQu cHVzaCh7YnJlYWtwb2ludDogYnJlYWtwb2ludCwgdWlMb2NhdGlvbjogdWlMb2NhdGlvbnNbal19 KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQotCi0gICAgICAgIHJldHVybiB0aGlzLl9maWx0 ZXJlZEJyZWFrcG9pbnRMb2NhdGlvbnMoZmlsdGVyKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsK ICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTcsNyArMjExLDE1IEBAIFdlYkluc3BlY3Rvci5CcmVh a3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgYWxsQnJlYWtwb2ludExv Y2F0aW9uczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbHRlcmVk QnJlYWtwb2ludExvY2F0aW9ucyhmdW5jdGlvbihicmVha3BvaW50LCB1aUxvY2F0aW9uKSB7IHJl dHVybiB0cnVlOyB9KTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IFtdOworICAgICAgICB2YXIgYnJl YWtwb2ludHMgPSAvKiogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFn ZXIuQnJlYWtwb2ludD59ICovKHRoaXMuX2JyZWFrcG9pbnRzLmtleXMoKSk7CisgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAg IHZhciBicmVha3BvaW50ID0gYnJlYWtwb2ludHNbaV07CisgICAgICAgICAgICB2YXIgdWlMb2Nh dGlvbnMgPSBPYmplY3QudmFsdWVzKGJyZWFrcG9pbnQuX3VpTG9jYXRpb25zKTsKKyAgICAgICAg ICAgIGZvciAodmFyIGogPSAwOyBqIDwgdWlMb2NhdGlvbnMubGVuZ3RoOyArK2opCisgICAgICAg ICAgICAgICAgcmVzdWx0LnB1c2goe2JyZWFrcG9pbnQ6IGJyZWFrcG9pbnQsIHVpTG9jYXRpb246 IHVpTG9jYXRpb25zW2pdfSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0yNDUsMTIgKzI2NywxNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtw b2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHZhciBsaW5lQnJlYWtw b2ludHMgPSBicmVha3BvaW50c1tsaW5lTnVtYmVyXTsKICAgICAgICAgICAgICAgICBmb3IgKHZh ciBqID0gMDsgaiA8IGxpbmVCcmVha3BvaW50cy5sZW5ndGg7ICsraikgewogICAgICAgICAgICAg ICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGxpbmVCcmVha3BvaW50c1tqXTsKLSAgICAgICAgICAg ICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHMucmVtb3ZlKGJyZWFrcG9pbnQpOwotICAgICAgICAg ICAgICAgICAgICBkZWxldGUgYnJlYWtwb2ludC5fcHJpbWFyeVVJTG9jYXRpb247CiAgICAgICAg ICAgICAgICAgICAgIGJyZWFrcG9pbnQuX3Jlc2V0TG9jYXRpb25zKCk7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNGb3JVSVNv dXJjZUNvZGUucmVtb3ZlKHVpU291cmNlQ29kZSk7CisKKyAgICAgICAgICAgIHZhciBicmVha3Bv aW50cyA9IHRoaXMuYnJlYWtwb2ludHNGb3JVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAg ICAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2opIHsg CisgICAgICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHMucmVtb3ZlKGJyZWFrcG9pbnRzW2pd KTsKKyAgICAgICAgICAgICAgICBkZWxldGUgYnJlYWtwb2ludC5fcHJpbWFyeVVJTG9jYXRpb247 CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlSWQgPSBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuc291cmNlRmlsZUlkKHVpU291cmNlQ29kZSk7CiAgICAg ICAgICAgICBkZWxldGUgdGhpcy5fc291cmNlRmlsZXNXaXRoUmVzdG9yZWRCcmVha3BvaW50c1tz b3VyY2VGaWxlSWRdOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IDgwZmU4 OTU3MDJiNDMwMWRmMDk5NzI2YzAzODVhYjg0MjJlM2RlYWQuLjBiM2VjZTQ5NzA1YWFiOGQyMDI0 YzllYmFmMjliYzFjOWEwNmJhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC04MCw5ICs4 MCw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewog ICAgICAqLwogICAgIG9uVUlTb3VyY2VDb2RlQ29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGNvbnRl bnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSkKICAgICB7Ci0gICAgICAgIHZhciBicmVha3Bv aW50TG9jYXRpb25zID0gdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuYnJlYWtwb2ludExvY2F0aW9u c0ZvclVJU291cmNlQ29kZSh0aGlzLl91aVNvdXJjZUNvZGUpOwotICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGJyZWFrcG9pbnRMb2NhdGlvbnMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICBi cmVha3BvaW50TG9jYXRpb25zW2ldLmJyZWFrcG9pbnQucmVtb3ZlKCk7CisgICAgICAgIHRoaXMu X3JlbW92ZUFsbEJyZWFrcG9pbnRzKCk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVGcmFtZS5wcm90b3R5cGUub25VSVNvdXJjZUNvZGVDb250ZW50Q2hhbmdlZC5jYWxsKHRoaXMs IGNvbnRlbnQpOwogICAgIH0sCiAKQEAgLTE5MCwxMiArMTg4LDcgQEAgV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICAv LyBSZW1vdmUgYWxsIGJyZWFrcG9pbnRzLgotICAgICAgICB2YXIgYnJlYWtwb2ludExvY2F0aW9u cyA9IHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLmJyZWFrcG9pbnRMb2NhdGlvbnNGb3JVSVNvdXJj ZUNvZGUodGhpcy5fdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgdmFyIGxpbmVOdW1iZXJzID0ge307 Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludExvY2F0aW9ucy5sZW5ndGg7 ICsraSkgewotICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSBicmVha3BvaW50TG9jYXRpb25z W2ldLmJyZWFrcG9pbnQ7Ci0gICAgICAgICAgICBicmVha3BvaW50TG9jYXRpb25zW2ldLmJyZWFr cG9pbnQucmVtb3ZlKCk7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5fcmVtb3ZlQWxsQnJlYWtw b2ludHMoKTsKIAogICAgICAgICAvLyBSZXN0b3JlIGFsbCBicmVha3BvaW50cyBmcm9tIHNhdmVk IGRlY29yYXRpb25zLgogICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyU3RyaW5nIGluIGJyZWFr cG9pbnRzKSB7CkBAIC0yMDcsNiArMjAwLDEzIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAorICAgIF9yZW1vdmVB bGxCcmVha3BvaW50czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRz ID0gdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuYnJlYWtwb2ludHNGb3JVSVNvdXJjZUNvZGUodGhp cy5fdWlTb3VyY2VDb2RlKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50 cy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIGJyZWFrcG9pbnRzW2ldLnJlbW92ZSgpOworICAg IH0sCisKICAgICBfZ2V0UG9wb3ZlckFuY2hvcjogZnVuY3Rpb24oZWxlbWVudCwgZXZlbnQpCiAg ICAgewogICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmlzUGF1c2VkKCkp CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZTY2NzE4NmNjMjc4NGRkYjNmMjI2Y2Y0ZTBjYTU0N2E2ZjA0ZGFlNi4uMDkxNGFj ZDYyMzUzZDYyYmFiZDA1MGQ3M2Y1NzBmNGI0NzhkYjBkNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDEzLTAzLTI2ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IERpc3Rpbmd1aXNoIGJyZWFrcG9pbnRzIGFuZCBicmVha3Bv aW50IGxvY2F0aW9ucyBpbiBCcmVha3BvaW50TWFuYWdlciBBUEkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzMxMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUt ZWRpdC1icmVha3BvaW50cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVn Z2VyL2xpdmUtZWRpdC1icmVha3BvaW50cy5odG1sOgorCiAyMDEzLTAzLTI2ICBBbmRyZWkgQnVj dXIgIDxhYnVjdXJAYWRvYmUuY29tPgogCiAgICAgICAgIFVzZSBET00gb3JkZXJpbmcgZm9yIGxp c3QgY291bnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2 ZS1lZGl0LWJyZWFrcG9pbnRzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9saXZlLWVkaXQtYnJlYWtwb2ludHMtZXhwZWN0ZWQudHh0CmluZGV4IDgzZDNjZjQ5 MDhkNjBjYjJhZGY1NDM3MzBhM2JlYTVmNTBhN2VhNTEuLjJlODhkYTZlOGRkZTNmMmI4Y2EwOTM3 MTgwNjIzYjdhMjY2NWEyMjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci9saXZlLWVkaXQtYnJlYWtwb2ludHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQtYnJlYWtwb2ludHMtZXhwZWN0ZWQudHh0CkBA IC0xMCw2ICsxMCw4IEBAIFNldHRpbmcgYnJlYWtwb2ludDoKICAgICAgICAgZWRpdC1tZS1icmVh a3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRp b25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwg cHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0IGlkOiBmaWxlOi8vCisgICAgRHVtcGluZyBi cmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1i ZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLwogRWRpdGlu ZyBzb3VyY2U6CiAgICAgVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAy KQogICAgIFRleHRFZGl0b3IuYWRkQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMiwgZGlzYWJsZWQg PSB0cnVlKQpAQCAtMTgsNiArMjAsOCBAQCBFZGl0aW5nIHNvdXJjZToKICAgICAgICAgZWRpdC1t ZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQg bG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJl cjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CisgICAg RHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMs IGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTov LwogVW5kb2luZyBzb3VyY2UgZWRpdGluZzoKICAgICBPcmlnaW5hbFRleHRFZGl0b3IucmVtb3Zl QnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikKICAgICBUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9p bnQobGluZU51bWJlciA9IDIpCkBAIC0yNywxMCArMzEsMTMgQEAgVW5kb2luZyBzb3VyY2UgZWRp dGluZzoKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAg ICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVh a3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0 IGlkOiBmaWxlOi8vCisgICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQt bWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywg cHJvamVjdCBpZDogZmlsZTovLwogRmluYWxseSByZW1vdmluZyBicmVha3BvaW50OgogICAgIFRl eHRFZGl0b3IucmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikKICAgICBEdW1waW5nIGJy ZWFrcG9pbnQgc3RvcmFnZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2NhdGlvbnMKKyAgICBE dW1waW5nIGJyZWFrcG9pbnRzCiAKIFJ1bm5pbmc6IHRlc3RFZGl0Q29tbWl0CiBTZXR0aW5nIGJy ZWFrcG9pbnQ6CkBAIC0zOSw2ICs0Niw4IEBAIFNldHRpbmcgYnJlYWtwb2ludDoKICAgICAgICAg ZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFr cG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGlu ZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0IGlkOiBmaWxlOi8vCisg ICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMu anMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmls ZTovLwogRWRpdGluZyBzb3VyY2U6CiAgICAgT3JpZ2luYWxUZXh0RWRpdG9yLmFkZEJyZWFrcG9p bnQobGluZU51bWJlciA9IDIsIGRpc2FibGVkID0gZmFsc2UpCiAgICAgVGV4dEVkaXRvci5yZW1v dmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQpAQCAtNDcsNiArNTYsOCBAQCBFZGl0aW5nIHNv dXJjZToKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAg ICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVh a3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVj dCBpZDogZGVidWdnZXI6CisgICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVk aXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29y aywgcHJvamVjdCBpZDogZmlsZTovLwogQ29tbWl0dGluZyBlZGl0ZWQgc291cmNlOgogICAgIE9y aWdpbmFsVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQogICAgIFRl eHRFZGl0b3IucmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikKQEAgLTU2LDEwICs2Nywx MyBAQCBDb21taXR0aW5nIGVkaXRlZCBzb3VyY2U6CiAgICAgICAgIGVkaXQtbWUtYnJlYWtwb2lu dHMuanM6MiwgZW5hYmxlZDp0cnVlCiAgICAgRHVtcGluZyBicmVha3BvaW50IGxvY2F0aW9ucwog ICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2pl Y3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLworICAgIER1bXBpbmcgYnJlYWtw b2ludHMKKyAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVtYmVyOiAy LCBwcm9qZWN0IHR5cGU6IG5ldHdvcmssIHByb2plY3QgaWQ6IGZpbGU6Ly8KIEZpbmFsbHkgcmVt b3ZpbmcgYnJlYWtwb2ludDoKICAgICBUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9pbnQobGluZU51 bWJlciA9IDIpCiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICBEdW1waW5nIGJy ZWFrcG9pbnQgbG9jYXRpb25zCisgICAgRHVtcGluZyBicmVha3BvaW50cwogCiBSdW5uaW5nOiB0 ZXN0RWRpdENvbW1pdEZhaWxFZGl0Q29tbWl0CiBTZXR0aW5nIGJyZWFrcG9pbnQ6CkBAIC02OCw2 ICs4Miw4IEBAIFNldHRpbmcgYnJlYWtwb2ludDoKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50 cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAg ICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVj dCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0IGlkOiBmaWxlOi8vCisgICAgRHVtcGluZyBicmVha3Bv aW50cworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIs IHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLwogRWRpdGluZyBzb3Vy Y2U6CiAgICAgT3JpZ2luYWxUZXh0RWRpdG9yLmFkZEJyZWFrcG9pbnQobGluZU51bWJlciA9IDIs IGRpc2FibGVkID0gZmFsc2UpCiAgICAgVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVO dW1iZXIgPSAyKQpAQCAtNzYsMTYgKzkyLDIyIEBAIEVkaXRpbmcgc291cmNlOgogICAgICAgICBl ZGl0LW1lLWJyZWFrcG9pbnRzLmpzOjIsIGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBpbmcgYnJlYWtw b2ludCBsb2NhdGlvbnMKICAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5l TnVtYmVyOiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjoK KyAgICBEdW1waW5nIGJyZWFrcG9pbnRzCisgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50 cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0IGlkOiBm aWxlOi8vCiBDb21taXR0aW5nIGVkaXRlZCBzb3VyY2U6CiAgICAgRHVtcGluZyBicmVha3BvaW50 IHN0b3JhZ2UKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUK ICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1i cmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJv amVjdCBpZDogZGVidWdnZXI6CisgICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6 IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0 d29yaywgcHJvamVjdCBpZDogZmlsZTovLwogRWRpdGluZyBzb3VyY2UgYWdhaW4gc28gdGhhdCBs aXZlIGVkaXQgY291bGQgc3VjY2VlZDoKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQog ICAgICAgICBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzOjIsIGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBp bmcgYnJlYWtwb2ludCBsb2NhdGlvbnMKICAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRz LmpzLCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBk ZWJ1Z2dlcjoKKyAgICBEdW1waW5nIGJyZWFrcG9pbnRzCisgICAgICAgIHVybDogZWRpdC1tZS1i cmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9q ZWN0IGlkOiBmaWxlOi8vCiBDb21taXR0aW5nIGVkaXRlZCBzb3VyY2UgYWdhaW46CiAgICAgT3Jp Z2luYWxUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9pbnQobGluZU51bWJlciA9IDIpCiAgICAgVGV4 dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQpAQCAtOTUsMTAgKzExNywx MyBAQCBDb21taXR0aW5nIGVkaXRlZCBzb3VyY2UgYWdhaW46CiAgICAgICAgIGVkaXQtbWUtYnJl YWtwb2ludHMuanM6MiwgZW5hYmxlZDp0cnVlCiAgICAgRHVtcGluZyBicmVha3BvaW50IGxvY2F0 aW9ucwogICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIs IHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLworICAgIER1bXBpbmcg YnJlYWtwb2ludHMKKyAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVt YmVyOiAyLCBwcm9qZWN0IHR5cGU6IG5ldHdvcmssIHByb2plY3QgaWQ6IGZpbGU6Ly8KIEZpbmFs bHkgcmVtb3ZpbmcgYnJlYWtwb2ludDoKICAgICBUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9pbnQo bGluZU51bWJlciA9IDIpCiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICBEdW1w aW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCisgICAgRHVtcGluZyBicmVha3BvaW50cwogCiBSdW5u aW5nOiB0ZXN0RWRpdENvbW1pdEZhaWxVbmRvQ29tbWl0CiBTZXR0aW5nIGJyZWFrcG9pbnQ6CkBA IC0xMDcsNiArMTMyLDggQEAgU2V0dGluZyBicmVha3BvaW50OgogICAgICAgICBlZGl0LW1lLWJy ZWFrcG9pbnRzLmpzOjIsIGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2Nh dGlvbnMKICAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVtYmVyOiAy LCBwcm9qZWN0IHR5cGU6IG5ldHdvcmssIHByb2plY3QgaWQ6IGZpbGU6Ly8KKyAgICBEdW1waW5n IGJyZWFrcG9pbnRzCisgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51 bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3b3JrLCBwcm9qZWN0IGlkOiBmaWxlOi8vCiBFZGl0 aW5nIHNvdXJjZToKICAgICBPcmlnaW5hbFRleHRFZGl0b3IuYWRkQnJlYWtwb2ludChsaW5lTnVt YmVyID0gMiwgZGlzYWJsZWQgPSBmYWxzZSkKICAgICBUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9p bnQobGluZU51bWJlciA9IDIpCkBAIC0xMTUsMTYgKzE0MiwyMiBAQCBFZGl0aW5nIHNvdXJjZToK ICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1w aW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50 cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDog ZGVidWdnZXI6CisgICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQtbWUt YnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywgcHJv amVjdCBpZDogZmlsZTovLwogQ29tbWl0dGluZyBlZGl0ZWQgc291cmNlOgogICAgIER1bXBpbmcg YnJlYWtwb2ludCBzdG9yYWdlCiAgICAgICAgIGVkaXQtbWUtYnJlYWtwb2ludHMuanM6MiwgZW5h YmxlZDp0cnVlCiAgICAgRHVtcGluZyBicmVha3BvaW50IGxvY2F0aW9ucwogICAgICAgICB1cmw6 IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVi dWdnZXIsIHByb2plY3QgaWQ6IGRlYnVnZ2VyOgorICAgIER1bXBpbmcgYnJlYWtwb2ludHMKKyAg ICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0 IHR5cGU6IG5ldHdvcmssIHByb2plY3QgaWQ6IGZpbGU6Ly8KIFVuZG9pbmcgc291cmNlIGVkaXRp bmc6CiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICAgICAgZWRpdC1tZS1icmVh a3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRp b25zCiAgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwg cHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CisgICAgRHVtcGlu ZyBicmVha3BvaW50cworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVO dW1iZXI6IDIsIHByb2plY3QgdHlwZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLwogQ29t bWl0dGluZyBlZGl0ZWQgc291cmNlIGFnYWluOgogICAgIE9yaWdpbmFsVGV4dEVkaXRvci5yZW1v dmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQogICAgIFRleHRFZGl0b3IucmVtb3ZlQnJlYWtw b2ludChsaW5lTnVtYmVyID0gMikKQEAgLTEzNCwxMCArMTY3LDEzIEBAIENvbW1pdHRpbmcgZWRp dGVkIHNvdXJjZSBhZ2FpbjoKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFi bGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDog ZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBuZXR3 b3JrLCBwcm9qZWN0IGlkOiBmaWxlOi8vCisgICAgRHVtcGluZyBicmVha3BvaW50cworICAgICAg ICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlw ZTogbmV0d29yaywgcHJvamVjdCBpZDogZmlsZTovLwogRmluYWxseSByZW1vdmluZyBicmVha3Bv aW50OgogICAgIFRleHRFZGl0b3IucmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikKICAg ICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2Nh dGlvbnMKKyAgICBEdW1waW5nIGJyZWFrcG9pbnRzCiAKIFJ1bm5pbmc6IHRlc3RFZGl0QW5vbnlt b3VzVW5kbwogU2V0IHRpbWVyIGZvciB0ZXN0IGZ1bmN0aW9uLgpAQCAtMTQ5LDE4ICsxODUsMjUg QEAgU2V0dGluZyBicmVha3BvaW50OgogICAgIER1bXBpbmcgYnJlYWtwb2ludCBzdG9yYWdlCiAg ICAgRHVtcGluZyBicmVha3BvaW50IGxvY2F0aW9ucwogICAgICAgICB1cmw6ICwgbGluZU51bWJl cjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CisgICAg RHVtcGluZyBicmVha3BvaW50cworICAgICAgICB1cmw6ICwgbGluZU51bWJlcjogMiwgcHJvamVj dCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CiBFZGl0aW5nIHNvdXJjZToK ICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBs b2NhdGlvbnMKICAgICAgICAgdXJsOiAsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVi dWdnZXIsIHByb2plY3QgaWQ6IGRlYnVnZ2VyOgorICAgIER1bXBpbmcgYnJlYWtwb2ludHMKKyAg ICAgICAgdXJsOiAsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2pl Y3QgaWQ6IGRlYnVnZ2VyOgogVW5kb2luZyBzb3VyY2UgZWRpdGluZzoKICAgICBEdW1waW5nIGJy ZWFrcG9pbnQgc3RvcmFnZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2NhdGlvbnMKICAgICAg ICAgdXJsOiAsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3Qg aWQ6IGRlYnVnZ2VyOgorICAgIER1bXBpbmcgYnJlYWtwb2ludHMKKyAgICAgICAgdXJsOiAsIGxp bmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3QgaWQ6IGRlYnVnZ2Vy OgogRmluYWxseSByZW1vdmluZyBicmVha3BvaW50OgogICAgIFRleHRFZGl0b3IucmVtb3ZlQnJl YWtwb2ludChsaW5lTnVtYmVyID0gMikKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQog ICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2NhdGlvbnMKKyAgICBEdW1waW5nIGJyZWFrcG9pbnRz CiAKIFJ1bm5pbmc6IHRlc3RFZGl0RHluYW1pY0Fub255bW91c1VuZG8KIFNldCB0aW1lciBmb3Ig dGVzdCBmdW5jdGlvbi4KQEAgLTE3MiwxNyArMjE1LDI0IEBAIFNldHRpbmcgYnJlYWtwb2ludDoK ICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBs b2NhdGlvbnMKICAgICAgICAgdXJsOiAsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVi dWdnZXIsIHByb2plY3QgaWQ6IGRlYnVnZ2VyOgorICAgIER1bXBpbmcgYnJlYWtwb2ludHMKKyAg ICAgICAgdXJsOiAsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2pl Y3QgaWQ6IGRlYnVnZ2VyOgogRWRpdGluZyBzb3VyY2U6CiAgICAgRHVtcGluZyBicmVha3BvaW50 IHN0b3JhZ2UKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDog LCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1 Z2dlcjoKKyAgICBEdW1waW5nIGJyZWFrcG9pbnRzCisgICAgICAgIHVybDogLCBsaW5lTnVtYmVy OiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjoKIFVuZG9p bmcgc291cmNlIGVkaXRpbmc6CiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICBE dW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCiAgICAgICAgIHVybDogLCBsaW5lTnVtYmVyOiAy LCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjoKKyAgICBEdW1w aW5nIGJyZWFrcG9pbnRzCisgICAgICAgIHVybDogLCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0IHR5 cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjoKIEZpbmFsbHkgcmVtb3ZpbmcgYnJl YWtwb2ludDoKICAgICBUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9pbnQobGluZU51bWJlciA9IDIp CiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICBEdW1waW5nIGJyZWFrcG9pbnQg bG9jYXRpb25zCisgICAgRHVtcGluZyBicmVha3BvaW50cwogRGVidWdnZXIgd2FzIGRpc2FibGVk LgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0 LWJyZWFrcG9pbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1l ZGl0LWJyZWFrcG9pbnRzLmh0bWwKaW5kZXggNzVjMWEwMDBmMzg4ZTk1MzllMDYwYzM0YjM4YTI4 YWMxODQ4NWZkOS4uZjdlOTMyMTMwMmIwYjc2ZDg5OTYyZDQ2NjBiODg4MWUwZDlhNTM1YyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC1icmVha3Bv aW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQt YnJlYWtwb2ludHMuaHRtbApAQCAtMzksOCArMzksMjIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbG9jYXRpb25zLmxlbmd0aDsgKytpKSB7CiAgICAgICAg ICAgICB2YXIgdWlMb2NhdGlvbiA9IGxvY2F0aW9uc1tpXS51aUxvY2F0aW9uOwogICAgICAgICAg ICAgdmFyIHVpU291cmNlQ29kZSA9IHVpTG9jYXRpb24udWlTb3VyY2VDb2RlOworICAgICAgICAg ICAgdmFyIG9yaWdpblVSTCA9IHVpU291cmNlQ29kZS5vcmlnaW5VUkwoKTsKKyAgICAgICAgICAg IHZhciBsaW5lTnVtYmVyID0gdWlMb2NhdGlvbi5saW5lTnVtYmVyOwogICAgICAgICAgICAgdmFy IHByb2plY3QgPSB1aVNvdXJjZUNvZGUucHJvamVjdCgpOwotICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIiAgICAgICAgdXJsOiAiICsgcGF0aFRvRmlsZU5hbWUodWlTb3VyY2VD b2RlLm9yaWdpblVSTCgpKSArICIsIGxpbmVOdW1iZXI6ICIgKyB1aUxvY2F0aW9uLmxpbmVOdW1i ZXIgKyAiLCBwcm9qZWN0IHR5cGU6ICIgKyBwcm9qZWN0LnR5cGUoKSArICIsIHByb2plY3QgaWQ6 ICIgKyBwcm9qZWN0LmlkKCkpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQo IiAgICAgICAgdXJsOiAiICsgcGF0aFRvRmlsZU5hbWUob3JpZ2luVVJMKSArICIsIGxpbmVOdW1i ZXI6ICIgKyBsaW5lTnVtYmVyICsgIiwgcHJvamVjdCB0eXBlOiAiICsgcHJvamVjdC50eXBlKCkg KyAiLCBwcm9qZWN0IGlkOiAiICsgcHJvamVjdC5pZCgpKTsKKyAgICAgICAgfQorCisgICAgICAg IGJyZWFrcG9pbnRzID0gYnJlYWtwb2ludE1hbmFnZXIuYWxsQnJlYWtwb2ludHMoKTsKKyAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICBEdW1waW5nIGJyZWFrcG9pbnRzIik7Cisg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2kpIHsKKyAg ICAgICAgICAgIHZhciBicmVha3BvaW50ID0gYnJlYWtwb2ludHNbaV07CisgICAgICAgICAgICB2 YXIgcHJpbWFyeVVJTG9jYXRpb24gPSBicmVha3BvaW50LnByaW1hcnlVSUxvY2F0aW9uKCk7Cisg ICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gcHJpbWFyeVVJTG9jYXRpb24udWlTb3VyY2VD b2RlOworICAgICAgICAgICAgdmFyIG9yaWdpblVSTCA9IHVpU291cmNlQ29kZS5vcmlnaW5VUkwo KTsKKyAgICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gcHJpbWFyeVVJTG9jYXRpb24ubGluZU51 bWJlcjsKKyAgICAgICAgICAgIHZhciBwcm9qZWN0ID0gdWlTb3VyY2VDb2RlLnByb2plY3QoKTsK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgICAgICAgIHVybDogIiArIHBh dGhUb0ZpbGVOYW1lKG9yaWdpblVSTCkgKyAiLCBsaW5lTnVtYmVyOiAiICsgbGluZU51bWJlciAr ICIsIHByb2plY3QgdHlwZTogIiArIHByb2plY3QudHlwZSgpICsgIiwgcHJvamVjdCBpZDogIiAr IHByb2plY3QuaWQoKSk7CiAgICAgICAgIH0KICAgICB9CiAK