75170 2011-12-23 05:00:37 -0800 Web Inspector: Migrate to native Function.prototype.bind; fix front-end compilation with the version of compiler that respects Function.prototype.bind. 2011-12-23 05:16:42 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 526831 0 pfeldman 2011-12-23 05:00:37 -0800 No functionality changes in this patch, only front-end compilation fixes. 526832 1 120459 pfeldman 2011-12-23 05:09:33 -0800 Created attachment 120459 Patch 526833 2 pfeldman 2011-12-23 05:16:42 -0800 Committed r103623: <http://trac.webkit.org/changeset/103623> 120459 2011-12-23 05:09:33 -0800 2011-12-23 05:11:37 -0800 Patch bug-75170-20111223170930.patch text/plain 20583 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllMzE1YWQwMDkzODMz MzliZTAwYWRiYjVjZWQ2MzdiOTQwZTExMi4uNzU4OWFiNjcwMDExNTFmNjdiOWU4NGQ2ZGU2NTQz ZjNmMTlhYWJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBNaWdyYXRlIHRvIG5hdGl2ZSBGdW5jdGlvbi5wcm90b3R5cGUuYmluZDsgZml4IGZyb250LWVu ZCBjb21waWxhdGlvbiB3aXRoIHRoZQorICAgICAgICB2ZXJzaW9uIG9mIGNvbXBpbGVyIHRoYXQg cmVzcGVjdHMgRnVuY3Rpb24ucHJvdG90eXBlLmJpbmQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTE3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlv bkNhY2hlTW9kZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NLZXl3b3Jk Q29tcGxldGlvbnMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRp b25zLmNvbG9ycyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVs LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5n LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLnB1c2hOb2RlVG9Gcm9udGVuZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLnB1c2hOb2RlQnlQYXRoVG9G cm9udGVuZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLl9kaXNw YXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZS5vbkRvY3VtZW50QXZhaWxhYmxlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuX2Rpc3BhdGNoV2hlbkRvY3VtZW50QXZh aWxhYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuX2xvYWRO b2RlQXR0cmlidXRlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBl LnF1ZXJ5U2VsZWN0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlw ZS5xdWVyeVNlbGVjdG9yQWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVn Z2VyTW9kZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9u QVBJLmpzOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkuSW5zcGVjdG9yRXh0ZW5zaW9u QVBJKToKKyAgICAgICAgKGluamVjdGVkRXh0ZW5zaW9uQVBJKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01h bmFnZXIucHJvdG90eXBlLmVuYWJsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5kaXNhYmxlUmVzb3VyY2VUcmFja2luZyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1RleHRQcm9tcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5wcm90 b3R5cGUuY29tcGxldGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVz LmpzOgorCiAyMDExLTEyLTIyICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4KIAog ICAgICAgICBDcmFzaCBhbmQgaW5jb3JyZWN0IGJlaGF2aW9yIHdoZW4gc3dpdGNoaW5nIGJldHdl ZW4gaGFyZHdhcmUgYW5kIHNvZnR3YXJlIENTUyBmaWx0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpz CmluZGV4IGZhZjM1YjhjNmZmZjcwYjljZDE5MzE2NWU5ZThlNjExMmM3MTliM2EuLjRkNzhjY2Zh ZTMzMzA4ZTdmNGQ4MzEwM2ExZjQ3Mzc4MTM3ZGRkOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpz CkBAIC03OCw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwucHJv dG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGZyYW1lSWQKLSAg ICAgKiBAcGFyYW0ge3N0cmluZ30gZXJyb3IKKyAgICAgKiBAcGFyYW0gez9Qcm90b2NvbC5FcnJv cn0gZXJyb3IKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbWFuaWZlc3RVUkwKICAgICAgKi8KICAg ICBfbWFuaWZlc3RGb3JGcmFtZUxvYWRlZDogZnVuY3Rpb24oZnJhbWVJZCwgZXJyb3IsIG1hbmlm ZXN0VVJMKQpAQCAtOTMsNyArOTMsNyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1v ZGVsLnByb3RvdHlwZSA9IHsKICAgICB9LAogICAgIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7 c3RyaW5nfSBlcnJvcgorICAgICAqIEBwYXJhbSB7P1Byb3RvY29sLkVycm9yfSBlcnJvcgogICAg ICAqIEBwYXJhbSB7QXJyYXkuPEFwcGxpY2F0aW9uQ2FjaGVBZ2VudC5GcmFtZVdpdGhNYW5pZmVz dD59IGZyYW1lc1dpdGhNYW5pZmVzdHMKICAgICAgKi8KICAgICBfZnJhbWVzV2l0aE1hbmlmZXN0 c0xvYWRlZDogZnVuY3Rpb24oZXJyb3IsIGZyYW1lc1dpdGhNYW5pZmVzdHMpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9u cy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTS2V5d29yZENvbXBs ZXRpb25zLmpzCmluZGV4IGU2MGMwNjIzYTNkZGVlZGExNDZkNzczNjUzYjNlNmVlM2IzNGYwNGUu LjUyYWI3MGU4N2E3NDcwZjIxZDYzMzU0NGNhNDhjZmRmMTgzYWQzNDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTS2V5d29yZENvbXBsZXRpb25zLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTS2V5d29yZENvbXBs ZXRpb25zLmpzCkBAIC00OSw5ICs0OSw5IEBAIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxl dGlvbnMuaXNDb2xvckF3YXJlUHJvcGVydHkgPSBmdW5jdGlvbihwcm9wZXJ0eU5hbWUpCiAKIFdl Ykluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuY29sb3JzID0gZnVuY3Rpb24oKQogewot ICAgIGlmICghdGhpcy5fY29sb3JzS2V5U2V0KQotICAgICAgICB0aGlzLl9jb2xvcnNLZXlTZXQg PSB0aGlzLl9jb2xvcnMua2V5U2V0KCk7Ci0gICAgcmV0dXJuIHRoaXMuX2NvbG9yc0tleVNldDsK KyAgICBpZiAoIVdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuX2NvbG9yc0tleVNl dCkKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JzS2V5 U2V0ID0gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JzLmtleVNldCgp OworICAgIHJldHVybiBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLl9jb2xvcnNL ZXlTZXQ7CiB9CiAKIC8vIFRha2VuIGZyb20gaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvcHJv cGlkeC5odG1sLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D U1NTdHlsZU1vZGVsLmpzCmluZGV4IDAyY2Y5ZWZmNjRjMmRkZDUxMWY1YTczNmIyZTU0ZTE1ZDcx OWE4MzcuLmVkNmYzODgxNTM1ZDNjNDI5MjMxM2IxMWRmOWY4ODZmNTJlZmUxM2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMK QEAgLTY1LDkgKzY1LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICAvKioKICAgICAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/Kil9IHVzZXJDYWxs YmFjawogICAgICAgICAgKiBAcGFyYW0gez9Qcm90b2NvbC5FcnJvcn0gZXJyb3IKLSAgICAgICAg ICogQHBhcmFtIHs/QXJyYXkuPENTU0FnZW50LkNTU1J1bGU+fSBtYXRjaGVkUGF5bG9hZAotICAg ICAgICAgKiBAcGFyYW0gez9BcnJheS48Q1NTQWdlbnQuUHNldWRvSWRSdWxlcz59IHBzZXVkb1Bh eWxvYWQKLSAgICAgICAgICogQHBhcmFtIHs/QXJyYXkuPENTU0FnZW50LkluaGVyaXRlZFN0eWxl RW50cnk+fSBpbmhlcml0ZWRQYXlsb2FkCisgICAgICAgICAqIEBwYXJhbSB7QXJyYXkuPENTU0Fn ZW50LkNTU1J1bGU+PX0gbWF0Y2hlZFBheWxvYWQKKyAgICAgICAgICogQHBhcmFtIHtBcnJheS48 Q1NTQWdlbnQuUHNldWRvSWRSdWxlcz49fSBwc2V1ZG9QYXlsb2FkCisgICAgICAgICAqIEBwYXJh bSB7QXJyYXkuPENTU0FnZW50LkluaGVyaXRlZFN0eWxlRW50cnk+PX0gaW5oZXJpdGVkUGF5bG9h ZAogICAgICAgICAgKi8KICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2sodXNlckNhbGxiYWNrLCBl cnJvciwgbWF0Y2hlZFBheWxvYWQsIHBzZXVkb1BheWxvYWQsIGluaGVyaXRlZFBheWxvYWQpCiAg ICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29tcGlsZXJTb3VyY2VNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanMKaW5kZXggMmFkZDY5Y2NmMzI5OWM3MjVkYzE5 Y2UxZTFhMDhlZmM0YTdlMmIwYy4uZTE2OTc2NzcxZDAzNzc0YjdlOGE1ZTliMWY4ZTYxYWRlZWVj ZTE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21w aWxlclNvdXJjZU1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanMKQEAgLTcyLDcgKzcyLDcgQEAgV2ViSW5zcGVj dG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmdQYXlsb2FkID0gZnVuY3Rpb24oKQogICog QGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmd9CiAgKiBAY29u c3RydWN0b3IKICAqIEBwYXJhbSB7c3RyaW5nfSBzb3VyY2VNYXBwaW5nVVJMCi0gKiBAcGFyYW0g e3N0cmluZ30gc291cmNlVVJMCisgKiBAcGFyYW0ge3N0cmluZ30gc2NyaXB0U291cmNlT3JpZ2lu CiAgKi8KIFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nID0gZnVuY3Rp b24oc291cmNlTWFwcGluZ1VSTCwgc2NyaXB0U291cmNlT3JpZ2luKQogewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggOGUyMzNjY2JhODk1 NzE3ZGExN2VjYjJhYThiYzBmYmUxNDJiMGYwNi4uNmVlOTQyMzE2NTcxZDE5NmY5MzkzODA0NTI3 NzNiNjRmNzBiNzk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzCkBAIC01ODksNyArNTg5LDcgQEAgV2ViSW5zcGVjdG9yLkRPTUFnZW50LnBy b3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBwdXNoTm9kZVRvRnJvbnRlbmQ6IGZ1bmN0aW9uKG9i amVjdElkLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHRoaXMuX2Rpc3BhdGNoV2hlbkRvY3Vt ZW50QXZhaWxhYmxlKERPTUFnZW50LnJlcXVlc3ROb2RlLmJpbmQoRE9NQWdlbnQpLCBvYmplY3RJ ZCwgY2FsbGJhY2spOworICAgICAgICB0aGlzLl9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJs ZShET01BZ2VudC5yZXF1ZXN0Tm9kZS5iaW5kKERPTUFnZW50LCBvYmplY3RJZCksIGNhbGxiYWNr KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC01OTgsNyArNTk4LDggQEAgV2ViSW5zcGVjdG9yLkRP TUFnZW50LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBwdXNoTm9kZUJ5UGF0aFRvRnJvbnRl bmQ6IGZ1bmN0aW9uKHBhdGgsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdGhpcy5fZGlzcGF0 Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGUoRE9NQWdlbnQucHVzaE5vZGVCeVBhdGhUb0Zyb250ZW5k LmJpbmQoRE9NQWdlbnQpLCBwYXRoLCBjYWxsYmFjayk7CisgICAgICAgIHZhciBjYWxsYmFja0Nh c3QgPSAvKiogQHR5cGUge2Z1bmN0aW9uKCopfSAqLyBjYWxsYmFjazsKKyAgICAgICAgdGhpcy5f ZGlzcGF0Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGUoRE9NQWdlbnQucHVzaE5vZGVCeVBhdGhUb0Zy b250ZW5kLmJpbmQoRE9NQWdlbnQsIHBhdGgpLCBjYWxsYmFja0Nhc3QpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTYxOCwxOCArNjE5LDE3IEBAIFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oKiwgZnVu Y3Rpb24oKT0pfSBmdW5jCi0gICAgICogQHBhcmFtIHsqfSBhcmcKLSAgICAgKiBAcGFyYW0ge2Z1 bmN0aW9uKCk9fSBjYWxsYmFjaworICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oZnVuY3Rpb24oKT0p fSBmdW5jCisgICAgICogQHBhcmFtIHtmdW5jdGlvbigqKT19IGNhbGxiYWNrCiAgICAgICovCi0g ICAgX2Rpc3BhdGNoV2hlbkRvY3VtZW50QXZhaWxhYmxlOiBmdW5jdGlvbihmdW5jLCBhcmcsIGNh bGxiYWNrKQorICAgIF9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZTogZnVuY3Rpb24oZnVu YywgY2FsbGJhY2spCiAgICAgewotICAgICAgICB2YXIgY2FsbGJhY2tXcmFwcGVyID0gdGhpcy5f d3JhcENsaWVudENhbGxiYWNrKGNhbGxiYWNrKTsKKyAgICAgICAgdmFyIGNhbGxiYWNrV3JhcHBl ciA9IC8qKiBAdHlwZSB7ZnVuY3Rpb24oP1Byb3RvY29sLkVycm9yLCAqPSl9ICovIHRoaXMuX3dy YXBDbGllbnRDYWxsYmFjayhjYWxsYmFjayk7CiAKICAgICAgICAgZnVuY3Rpb24gb25Eb2N1bWVu dEF2YWlsYWJsZSgpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0aGlzLl9kb2N1bWVudCkK LSAgICAgICAgICAgICAgICBmdW5jLmNhbGwobnVsbCwgYXJnLCBjYWxsYmFja1dyYXBwZXIpOwor ICAgICAgICAgICAgICAgIGZ1bmMoY2FsbGJhY2tXcmFwcGVyKTsKICAgICAgICAgICAgIGVsc2Ug ewogICAgICAgICAgICAgICAgIGlmIChjYWxsYmFja1dyYXBwZXIpCiAgICAgICAgICAgICAgICAg ICAgIGNhbGxiYWNrV3JhcHBlcigiTm8gZG9jdW1lbnQiKTsKQEAgLTY4MiwxMiArNjgyLDE1IEBA IFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8qKgogICAgICAg ICAgKiBAdGhpcyB7V2ViSW5zcGVjdG9yLkRPTUFnZW50fQogICAgICAgICAgKiBAcGFyYW0ge0RP TUFnZW50Lk5vZGVJZH0gbm9kZUlkCisgICAgICAgICAqIEBwYXJhbSB7P1Byb3RvY29sLkVycm9y fSBlcnJvcgogICAgICAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBhdHRyaWJ1dGVzCiAg ICAgICAgICAqLwotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhub2RlSWQsIGF0dHJpYnV0ZXMp CisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKG5vZGVJZCwgZXJyb3IsIGF0dHJpYnV0ZXMpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIGlmICghYXR0cmlidXRlcykKKyAgICAgICAgICAgIGlmIChl cnJvcikgeworICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIkVycm9yIGR1cmluZyBET01B Z2VudCBvcGVyYXRpb246ICIgKyBlcnJvcik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgdmFyIG5vZGUgPSB0aGlzLl9pZFRvRE9NTm9kZVtub2Rl SWRdOwogICAgICAgICAgICAgaWYgKG5vZGUpIHsKICAgICAgICAgICAgICAgICBub2RlLl9zZXRB dHRyaWJ1dGVzUGF5bG9hZChhdHRyaWJ1dGVzKTsKQEAgLTY5OCw4ICs3MDEsMTAgQEAgV2ViSW5z cGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBkZWxldGUgdGhpcy5fbG9h ZE5vZGVBdHRyaWJ1dGVzVGltZW91dDsKIAotICAgICAgICBmb3IgKHZhciBub2RlSWQgaW4gdGhp cy5fYXR0cmlidXRlTG9hZE5vZGVJZHMpCi0gICAgICAgICAgICBET01BZ2VudC5nZXRBdHRyaWJ1 dGVzKHBhcnNlSW50KG5vZGVJZCwgMTApLCB0aGlzLl93cmFwQ2xpZW50Q2FsbGJhY2soY2FsbGJh Y2suYmluZCh0aGlzLCBub2RlSWQpKSk7CisgICAgICAgIGZvciAodmFyIG5vZGVJZCBpbiB0aGlz Ll9hdHRyaWJ1dGVMb2FkTm9kZUlkcykgeworICAgICAgICAgICAgdmFyIG5vZGVJZEFzTnVtYmVy ID0gcGFyc2VJbnQobm9kZUlkLCAxMCk7CisgICAgICAgICAgICBET01BZ2VudC5nZXRBdHRyaWJ1 dGVzKG5vZGVJZEFzTnVtYmVyLCBjYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZEFzTnVtYmVyKSk7 CisgICAgICAgIH0KICAgICAgICAgdGhpcy5fYXR0cmlidXRlTG9hZE5vZGVJZHMgPSB7fTsKICAg ICB9LAogCkBAIC04OTAsMjEgKzg5NSwyMyBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90 eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7RE9NQWdlbnQuTm9kZUlkfSBub2RlSWQK ICAgICAgKiBAcGFyYW0ge3N0cmluZ30gc2VsZWN0b3JzCi0gICAgICogQHBhcmFtIHtmdW5jdGlv bigqKT19IGNhbGxiYWNrCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/RE9NQWdlbnQuTm9kZUlk KT19IGNhbGxiYWNrCiAgICAgICovCiAgICAgcXVlcnlTZWxlY3RvcjogZnVuY3Rpb24obm9kZUlk LCBzZWxlY3RvcnMsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxl Y3Rvcihub2RlSWQsIHNlbGVjdG9ycywgdGhpcy5fd3JhcENsaWVudENhbGxiYWNrKGNhbGxiYWNr KSk7CisgICAgICAgIHZhciBjYWxsYmFja0Nhc3QgPSAvKiogQHR5cGUge2Z1bmN0aW9uKCopfHVu ZGVmaW5lZH0gKi9jYWxsYmFjazsKKyAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxlY3Rvcihub2Rl SWQsIHNlbGVjdG9ycywgdGhpcy5fd3JhcENsaWVudENhbGxiYWNrKGNhbGxiYWNrQ2FzdCkpOwog ICAgIH0sCiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0RPTUFnZW50Lk5vZGVJZH0gbm9kZUlk CiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHNlbGVjdG9ycwotICAgICAqIEBwYXJhbSB7ZnVuY3Rp b24oKik9fSBjYWxsYmFjaworICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP0FycmF5LjxET01BZ2Vu dC5Ob2RlSWQ+KT19IGNhbGxiYWNrCiAgICAgICovCiAgICAgcXVlcnlTZWxlY3RvckFsbDogZnVu Y3Rpb24obm9kZUlkLCBzZWxlY3RvcnMsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdl bnQucXVlcnlTZWxlY3RvckFsbChub2RlSWQsIHNlbGVjdG9ycywgdGhpcy5fd3JhcENsaWVudENh bGxiYWNrKGNhbGxiYWNrKSk7CisgICAgICAgIHZhciBjYWxsYmFja0Nhc3QgPSAvKiogQHR5cGUg e2Z1bmN0aW9uKCopfHVuZGVmaW5lZH0gKi9jYWxsYmFjazsKKyAgICAgICAgRE9NQWdlbnQucXVl cnlTZWxlY3RvckFsbChub2RlSWQsIHNlbGVjdG9ycywgdGhpcy5fd3JhcENsaWVudENhbGxiYWNr KGNhbGxiYWNrQ2FzdCkpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBiODVkMDU4ZTM3 MjBhMzQwM2NiNWVmNWM1YzEyOGRiMTJmZTNjYmVlLi45MDg4OTYxMDAzMmViNTQyN2MzOWE3YTZl YTMxYTkzZGJiZjA5OTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC0xNDUsNyArMTQ1LDcgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5l TnVtYmVyCiAgICAgICogQHBhcmFtIHtudW1iZXI9fSBjb2x1bW5OdW1iZXIKICAgICAgKiBAcGFy YW0ge3N0cmluZz19IGNvbmRpdGlvbgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP0RlYnVnZ2Vy QWdlbnQuQnJlYWtwb2ludElkLCBBcnJheS48RGVidWdnZXJBZ2VudC5Mb2NhdGlvbj4pPX0gY2Fs bGJhY2sKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9EZWJ1Z2dlckFnZW50LkJyZWFrcG9pbnRJ ZCwgQXJyYXkuPERlYnVnZ2VyQWdlbnQuTG9jYXRpb24+PSk9fSBjYWxsYmFjawogICAgICAqLwog ICAgIHNldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHVybCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVy LCBjb25kaXRpb24sIGNhbGxiYWNrKQogICAgIHsKQEAgLTE2Miw3ICsxNjIsNyBAQCBXZWJJbnNw ZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAqIEB0aGlzIHtXZWJJ bnNwZWN0b3IuRGVidWdnZXJNb2RlbH0KICAgICAgICAgICogQHBhcmFtIHs/UHJvdG9jb2wuRXJy b3J9IGVycm9yCiAgICAgICAgICAqIEBwYXJhbSB7RGVidWdnZXJBZ2VudC5CcmVha3BvaW50SWR9 IGJyZWFrcG9pbnRJZAotICAgICAgICAgKiBAcGFyYW0ge0FycmF5LjxEZWJ1Z2dlckFnZW50Lkxv Y2F0aW9uPn0gbG9jYXRpb25zCisgICAgICAgICAqIEBwYXJhbSB7QXJyYXkuPERlYnVnZ2VyQWdl bnQuTG9jYXRpb24+PX0gbG9jYXRpb25zCiAgICAgICAgICAqLwogICAgICAgICBmdW5jdGlvbiBk aWRTZXRCcmVha3BvaW50KGVycm9yLCBicmVha3BvaW50SWQsIGxvY2F0aW9ucykKICAgICAgICAg ewpAQCAtMjc0LDcgKzI3NCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbmV3U291cmNlCiAgICAgICogQHBhcmFtIHtm dW5jdGlvbig/UHJvdG9jb2wuRXJyb3IpfSBjYWxsYmFjawogICAgICAqIEBwYXJhbSB7P1Byb3Rv Y29sLkVycm9yfSBlcnJvcgotICAgICAqIEBwYXJhbSB7QXJyYXkuPERlYnVnZ2VyQWdlbnQuQ2Fs bEZyYW1lPn0gY2FsbEZyYW1lcworICAgICAqIEBwYXJhbSB7QXJyYXkuPERlYnVnZ2VyQWdlbnQu Q2FsbEZyYW1lPj19IGNhbGxGcmFtZXMKICAgICAgKi8KICAgICBfZGlkRWRpdFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24oc2NyaXB0SWQsIG5ld1NvdXJjZSwgY2FsbGJhY2ssIGVycm9yLCBjYWxsRnJh bWVzKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBlN2M1NzlhMTgy NTdhY2ZjMWYyNjQyNGI0ODMyZTc0OGRmZmQ1ZmY5Li42MzYwNDU5MTk0ZmMzYTQ2OWVmNjUxYTJh MjYyMjAyNWUxZjQ1ZDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC03NTUs NyArNzU1LDcgQEAgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUg PSB7CiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG9iamVjdEdyb3VwCiAgICAgICogQHBhcmFtIHti b29sZWFufSBpbmNsdWRlQ29tbWFuZExpbmVBUEkKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHJl dHVybkJ5VmFsdWUKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9SdW50aW1lQWdlbnQuUmVtb3Rl T2JqZWN0LCBib29sZWFuKT19IGNhbGxiYWNrCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/UnVu dGltZUFnZW50LlJlbW90ZU9iamVjdCwgYm9vbGVhbj0pPX0gY2FsbGJhY2sKICAgICAgKi8KICAg ICBldmFsdWF0ZTogZnVuY3Rpb24oY29kZSwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGlu ZUFQSSwgcmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spCiAgICAgewpAQCAtNzYzLDcgKzc2Myw3IEBA IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUucHJvdG90eXBlID0gewogICAgICAg ICAgKiBAdGhpcyB7V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZX0KICAgICAgICAg ICogQHBhcmFtIHs/UHJvdG9jb2wuRXJyb3J9IGVycm9yCiAgICAgICAgICAqIEBwYXJhbSB7UnVu dGltZUFnZW50LlJlbW90ZU9iamVjdH0gcmVzdWx0Ci0gICAgICAgICAqIEBwYXJhbSB7Ym9vbGVh bn0gd2FzVGhyb3duCisgICAgICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHdhc1Rocm93bgogICAg ICAgICAgKi8KICAgICAgICAgZnVuY3Rpb24gZGlkRXZhbHVhdGVPbkNhbGxGcmFtZShlcnJvciwg cmVzdWx0LCB3YXNUaHJvd24pCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKaW5kZXggNmM0OWU2MDg5Y2ZkMjlmNmYz MjNkZmU0NzIxMjA4NTE3MmQzMWU1Yi4uMjIwZDc4YmRlYzdjOWZkNmQ3NWEzODY1Yjk5MmJjN2Fj ZTdmYjExZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25BUEkuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25BUEkuanMKQEAgLTE2OSw3ICsxNjksNyBAQCBmdW5jdGlvbiBJbnNwZWN0b3JFeHRl bnNpb25BUEkoKQogICAgIHRoaXMubmV0d29yayA9IG5ldyBOZXR3b3JrKCk7CiAgICAgZGVmaW5l RGVwcmVjYXRlZFByb3BlcnR5KHRoaXMsICJ3ZWJJbnNwZWN0b3IiLCAicmVzb3VyY2VzIiwgIm5l dHdvcmsiKTsKICAgICB0aGlzLnRpbWVsaW5lID0gbmV3IFRpbWVsaW5lKCk7Ci0gICAgdGhpcy5j b25zb2xlID0gbmV3IENvbnNvbGUoKTsKKyAgICB0aGlzLmNvbnNvbGUgPSBuZXcgQ29uc29sZUFQ SSgpOwogCiAgICAgdGhpcy5vblJlc2V0ID0gbmV3IEV2ZW50U2luayhldmVudHMuUmVzZXQpOwog fQpAQCAtMTg3LDEyICsxODcsMTIgQEAgSW5zcGVjdG9yRXh0ZW5zaW9uQVBJLnByb3RvdHlwZSA9 IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KLWZ1bmN0aW9uIENvbnNvbGUoKQorZnVuY3Rp b24gQ29uc29sZUFQSSgpCiB7CiAgICAgdGhpcy5vbk1lc3NhZ2VBZGRlZCA9IG5ldyBFdmVudFNp bmsoZXZlbnRzLkNvbnNvbGVNZXNzYWdlQWRkZWQpOwogfQogCi1Db25zb2xlLnByb3RvdHlwZSA9 IHsKK0NvbnNvbGVBUEkucHJvdG90eXBlID0gewogICAgIGdldE1lc3NhZ2VzOiBmdW5jdGlvbihj YWxsYmFjaykKICAgICB7CiAgICAgICAgIGV4dGVuc2lvblNlcnZlci5zZW5kUmVxdWVzdCh7IGNv bW1hbmQ6IGNvbW1hbmRzLkdldENvbnNvbGVNZXNzYWdlcyB9LCBjYWxsYmFjayk7CkBAIC04MTAs NyArODEwLDcgQEAgcmV0dXJuIG5ldyBJbnNwZWN0b3JFeHRlbnNpb25BUEkoKTsKIH0KIAogLy8g RGVmYXVsdCBpbXBsZW1lbnRhdGlvbjsgcGxhdGZvcm1zIHdpbGwgb3ZlcnJpZGUuCi1mdW5jdGlv biBidWlsZFBsYXRmb3JtRXh0ZW5zaW9uQVBJKCkKK2Z1bmN0aW9uIGJ1aWxkUGxhdGZvcm1FeHRl bnNpb25BUEkoZXh0ZW5zaW9uSW5mbykKIHsKICAgICBmdW5jdGlvbiBwbGF0Zm9ybUV4dGVuc2lv bkFQSShjb3JlQVBJKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzCmluZGV4IDhhMjUyNzViNzg0ZTYxZGNiOTdiZGIz NmNiZGJlYzNlMDE1NjQwZDYuLjAyZGU2ZTE2NTNkZmZhZWI5NzAzZGEwOThkYmZkNTlmMTQ4MTBl ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5z aW9uUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRl bnNpb25QYW5lbC5qcwpAQCAtMjc3LDkgKzI3Nyw5IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25T aWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9 IHRpdGxlCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nPSl9IGNhbGxiYWNrCi0gICAg ICogQHBhcmFtIHtQcm90b2NvbC5FcnJvcn0gZXJyb3IKLSAgICAgKiBAcGFyYW0ge09iamVjdH0g cmVzdWx0Ci0gICAgICogQHBhcmFtIHtib29sZWFufSB3YXNUaHJvd24KKyAgICAgKiBAcGFyYW0g ez9Qcm90b2NvbC5FcnJvcn0gZXJyb3IKKyAgICAgKiBAcGFyYW0ge1J1bnRpbWVBZ2VudC5SZW1v dGVPYmplY3R9IHJlc3VsdAorICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHdhc1Rocm93bgogICAg ICAqLwogICAgIF9vbkV2YWx1YXRlOiBmdW5jdGlvbih0aXRsZSwgY2FsbGJhY2ssIGVycm9yLCBy ZXN1bHQsIHdhc1Rocm93bikKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCAxYjcwN2VlNDdmYTNkMDA0ZTEw YjUzZDRkMmYwMWFlZTRmMjIzYzJjLi5mYTQ4YTllMjc4YTk2N2IzYTNkODA3YTc5NzA4MzJiMWVh MmY3MTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya01hbmFnZXIuanMKQEAgLTc3LDE0ICs3NywyMCBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a01hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgZW5hYmxlUmVzb3VyY2VUcmFja2luZzogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIG5ldHdvcmtBZ2VudEVuYWJsZWQgPSB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycy5iaW5kKHRoaXMsIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFu YWdlci5FdmVudFR5cGVzLlJlc291cmNlVHJhY2tpbmdFbmFibGVkKTsKLSAgICAgICAgTmV0d29y a0FnZW50LmVuYWJsZShuZXR3b3JrQWdlbnRFbmFibGVkKTsKKyAgICAgICAgZnVuY3Rpb24gY2Fs bGJhY2soZXJyb3IpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNl VHJhY2tpbmdFbmFibGVkKTsKKyAgICAgICAgfQorICAgICAgICBOZXR3b3JrQWdlbnQuZW5hYmxl KGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBkaXNhYmxlUmVzb3VyY2VUcmFj a2luZzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIG5ldHdvcmtBZ2VudERpc2FibGVk ID0gdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMuYmluZCh0aGlzLCBXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQpOwotICAg ICAgICBOZXR3b3JrQWdlbnQuZGlzYWJsZShuZXR3b3JrQWdlbnREaXNhYmxlZCk7CisgICAgICAg IGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRU eXBlcy5SZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQpOworICAgICAgICB9CisgICAgICAgIE5ldHdv cmtBZ2VudC5kaXNhYmxlKGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgaW5mbGlnaHRSZXNvdXJj ZUZvclVSTDogZnVuY3Rpb24odXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdC5qcwppbmRleCAyMWNmYmYxY2E3ZDJhNjU5NzUzMTY3YTI2MzRlZTc0MDJhMTQ0 MTk0Li43MTJhMTNmZjQ0MDEzMWY5YmY5MTczMGNmMzRiMDNlZTgxNjNhMWY2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwpAQCAtMzIsNiArMzIsNyBA QAogICogQHBhcmFtIHtudW1iZXJ9IGVuZExpbmUKICAqIEBwYXJhbSB7bnVtYmVyfSBlbmRDb2x1 bW4KICAqIEBwYXJhbSB7Ym9vbGVhbn0gaXNDb250ZW50U2NyaXB0CisgKiBAcGFyYW0ge3N0cmlu Zz19IHNvdXJjZU1hcFVSTAogICovCiBXZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc2Ny aXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29s dW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNvdXJjZU1hcFVSTCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IDZiOTM0MjVkODFkNmEwMWY2 ZmFhYjE2MzhkZDBlOTM2N2FhYjk0M2IuLmFjZjU3ZTNlNDc0YmM1MGI4MjBjYTViZGM3MTVkMTQ4 YmMzMjBkZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5ncy5qcwpAQCAtNDQsNyArNDQsOCBAQCB2YXIgUHJlZmVyZW5jZXMgPSB7CiAgICAgZXhwb3Nl V29ya2Vyc0luc3BlY3Rpb246IGZhbHNlLAogICAgIGFwcGxpY2F0aW9uVGl0bGU6ICJXZWIgSW5z cGVjdG9yIC0gJXMiLAogICAgIC8vIEZJWE1FOiBSZW1vdmUgb25jZSBuYXZpZ2F0b3IgaXMgcHJv ZHVjdGlvbi1yZWFkeS4KLSAgICB1c2VTY3JpcHROYXZpZ2F0b3I6IGZhbHNlCisgICAgdXNlU2Ny aXB0TmF2aWdhdG9yOiBmYWxzZSwKKyAgICBzaG93SGVhcFNuYXBzaG90T2JqZWN0c0hpZGRlblBy b3BlcnRpZXM6IGZhbHNlCiB9CiAKIHZhciBDYXBhYmlsaXRpZXMgPSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKaW5kZXggMDkxNjllMjlj NzEwZGE1NzUxOTViMmZkNTlkODAyZmM2MjFkYzcwNy4uNWZmODcyZmE3MDIzODYzNDY3MmYwNTQ1 ZWU4OTE4NmU2NTExZjQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0UHJvbXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGV4dFByb21wdC5qcwpAQCAtMzAsNyArMzAsNyBAQAogLyoqCiAgKiBAY29uc3RydWN0 b3IKICAqIEBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKLSAqIEBwYXJhbSB7ZnVuY3Rpb24o UmFuZ2UsIGJvb2xlYW4sIGZ1bmN0aW9uKCopKX0gY29tcGxldGlvbnMKKyAqIEBwYXJhbSB7ZnVu Y3Rpb24oUmFuZ2UsIGJvb2xlYW4sIGZ1bmN0aW9uKEFycmF5LjxzdHJpbmc+PSkpfSBjb21wbGV0 aW9ucwogICogQHBhcmFtIHtzdHJpbmd9IHN0b3BDaGFyYWN0ZXJzCiAgKi8KIFdlYkluc3BlY3Rv ci5UZXh0UHJvbXB0ID0gZnVuY3Rpb24oY29tcGxldGlvbnMsIHN0b3BDaGFyYWN0ZXJzKQpAQCAt MzY1LDcgKzM2NSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAg ICAgICAgfQogCiAgICAgICAgIHZhciB3b3JkUHJlZml4UmFuZ2UgPSBzZWxlY3Rpb25SYW5nZS5z dGFydENvbnRhaW5lci5yYW5nZU9mV29yZChzZWxlY3Rpb25SYW5nZS5zdGFydE9mZnNldCwgdGhp cy5fY29tcGxldGlvblN0b3BDaGFyYWN0ZXJzLCB0aGlzLl9lbGVtZW50LCAiYmFja3dhcmQiKTsK LSAgICAgICAgdGhpcy5fbG9hZENvbXBsZXRpb25zKHdvcmRQcmVmaXhSYW5nZSwgZm9yY2UsIHRo aXMuX2NvbXBsZXRpb25zUmVhZHkuYmluZCh0aGlzLCBzZWxlY3Rpb24sIGF1dG8sIHdvcmRQcmVm aXhSYW5nZSwgcmV2ZXJzZSkpOworICAgICAgICB0aGlzLl9sb2FkQ29tcGxldGlvbnMod29yZFBy ZWZpeFJhbmdlLCBmb3JjZSwgdGhpcy5fY29tcGxldGlvbnNSZWFkeS5iaW5kKHRoaXMsIHNlbGVj dGlvbiwgYXV0bywgd29yZFByZWZpeFJhbmdlLCAhIXJldmVyc2UpKTsKICAgICB9LAogCiAgICAg X2JveEZvckFuY2hvckF0U3RhcnQ6IGZ1bmN0aW9uKHNlbGVjdGlvbiwgdGV4dFJhbmdlKQpAQCAt MzgyLDYgKzM4MiwxMCBAQCBXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7U2VsZWN0aW9ufSBzZWxlY3Rpb24KKyAg ICAgKiBAcGFyYW0ge2Jvb2xlYW59IGF1dG8KKyAgICAgKiBAcGFyYW0ge1JhbmdlfSBvcmlnaW5h bFdvcmRQcmVmaXhSYW5nZQorICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gcmV2ZXJzZQogICAgICAq IEBwYXJhbSB7QXJyYXkuPHN0cmluZz49fSBjb21wbGV0aW9ucwogICAgICAqLwogICAgIF9jb21w bGV0aW9uc1JlYWR5OiBmdW5jdGlvbihzZWxlY3Rpb24sIGF1dG8sIG9yaWdpbmFsV29yZFByZWZp eFJhbmdlLCByZXZlcnNlLCBjb21wbGV0aW9ucykKQEAgLTY3Miw3ICs2NzYsNyBAQCBXZWJJbnNw ZWN0b3IuVGV4dFByb21wdC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVj dC5wcm90b3R5cGU7CiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3Bl Y3Rvci5UZXh0UHJvbXB0fQotICogQHBhcmFtIHtmdW5jdGlvbihSYW5nZSwgYm9vbGVhbiwgZnVu Y3Rpb24oKikpfSBjb21wbGV0aW9ucworICogQHBhcmFtIHtmdW5jdGlvbihSYW5nZSwgYm9vbGVh biwgZnVuY3Rpb24oQXJyYXkuPHN0cmluZz49KSl9IGNvbXBsZXRpb25zCiAgKiBAcGFyYW0ge3N0 cmluZ30gc3RvcENoYXJhY3RlcnMKICAqLwogV2ViSW5zcGVjdG9yLlRleHRQcm9tcHRXaXRoSGlz dG9yeSA9IGZ1bmN0aW9uKGNvbXBsZXRpb25zLCBzdG9wQ2hhcmFjdGVycykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5kZXggZTBjMGE2MjM2 NWE0MDhhYmQwODY5YzhlOTM4ZjM2YjU0ZTg2OWM0MS4uNzRmODIxZDZjMWNhZjQwYjgzM2ZkYzQz YWY1MzhiMTEzMjI1NzAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC91dGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC91dGlsaXRpZXMuanMKQEAgLTI5LDIwICsyOSw2IEBACiAgKiBodHRwOi8vZWpvaG4ub3Jn L2ZpbGVzL2pzZGlmZi5qcyAocmVsZWFzZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlKS4KICAqLwog Ci1GdW5jdGlvbi5wcm90b3R5cGUuYmluZCA9IGZ1bmN0aW9uKHRoaXNPYmplY3QpCi17Ci0gICAg dmFyIGZ1bmMgPSB0aGlzOwotICAgIHZhciBhcmdzID0gQXJyYXkucHJvdG90eXBlLnNsaWNlLmNh bGwoYXJndW1lbnRzLCAxKTsKLSAgICBmdW5jdGlvbiBib3VuZCgpCi0gICAgewotICAgICAgICBy ZXR1cm4gZnVuYy5hcHBseSh0aGlzT2JqZWN0LCBhcmdzLmNvbmNhdChBcnJheS5wcm90b3R5cGUu c2xpY2UuY2FsbChhcmd1bWVudHMsIDApKSk7Ci0gICAgfQotICAgIGJvdW5kLnRvU3RyaW5nID0g ZnVuY3Rpb24oKSB7Ci0gICAgICAgIHJldHVybiAiYm91bmQ6ICIgKyBmdW5jOwotICAgIH07Ci0g ICAgcmV0dXJuIGJvdW5kOwotfQotCiAvKioKICAqIEBwYXJhbSB7c3RyaW5nPX0gZGlyZWN0aW9u CiAgKi8K