82318 2012-03-27 03:43:04 -0700 Web Inspector: dispatch breakpoint-added and breakpoint-removed events on UISourceCode. 2012-03-27 07:57:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 82224 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy vsevik yurys oldest_to_newest 588722 0 podivilov 2012-03-27 03:43:04 -0700 Web Inspector: dispatch breakpoint-added and breakpoint-removed events on UISourceCode. See bug 82224 for rationale. 588725 1 134015 podivilov 2012-03-27 03:44:37 -0700 Created attachment 134015 Patch 588740 2 134015 vsevik 2012-03-27 04:17:21 -0700 Comment on attachment 134015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134015&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:285 > + _addBreakpointListeners: function(uiSourceCode) Please add type annotations. > Source/WebCore/inspector/front-end/ScriptsPanel.js:291 > + _removeBreakpointListeners: function(uiSourceCode) ditto 588896 3 podivilov 2012-03-27 07:57:54 -0700 Committed r112266: <http://trac.webkit.org/changeset/112266> 134015 2012-03-27 03:44:37 -0700 2012-03-27 04:17:21 -0700 Patch bug-82318-20120327144435.patch text/plain 20886 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY0YWM3ODI4MDdmMTgx YjlhNzNmZDJlZmY1YTU4YTA2MjdkNGIwYy4uYjUyMzk0Mjk2NDllY2Q1ZjE0YjcwOWYxMTgzMDg0 MTA1YzdmODA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAzLTI3ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGRpc3BhdGNoIGJyZWFrcG9pbnQtYWRkZWQgYW5kIGJyZWFrcG9pbnQtcmVtb3ZlZCBl dmVudHMgb24gVUlTb3VyY2VDb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODIzMTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBCcmVha3BvaW50LWFkZGVkIGFuZCBicmVha3BvaW50LXJlbW92ZWQgZXZl bnRzIGFyZSBhbHdheXMgcmVsYXRlZCB0byBzcGVjaWZpYyBVSVNvdXJjZUNvZGUuCisgICAgICAg IFNlZSBidWcgODIyMjQgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJl YWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl9hZGRCcmVha3BvaW50VG9VSSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl9yZW1vdmVCcmVha3BvaW50 RnJvbVVJKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlSW1wbC5wcm90b3R5cGUu YnJlYWtwb2ludEFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBs LnByb3RvdHlwZS5icmVha3BvaW50UmVtb3ZlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fdWlTb3VyY2VDb2RlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUuX3VpU291cmNlQ29kZVJlbW92ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2FkZEJyZWFrcG9pbnRMaXN0ZW5lcnMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3JlbW92ZUJy ZWFrcG9pbnRMaXN0ZW5lcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuX3VpU291cmNlQ29kZVJlcGxhY2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1VJU291cmNlQ29kZS5qczoKKwogMjAxMi0wMy0yNiAgUGF2ZWwgUG9kaXZpbG92ICA8 cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdG9yZSBV SUJyZWFrcG9pbnRzIG9uIFVJU291cmNlQ29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCmluZGV4IDQzNDBjMGQy NzU4OTljODk4ZjE5NWFjMzJmYThjNTRlY2RhZjNjYjAuLjFiYTgxZjk2MDA2YzRlOTQ5ZTIzMjhh MjAwNzgwNDM4MTRhMjc3NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwpAQCAtMzEsMTYgKzMxLDEyIEBACiAv KioKICAqIEBjb25zdHJ1Y3RvcgogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2V0dGluZ30gYnJl YWtwb2ludFN0b3JhZ2UKLSAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLlVJQnJlYWtw b2ludCl9IGJyZWFrcG9pbnRBZGRlZERlbGVnYXRlCi0gKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYklu c3BlY3Rvci5VSUJyZWFrcG9pbnQpfSBicmVha3BvaW50UmVtb3ZlZERlbGVnYXRlCiAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsfSBkZWJ1Z2dlck1vZGVsCiAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5NYWluU2NyaXB0TWFwcGluZ30gc2NyaXB0TWFwcGluZwogICovCi1XZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIgPSBmdW5jdGlvbihicmVha3BvaW50U3RvcmFnZSwg YnJlYWtwb2ludEFkZGVkRGVsZWdhdGUsIGJyZWFrcG9pbnRSZW1vdmVkRGVsZWdhdGUsIGRlYnVn Z2VyTW9kZWwsIHNjcmlwdE1hcHBpbmcpCitXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIg PSBmdW5jdGlvbihicmVha3BvaW50U3RvcmFnZSwgZGVidWdnZXJNb2RlbCwgc2NyaXB0TWFwcGlu ZykKIHsKICAgICB0aGlzLl9icmVha3BvaW50U3RvcmFnZSA9IGJyZWFrcG9pbnRTdG9yYWdlOwot ICAgIHRoaXMuX2JyZWFrcG9pbnRBZGRlZERlbGVnYXRlID0gYnJlYWtwb2ludEFkZGVkRGVsZWdh dGU7Ci0gICAgdGhpcy5fYnJlYWtwb2ludFJlbW92ZWREZWxlZ2F0ZSA9IGJyZWFrcG9pbnRSZW1v dmVkRGVsZWdhdGU7CiAKICAgICAvKioKICAgICAgKiBAdHlwZSB7T2JqZWN0LjxzdHJpbmcsIE9i amVjdC48c3RyaW5nLFdlYkluc3BlY3Rvci5CcmVha3BvaW50Pj59CkBAIC0xOTgsOSArMTk0LDcg QEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICBfYWRk QnJlYWtwb2ludFRvVUk6IGZ1bmN0aW9uKGJyZWFrcG9pbnQsIHVpU291cmNlQ29kZSkKICAgICB7 CiAgICAgICAgIHZhciB1aUJyZWFrcG9pbnQgPSBicmVha3BvaW50LmNyZWF0ZVVJQnJlYWtwb2lu dCh1aVNvdXJjZUNvZGUpOwotICAgICAgICBjb25zb2xlLmFzc2VydCghdWlTb3VyY2VDb2RlLmJy ZWFrcG9pbnRzKClbdWlCcmVha3BvaW50LmxpbmVOdW1iZXJdKTsKICAgICAgICAgdWlTb3VyY2VD b2RlLmJyZWFrcG9pbnRBZGRlZCh1aUJyZWFrcG9pbnQubGluZU51bWJlciwgdWlCcmVha3BvaW50 KTsKLSAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkRGVsZWdhdGUodWlCcmVha3BvaW50KTsK ICAgICB9LAogCiAgICAgLyoqCkBAIC0yMTMsNyArMjA3LDYgQEAgV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodWlTb3Vy Y2VDb2RlLmJyZWFrcG9pbnRzKClbbGluZU51bWJlcl0gPT09IHVpQnJlYWtwb2ludCk7CiAgICAg ICAgIHVpU291cmNlQ29kZS5icmVha3BvaW50UmVtb3ZlZChsaW5lTnVtYmVyKTsKICAgICAgICAg dWlCcmVha3BvaW50LmJyZWFrcG9pbnQucmVtb3ZlVUlCcmVha3BvaW50KCk7Ci0gICAgICAgIHRo aXMuX2JyZWFrcG9pbnRSZW1vdmVkRGVsZWdhdGUodWlCcmVha3BvaW50KTsKICAgICB9LAogCiAg ICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggOTk4ODk4NjgwNGUwNTMz Y2UwZmUxZjU1ODU5MjBkNzk0ZjZmZmU0NS4uNzE4NGFiZjBlOTA4YmQ0MWU3NjA0YTBhMGE0NzI5 MmE3NzkxZjg5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtMzksNyArMzks NyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9IGZ1bmN0aW9uKCkK IAogICAgIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMgPSBbXTsKIAotICAgIHRoaXMuX2Jy ZWFrcG9pbnRNYW5hZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlcihXZWJJ bnNwZWN0b3Iuc2V0dGluZ3MuYnJlYWtwb2ludHMsIHRoaXMuX2JyZWFrcG9pbnRBZGRlZC5iaW5k KHRoaXMpLCB0aGlzLl9icmVha3BvaW50UmVtb3ZlZC5iaW5kKHRoaXMpLCBXZWJJbnNwZWN0b3Iu ZGVidWdnZXJNb2RlbCwgdGhpcy5fc2NyaXB0TWFwcGluZyk7CisgICAgdGhpcy5fYnJlYWtwb2lu dE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyKFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5icmVha3BvaW50cywgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsIHRoaXMu X3NjcmlwdE1hcHBpbmcpOwogCiAgICAgdGhpcy5fcGVuZGluZ0NvbnNvbGVNZXNzYWdlcyA9IHt9 OwogICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlTGl2ZUxvY2F0aW9ucyA9IFtdOwpAQCAtNjMsOCAr NjMsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMgPSB7 CiAgICAgVUlTb3VyY2VDb2RlUmVtb3ZlZDogInNvdXJjZS1maWxlLXJlbW92ZWQiLAogICAgIENv bnNvbGVNZXNzYWdlQWRkZWQ6ICJjb25zb2xlLW1lc3NhZ2UtYWRkZWQiLAogICAgIENvbnNvbGVN ZXNzYWdlc0NsZWFyZWQ6ICJjb25zb2xlLW1lc3NhZ2VzLWNsZWFyZWQiLAotICAgIFVJQnJlYWtw b2ludEFkZGVkOiAidWktYnJlYWtwb2ludC1hZGRlZCIsCi0gICAgVUlCcmVha3BvaW50UmVtb3Zl ZDogInVpLWJyZWFrcG9pbnQtcmVtb3ZlZCIsCiAgICAgRGVidWdnZXJQYXVzZWQ6ICJkZWJ1Z2dl ci1wYXVzZWQiLAogICAgIERlYnVnZ2VyUmVzdW1lZDogImRlYnVnZ2VyLXJlc3VtZWQiLAogICAg IERlYnVnZ2VyUmVzZXQ6ICJkZWJ1Z2dlci1yZXNldCIsCkBAIC00MzYsMjIgKzQzNCw2IEBAIFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgcmV0dXJuIHVpU291cmNlQ29kZS5icmVha3BvaW50cygpW2xpbmVOdW1iZXJdOwogICAgIH0s CiAKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSUJyZWFrcG9pbnR9IHVp QnJlYWtwb2ludAotICAgICAqLwotICAgIF9icmVha3BvaW50QWRkZWQ6IGZ1bmN0aW9uKHVpQnJl YWtwb2ludCkKLSAgICB7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5VSUJyZWFrcG9pbnRB ZGRlZCwgdWlCcmVha3BvaW50KTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtX ZWJJbnNwZWN0b3IuVUlCcmVha3BvaW50fSB1aUJyZWFrcG9pbnQKLSAgICAgKi8KLSAgICBfYnJl YWtwb2ludFJlbW92ZWQ6IGZ1bmN0aW9uKHVpQnJlYWtwb2ludCkKLSAgICB7Ci0gICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLkV2ZW50cy5VSUJyZWFrcG9pbnRSZW1vdmVkLCB1aUJyZWFrcG9pbnQpOwotICAg IH0sCi0KICAgICBfZGVidWdnZXJQYXVzZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZh ciBjYWxsRnJhbWVzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuY2FsbEZyYW1lczsKQEAg LTU5NiwxMyArNTc4LDE3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBsLnByb3RvdHlw ZSA9IHsKIAogICAgIGJyZWFrcG9pbnRBZGRlZDogZnVuY3Rpb24obGluZU51bWJlciwgYnJlYWtw b2ludCkKICAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9icmVha3BvaW50c1ts aW5lTnVtYmVyXSk7CiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzW2xpbmVOdW1iZXJdID0gYnJl YWtwb2ludDsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZS5FdmVudHMuQnJlYWtwb2ludEFkZGVkLCBicmVha3BvaW50KTsKICAg ICB9LAogCiAgICAgYnJlYWtwb2ludFJlbW92ZWQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAg eworICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9pbnRzW2xpbmVOdW1iZXJd OwogICAgICAgICBkZWxldGUgdGhpcy5fYnJlYWtwb2ludHNbbGluZU51bWJlcl07Ci0gICAgfQor ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlLkV2ZW50cy5CcmVha3BvaW50UmVtb3ZlZCwgYnJlYWtwb2ludCk7CisgICAgfSwKIH0K IAogV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUltcGwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA3YmZkMjc3YzQ0MDBk MzEyYmVkZGZiYzFhN2M0NjI1M2JhZjU0NGI2Li40OTdjMDdkYmEzOTRjYjNiYTJmOWFmN2I2NjA2 YTUwMWRkODNmZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTc3LDggKzE3Nyw2IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLl9wcmVzZW50 YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNvZGVSZW1vdmVkLCB0aGlzLl91aVNvdXJjZUNvZGVS ZW1vdmVkLCB0aGlzKTsKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5Db25zb2xl TWVzc2FnZUFkZGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVkLCB0aGlzKTsKICAgICB0aGlz Ll9wcmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5Db25zb2xlTWVzc2FnZXNDbGVhcmVkLCB0aGlzLl9j b25zb2xlTWVzc2FnZXNDbGVhcmVkLCB0aGlzKTsKLSAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LkV2ZW50cy5VSUJyZWFrcG9pbnRBZGRlZCwgdGhpcy5fdWlCcmVha3BvaW50QWRkZWQsIHRoaXMp OwotICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJQnJlYWtwb2ludFJlbW92ZWQs IHRoaXMuX3VpQnJlYWtwb2ludFJlbW92ZWQsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB0aGlzLl9kZWJ1Z2dlclBhdXNlZCwgdGhpcyk7 CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJSZXN1bWVkLCB0aGlz Ll9kZWJ1Z2dlclJlc3VtZWQsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZl bnRzLkNhbGxGcmFtZVNlbGVjdGVkLCB0aGlzLl9jYWxsRnJhbWVTZWxlY3RlZCwgdGhpcyk7CkBA IC0yNTgsNiArMjU2LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgX3VpU291cmNlQ29kZUFkZGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAg IHZhciB1aVNvdXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9 ICovIGV2ZW50LmRhdGE7CisgICAgICAgIHRoaXMuX2FkZEJyZWFrcG9pbnRMaXN0ZW5lcnModWlT b3VyY2VDb2RlKTsKIAogICAgICAgICBpZiAoIXVpU291cmNlQ29kZS51cmwgfHwgdWlTb3VyY2VD b2RlLmlzU25pcHBldEV2YWx1YXRpb24pIHsKICAgICAgICAgICAgIC8vIEFub255bW91cyBzb3Vy Y2VzIGFuZCBzbmlwcGV0cyBldmFsdWF0aW9ucyBhcmUgc2hvd24gb25seSB3aGVuIHN0ZXBwaW5n LgpAQCAtMjgwLDYgKzI3OSwxOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7CiAgICAgICAgIHRoaXMuX3JlbW92 ZVNvdXJjZUZyYW1lKHVpU291cmNlQ29kZSk7CisgICAgICAgIHRoaXMuX3JlbW92ZUJyZWFrcG9p bnRMaXN0ZW5lcnModWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgX2FkZEJyZWFrcG9pbnRM aXN0ZW5lcnM6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHVpU291cmNl Q29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkJy ZWFrcG9pbnRBZGRlZCwgdGhpcy5fdWlCcmVha3BvaW50QWRkZWQsIHRoaXMpOworICAgICAgICB1 aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2 ZW50cy5CcmVha3BvaW50UmVtb3ZlZCwgdGhpcy5fdWlCcmVha3BvaW50UmVtb3ZlZCwgdGhpcyk7 CisgICAgfSwKKworICAgIF9yZW1vdmVCcmVha3BvaW50TGlzdGVuZXJzOiBmdW5jdGlvbih1aVNv dXJjZUNvZGUpCisgICAgeworICAgICAgICB1aVNvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5CcmVha3BvaW50QWRkZWQsIHRoaXMu X3VpQnJlYWtwb2ludEFkZGVkLCB0aGlzKTsKKyAgICAgICAgdWlTb3VyY2VDb2RlLnJlbW92ZUV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQnJlYWtwb2ludFJl bW92ZWQsIHRoaXMuX3VpQnJlYWtwb2ludFJlbW92ZWQsIHRoaXMpOwogICAgIH0sCiAKICAgICAv KioKQEAgLTU3Myw2ICs1ODUsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5yZXBsYWNlRmlsZXMob2xkVUlT b3VyY2VDb2RlTGlzdCwgdWlTb3VyY2VDb2RlTGlzdCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMu X3JlbW92ZVNvdXJjZUZyYW1lKG9sZFVJU291cmNlQ29kZUxpc3RbaV0pOworCisgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKKyAgICAg ICAgICAgIHRoaXMuX3JlbW92ZUJyZWFrcG9pbnRMaXN0ZW5lcnMob2xkVUlTb3VyY2VDb2RlTGlz dFtpXSk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2RlTGlzdC5sZW5n dGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMuX2FkZEJyZWFrcG9pbnRMaXN0ZW5lcnModWlTb3Vy Y2VDb2RlTGlzdFtpXSk7CiAgICAgfSwKIAogICAgIF9zb3VyY2VGcmFtZUxvYWRlZDogZnVuY3Rp b24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlT b3VyY2VDb2RlLmpzCmluZGV4IDlhYTQ0MWQyMjIwMGJjZmU0NWNmMzI2YWU4ZTVlNjM3YzZhMmFj MWYuLjgxMzgyN2NlZjE1YjQ0MjVjYTNkMzI4ZTU4MmUwZWJhYjZlM2RlYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC00 OSw3ICs0OSw5IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUgPSBmdW5jdGlvbihpZCwgdXJs LCBjb250ZW50UHJvdmlkZXIpCiB9CiAKIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRz ID0gewotICAgIENvbnRlbnRDaGFuZ2VkOiAiY29udGVudC1jaGFuZ2VkIgorICAgIENvbnRlbnRD aGFuZ2VkOiAiY29udGVudC1jaGFuZ2VkIiwKKyAgICBCcmVha3BvaW50QWRkZWQ6ICJicmVha3Bv aW50LWFkZGVkIiwKKyAgICBCcmVha3BvaW50UmVtb3ZlZDogImJyZWFrcG9pbnQtcmVtb3ZlZCIK IH0KIAogV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTEz MTFmYmMyZjQ3NzRkMzk5NTEzMGFlYTFkN2Q3YzQ4NWVkODg2OC4uZDAzNmE3YWYxZWE4NWE2YzYw ZWNiYWFhNjU3NDkxOTVhZjZlYTQzYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTAzLTI3 ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IGRpc3BhdGNoIGJyZWFrcG9pbnQtYWRkZWQgYW5kIGJyZWFrcG9pbnQtcmVt b3ZlZCBldmVudHMgb24gVUlTb3VyY2VDb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODIzMTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFn ZXIuaHRtbDoKKwogMjAxMi0wMy0yNiAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdG9yZSBVSUJyZWFrcG9pbnRzIG9u IFVJU291cmNlQ29kZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9icmVha3BvaW50LW1hbmFnZXIuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9icmVha3BvaW50LW1hbmFnZXIuaHRtbAppbmRleCA3MTIwYjQ4NjkzNmZkN2ZhMzRhNzcyMWRi ODA5NjMxODg2ZTk5MjU3Li4wODdhM2ZkNzY0NzkyNjY1NzVjYmZhNDExZTQ2Y2VmZjRmY2E0OGQy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1t YW5hZ2VyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9p bnQtbWFuYWdlci5odG1sCkBAIC0xMywxNSArMTMsMTcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg fTsKIAogICAgIHZhciB1aUJyZWFrcG9pbnRzID0ge307Ci0gICAgZnVuY3Rpb24gYnJlYWtwb2lu dEFkZGVkKGJyZWFrcG9pbnQpCisgICAgZnVuY3Rpb24gYnJlYWtwb2ludEFkZGVkKGV2ZW50KQog ICAgIHsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSBldmVudC5kYXRhOwogICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiYnJlYWtwb2ludEFkZGVkKCIgKyBbYnJlYWtwb2ludC51aVNv dXJjZUNvZGUuaWQsIGJyZWFrcG9pbnQubGluZU51bWJlciwgYnJlYWtwb2ludC5jb25kaXRpb24s IGJyZWFrcG9pbnQuZW5hYmxlZF0uam9pbigiLCAiKSArICIpIik7CiAgICAgICAgIHZhciBicmVh a3BvaW50SWQgPSBicmVha3BvaW50LnVpU291cmNlQ29kZS5pZCArICI6IiArIGJyZWFrcG9pbnQu bGluZU51bWJlcjsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKCEoYnJlYWtwb2lu dElkIGluIHVpQnJlYWtwb2ludHMpKTsKICAgICAgICAgdWlCcmVha3BvaW50c1ticmVha3BvaW50 SWRdID0gYnJlYWtwb2ludC5jb25kaXRpb24gKyAifCIgKyBicmVha3BvaW50LmVuYWJsZWQ7CiAg ICAgfQotICAgIGZ1bmN0aW9uIGJyZWFrcG9pbnRSZW1vdmVkKGJyZWFrcG9pbnQpCisgICAgZnVu Y3Rpb24gYnJlYWtwb2ludFJlbW92ZWQoZXZlbnQpCiAgICAgeworICAgICAgICB2YXIgYnJlYWtw b2ludCA9IGV2ZW50LmRhdGE7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJicmVh a3BvaW50UmVtb3ZlZCgiICsgW2JyZWFrcG9pbnQudWlTb3VyY2VDb2RlLmlkLCBicmVha3BvaW50 LmxpbmVOdW1iZXJdLmpvaW4oIiwgIikgKyAiKSIpOwogICAgICAgICB2YXIgYnJlYWtwb2ludElk ID0gYnJlYWtwb2ludC51aVNvdXJjZUNvZGUuaWQgKyAiOiIgKyBicmVha3BvaW50LmxpbmVOdW1i ZXI7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0VHJ1ZShicmVha3BvaW50SWQgaW4gdWlC cmVha3BvaW50cyk7CkBAIC01OSwxNSArNjEsMTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgc2Vy aWFsaXplZEJyZWFrcG9pbnRzLnB1c2goY3JlYXRlQnJlYWtwb2ludCgiYi5qcyIsIDMsICIiLCB0 cnVlKSk7CiAKICAgICBmdW5jdGlvbiBjcmVhdGVVSVNvdXJjZUNvZGUoaWQsIHVybCkgeyByZXR1 cm4gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBsKGlkLCB1cmwsIG51bGwpOyB9Ci0g ICAgdmFyIHVpU291cmNlQ29kZUEgPSBjcmVhdGVVSVNvdXJjZUNvZGUoImEuanMiLCAiYS5qcyIp OwotICAgIHZhciB1aVNvdXJjZUNvZGVCID0gY3JlYXRlVUlTb3VyY2VDb2RlKCJiLmpzIiwgImIu anMiKTsKIAogICAgIHZhciBzY3JpcHRNYXBwaW5nID0ge307CiAgICAgc2NyaXB0TWFwcGluZy5y YXdMb2NhdGlvblRvVUlMb2NhdGlvbiA9IGZ1bmN0aW9uKHJhd0xvY2F0aW9uKSB7IHJldHVybiBy YXdMb2NhdGlvbjsgfTsKICAgICBzY3JpcHRNYXBwaW5nLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9u ID0gZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgc2Ny aXB0SWQgPSB1aVNvdXJjZUNvZGUgPT09IHVpU291cmNlQ29kZUEgPyAiYS5qcyIgOiAiYi5qcyI7 Ci0gICAgICAgIHJldHVybiB7IHNjcmlwdElkOiBzY3JpcHRJZCwgbGluZU51bWJlcjogbGluZU51 bWJlciwgY29sdW1uTnVtYmVyOiAwIH07CisgICAgICAgIHJldHVybiB7IHNjcmlwdElkOiB1aVNv dXJjZUNvZGUuaWQsIGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogMCB9Owog ICAgIH0KIAogICAgIGZ1bmN0aW9uIGNyZWF0ZUJyZWFrcG9pbnRNYW5hZ2VyKGJyZWFrcG9pbnRz LCBzY3JpcHRNYXBwaW5nKQpAQCAtNzYsMTUgKzc1LDIyIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg ICAgICB1aUJyZWFrcG9pbnRzID0ge307CiAgICAgICAgIGRlYnVnZ2VyQnJlYWtwb2ludHMgPSB7 fTsKICAgICAgICAgZGVidWdnZXJNb2RlbC5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKLSAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIoYnJlYWtwb2ludFN0b3Jh Z2UsIGJyZWFrcG9pbnRBZGRlZCwgYnJlYWtwb2ludFJlbW92ZWQsIGRlYnVnZ2VyTW9kZWwsIHNj cmlwdE1hcHBpbmcpOworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50 TWFuYWdlcihicmVha3BvaW50U3RvcmFnZSwgZGVidWdnZXJNb2RlbCwgc2NyaXB0TWFwcGluZyk7 CisgICAgfQorCisgICAgZnVuY3Rpb24gYWRkVUlTb3VyY2VDb2RlKGJyZWFrcG9pbnRNYW5hZ2Vy LCB1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICB1aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5CcmVha3BvaW50QWRkZWQsIGJy ZWFrcG9pbnRBZGRlZCk7CisgICAgICAgIHVpU291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCBicmVha3Bv aW50UmVtb3ZlZCk7CisgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLnVpU291cmNlQ29kZUFkZGVk KHVpU291cmNlQ29kZSk7CiAgICAgfQogCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3VpdGUo WwogICAgICAgICBmdW5jdGlvbiB1aVNvdXJjZUNvZGVBZGRlZChuZXh0KQogICAgICAgICB7CiAg ICAgICAgICAgICB2YXIgYnJlYWtwb2ludE1hbmFnZXIgPSBjcmVhdGVCcmVha3BvaW50TWFuYWdl cihzZXJpYWxpemVkQnJlYWtwb2ludHMsIHNjcmlwdE1hcHBpbmcpOwotCi0gICAgICAgICAgICBi cmVha3BvaW50TWFuYWdlci51aVNvdXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGVBKTsKKyAgICAg ICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBjcmVhdGVVSVNvdXJjZUNvZGUoImEuanMiLCAiYS5q cyIpOworICAgICAgICAgICAgYWRkVUlTb3VyY2VDb2RlKGJyZWFrcG9pbnRNYW5hZ2VyLCB1aVNv dXJjZUNvZGUpOwogICAgICAgICAgICAgc2V0VGltZW91dChjaGVja1Jlc3VsdHMsIDApOwogCiAg ICAgICAgICAgICBmdW5jdGlvbiBjaGVja1Jlc3VsdHMoKQpAQCAtOTgsMTggKzEwNCwxOCBAQCBm dW5jdGlvbiB0ZXN0KCkKICAgICAgICAgZnVuY3Rpb24gc2V0QW5kUmVtb3ZlQnJlYWtwb2ludHMo bmV4dCkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnRNYW5hZ2VyID0gY3Jl YXRlQnJlYWtwb2ludE1hbmFnZXIoc2VyaWFsaXplZEJyZWFrcG9pbnRzLCBzY3JpcHRNYXBwaW5n KTsKLQotICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIudWlTb3VyY2VDb2RlQWRkZWQodWlT b3VyY2VDb2RlQSk7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3Vy Y2VDb2RlKCJhLmpzIiwgImEuanMiKTsKKyAgICAgICAgICAgIGFkZFVJU291cmNlQ29kZShicmVh a3BvaW50TWFuYWdlciwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgICAgIHNldFRpbWVvdXQoc2V0 QW5kUmVtb3ZlLCAwKTsKIAogICAgICAgICAgICAgZnVuY3Rpb24gc2V0QW5kUmVtb3ZlKCkKICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBicmVha3BvaW50TWFuYWdlci5zZXRCcmVha3Bv aW50KHVpU291cmNlQ29kZUEsIDMwLCAiIiwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgYnJlYWtw b2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludCh1aVNvdXJjZUNvZGUsIDMwLCAiIiwgdHJ1ZSk7CiAg ICAgICAgICAgICAgICAgLy8gUmVtb3ZlIGJyZWFrcG9pbnQgaW1tZWRpYXRlbHksIGJyZWFrcG9p bnQgc2hvdWxkIGJlIHJlbW92ZWQgY29ycmVjdGx5IGZyb20gYm90aCBkZWJ1Z2dlciBtb2RlbCBh bmQgVUkuCi0gICAgICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIucmVtb3ZlQnJlYWtwb2lu dCh1aVNvdXJjZUNvZGVBLCAzMCk7CisgICAgICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIu cmVtb3ZlQnJlYWtwb2ludCh1aVNvdXJjZUNvZGUsIDMwKTsKIAotICAgICAgICAgICAgICAgIGJy ZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUJyZWFrcG9pbnQodWlTb3VyY2VDb2RlQSwgMTApOwotICAg ICAgICAgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUJyZWFrcG9pbnQodWlTb3VyY2VD b2RlQSwgMjApOworICAgICAgICAgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUJyZWFr cG9pbnQodWlTb3VyY2VDb2RlLCAxMCk7CisgICAgICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFn ZXIucmVtb3ZlQnJlYWtwb2ludCh1aVNvdXJjZUNvZGUsIDIwKTsKICAgICAgICAgICAgICAgICBz ZXRUaW1lb3V0KGNoZWNrUmVzdWx0cywgMCk7CiAgICAgICAgICAgICB9CiAKQEAgLTEyNCwxMSAr MTMwLDExIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBmdW5jdGlvbiBzZXRCcmVha3BvaW50 T25Db21tZW50KG5leHQpCiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciBicmVha3BvaW50TWFu YWdlciA9IGNyZWF0ZUJyZWFrcG9pbnRNYW5hZ2VyKFtdLCBzY3JpcHRNYXBwaW5nKTsKLQotICAg ICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIudWlTb3VyY2VDb2RlQWRkZWQodWlTb3VyY2VDb2Rl QSk7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3VyY2VDb2RlKCJh LmpzIiwgImEuanMiKTsKKyAgICAgICAgICAgIGFkZFVJU291cmNlQ29kZShicmVha3BvaW50TWFu YWdlciwgdWlTb3VyY2VDb2RlKTsKIAogICAgICAgICAgICAgZGVidWdnZXJNb2RlbC5hY3R1YWxM b2NhdGlvbnMgPSBbeyBsaW5lTnVtYmVyOiAxNiwgY29sdW1uTnVtYmVyOiAwIH1dOwotICAgICAg ICAgICAgYnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludCh1aVNvdXJjZUNvZGVBLCAxNSwg IiIsIHRydWUpOworICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludCh1 aVNvdXJjZUNvZGUsIDE1LCAiIiwgdHJ1ZSk7CiAgICAgICAgICAgICBzZXRUaW1lb3V0KGNoZWNr UmVzdWx0cywgMCk7CiAgICAgICAgICAgICBmdW5jdGlvbiBjaGVja1Jlc3VsdHMoKQogICAgICAg ICAgICAgewpAQCAtMTQwLDExICsxNDYsMTEgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGZ1 bmN0aW9uIHNldEJyZWFrcG9pbnRPdXRzaWRlT2ZTY3JpcHQobmV4dCkKICAgICAgICAgewogICAg ICAgICAgICAgdmFyIGJyZWFrcG9pbnRNYW5hZ2VyID0gY3JlYXRlQnJlYWtwb2ludE1hbmFnZXIo W10sIHNjcmlwdE1hcHBpbmcpOwotCi0gICAgICAgICAgICBicmVha3BvaW50TWFuYWdlci51aVNv dXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGVBKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSBjcmVhdGVVSVNvdXJjZUNvZGUoImEuanMiLCAiYS5qcyIpOworICAgICAgICAgICAgYWRk VUlTb3VyY2VDb2RlKGJyZWFrcG9pbnRNYW5hZ2VyLCB1aVNvdXJjZUNvZGUpOwogCiAgICAgICAg ICAgICBkZWJ1Z2dlck1vZGVsLmFjdHVhbExvY2F0aW9ucyA9IFtdOwotICAgICAgICAgICAgYnJl YWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludCh1aVNvdXJjZUNvZGVBLCAxNSwgIiIsIHRydWUp OworICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludCh1aVNvdXJjZUNv ZGUsIDE1LCAiIiwgdHJ1ZSk7CiAgICAgICAgICAgICBzZXRUaW1lb3V0KGNoZWNrUmVzdWx0cywg MCk7CiAgICAgICAgICAgICBmdW5jdGlvbiBjaGVja1Jlc3VsdHMoKQogICAgICAgICAgICAgewpA QCAtMTU2LDggKzE2Miw4IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBmdW5jdGlvbiB0ZXN0 TmF2aWdhdGlvbihuZXh0KQogICAgICAgICB7CiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludE1h bmFnZXIgPSBjcmVhdGVCcmVha3BvaW50TWFuYWdlcihzZXJpYWxpemVkQnJlYWtwb2ludHMsIHNj cmlwdE1hcHBpbmcpOwotCi0gICAgICAgICAgICBicmVha3BvaW50TWFuYWdlci51aVNvdXJjZUNv ZGVBZGRlZCh1aVNvdXJjZUNvZGVBKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVBID0g Y3JlYXRlVUlTb3VyY2VDb2RlKCJhLmpzIiwgImEuanMiKTsKKyAgICAgICAgICAgIGFkZFVJU291 cmNlQ29kZShicmVha3BvaW50TWFuYWdlciwgdWlTb3VyY2VDb2RlQSk7CiAgICAgICAgICAgICBz ZXRUaW1lb3V0KG5hdmlnYXRlVG9CLCAwKTsKIAogICAgICAgICAgICAgZnVuY3Rpb24gbmF2aWdh dGVUb0IoKQpAQCAtMTY3LDcgKzE3Myw4IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJcbk5hdmlnYXRlIHRvIEIuIik7CiAgICAgICAg ICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIuZGVidWdnZXJSZXNldCgpOwogCi0gICAgICAgICAg ICAgICAgYnJlYWtwb2ludE1hbmFnZXIudWlTb3VyY2VDb2RlQWRkZWQodWlTb3VyY2VDb2RlQik7 CisgICAgICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZUIgPSBjcmVhdGVVSVNvdXJjZUNvZGUo ImIuanMiLCAiYi5qcyIpOworICAgICAgICAgICAgICAgIGFkZFVJU291cmNlQ29kZShicmVha3Bv aW50TWFuYWdlciwgdWlTb3VyY2VDb2RlQik7CiAgICAgICAgICAgICAgICAgc2V0VGltZW91dChu YXZpZ2F0ZVRvQSwgMCk7CiAgICAgICAgICAgICB9CiAKQEAgLTE4MSw3ICsxODgsOCBAQCBmdW5j dGlvbiB0ZXN0KCkKIAogICAgICAgICAgICAgICAgIHZhciBldmVudERhdGEgPSB7IGJyZWFrcG9p bnRJZDogImEuanM6MTA6MCIsIGxvY2F0aW9uOiB7IHNjcmlwdElkOiAiYS5qcyIsIGxpbmVOdW1i ZXI6IDExLCBjb2x1bW5OdW1iZXI6IDUgfX07CiAgICAgICAgICAgICAgICAgZGVidWdnZXJNb2Rl bC5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZl bnRzLkJyZWFrcG9pbnRSZXNvbHZlZCwgZXZlbnREYXRhKTsKLSAgICAgICAgICAgICAgICBicmVh a3BvaW50TWFuYWdlci51aVNvdXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGVBKTsKKyAgICAgICAg ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlQSA9IGNyZWF0ZVVJU291cmNlQ29kZSgiYS5qcyIsICJh LmpzIik7CisgICAgICAgICAgICAgICAgYWRkVUlTb3VyY2VDb2RlKGJyZWFrcG9pbnRNYW5hZ2Vy LCB1aVNvdXJjZUNvZGVBKTsKICAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGNoZWNrUmVzdWx0 cywgMCk7CiAgICAgICAgICAgICB9CiAKQEAgLTIwNyw3ICsyMTUsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgICAgIHNjcmlwdE1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24gPSBm dW5jdGlvbihyYXdMb2NhdGlvbikgeyByZXR1cm4gcmF3TG9jYXRpb247IH07CiAgICAgICAgICAg ICBzY3JpcHRNYXBwaW5nLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uID0gZnVuY3Rpb24odWlTb3Vy Y2VDb2RlLCBsaW5lTnVtYmVyKSB7IHJldHVybiB7IHNjcmlwdElkOiAiYy5qcyIsIGxpbmVOdW1i ZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogMCB9OyB9OwogCi0gICAgICAgICAgICBicmVh a3BvaW50TWFuYWdlci51aVNvdXJjZUNvZGVBZGRlZChvcmlnaW5hbFVJU291cmNlQ29kZSk7Cisg ICAgICAgICAgICBhZGRVSVNvdXJjZUNvZGUoYnJlYWtwb2ludE1hbmFnZXIsIG9yaWdpbmFsVUlT b3VyY2VDb2RlKTsKICAgICAgICAgICAgIHNldFRpbWVvdXQoZm9ybWF0LCAwKTsKIAogICAgICAg ICAgICAgZnVuY3Rpb24gZm9ybWF0KCkKQEAgLTIyMiw3ICsyMzAsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgICAgICAgICBzY3JpcHRNYXBwaW5nLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9u ID0gZnVuY3Rpb24ocmF3TG9jYXRpb24pIHsgcmV0dXJuIHsgbGluZU51bWJlcjogcmF3TG9jYXRp b24ubGluZU51bWJlciAqIDIsIGNvbHVtbk51bWJlcjogcmF3TG9jYXRpb24uY29sdW1uTnVtYmVy ICogMiB9OyB9OwogICAgICAgICAgICAgICAgIHNjcmlwdE1hcHBpbmcudWlMb2NhdGlvblRvUmF3 TG9jYXRpb24gPSBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpIHsgcmV0dXJuIHsg c2NyaXB0SWQ6ICJjLmpzIiwgbGluZU51bWJlcjogTWF0aC5mbG9vcihsaW5lTnVtYmVyIC8gMiks IGNvbHVtbk51bWJlcjogMCB9OyB9OwogCi0gICAgICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFn ZXIudWlTb3VyY2VDb2RlQWRkZWQoZm9ybWF0dGVkVUlTb3VyY2VDb2RlKTsKKyAgICAgICAgICAg ICAgICBhZGRVSVNvdXJjZUNvZGUoYnJlYWtwb2ludE1hbmFnZXIsIGZvcm1hdHRlZFVJU291cmNl Q29kZSk7CiAgICAgICAgICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludChm b3JtYXR0ZWRVSVNvdXJjZUNvZGUsIDQsICIiLCB0cnVlKTsKICAgICAgICAgICAgICAgICBicmVh a3BvaW50TWFuYWdlci5zZXRCcmVha3BvaW50KGZvcm1hdHRlZFVJU291cmNlQ29kZSwgOCwgIiIs IGZhbHNlKTsKICAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGNoYW5nZUJyZWFrcG9pbnRzLCAw KTsKQEAgLTI0NSw3ICsyNTMsOCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiXG5SZWxvYWQuIik7CiAgICAgICAgICAgICAgICAgYnJl YWtwb2ludE1hbmFnZXIuZGVidWdnZXJSZXNldCgpOwogCi0gICAgICAgICAgICAgICAgYnJlYWtw b2ludE1hbmFnZXIudWlTb3VyY2VDb2RlQWRkZWQoZm9ybWF0dGVkVUlTb3VyY2VDb2RlKTsKKyAg ICAgICAgICAgICAgICB2YXIgZm9ybWF0dGVkVUlTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3VyY2VD b2RlKCJkZW9iZnVzY2F0ZWQ6Yy5qcyIsICJjLmpzIik7CisgICAgICAgICAgICAgICAgYWRkVUlT b3VyY2VDb2RlKGJyZWFrcG9pbnRNYW5hZ2VyLCBmb3JtYXR0ZWRVSVNvdXJjZUNvZGUpOwogICAg ICAgICAgICAgICAgIHZhciBldmVudERhdGEgPSB7IGJyZWFrcG9pbnRJZDogImMuanM6MjowIiwg bG9jYXRpb246IHsgc2NyaXB0SWQ6ICJjLmpzIiwgbGluZU51bWJlcjogMywgY29sdW1uTnVtYmVy OiAwIH19OwogICAgICAgICAgICAgICAgIGRlYnVnZ2VyTW9kZWwuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5CcmVha3BvaW50UmVzb2x2 ZWQsIGV2ZW50RGF0YSk7CiAgICAgICAgICAgICAgICAgZXZlbnREYXRhID0geyBicmVha3BvaW50 SWQ6ICJjLmpzOjY6MCIsIGxvY2F0aW9uOiB7IHNjcmlwdElkOiAiYy5qcyIsIGxpbmVOdW1iZXI6 IDYsIGNvbHVtbk51bWJlcjogMCB9fTsK