104557 2012-12-10 07:37:11 -0800 Web Inspector: fix front-end compilation warnings 2012-12-10 08:19:42 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 787322 0 pfeldman 2012-12-10 07:37:11 -0800 There is a bunch of random warnings on tip of tree 787343 1 178555 pfeldman 2012-12-10 08:04:40 -0800 Created attachment 178555 Patch 787356 2 pfeldman 2012-12-10 08:19:42 -0800 Committed r137160: <http://trac.webkit.org/changeset/137160> 178555 2012-12-10 08:04:40 -0800 2012-12-10 08:08:21 -0800 Patch bug-104557-20121210200201.patch text/plain 11658 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTA4NzdiNTQxZjcwYzMw NzUyNzU4Y2U1ZWY3OTg5ODA2ZTA1OGQ3My4uYTYzYzM2YjEyYzUwOGI4MGI3OTI2MmMyNmNkM2Rm NDhlYjVlNWZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEyLTEyLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpeCBmcm9udC1lbmQgY29tcGlsYXRpb24gd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDU1NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlc3BvbmRpbmcgYW5ub3RhdGlvbnMg YWRkZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckRPTUFnZW50OjpoaWdobGlnaHROb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckRPTUFnZW50KToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wcm90b3R5cGUuKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZS5pbnNlcnRQcm9wZXJ0eUF0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuX2FwcGVuZFByb3BlcnR5UHJl dmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuaGlnaGxpZ2h0RE9NTm9kZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01QcmVzZW50YXRpb25VdGlscy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01QcmVzZW50YXRpb25VdGlscy5saW5raWZ5Tm9kZVJlZmVy ZW5jZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2Vj dGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50 LnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJh ci5qczoKKworMjAxMi0xMi0xMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgdGhlIE92ZXJyaWRlcyAvIFNldHRp bmdzIGNvbnRleHQgbWVudSBmcm9tIGdlYXIgaWNvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NTQ2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgppbmRleCA5N2M2ZWEzYjUxNmEyMWU3ZmU5MGY4ZTIzNDZkZWQ5OWViYzlj YzFiLi40OTg4ZWZiYmNjNGMxMzZkNGEwMWQyOTZlMjdmOTAzMDI5NTI1MjgzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xODY3LDkgKzE4NjcsOSBAQAogICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdodE5vZGUiLAogICAg ICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImhpZ2hsaWdodENvbmZpZyIsICIkcmVmIjogIkhpZ2hsaWdodENvbmZpZyIsICAiZGVzY3Jp cHRpb24iOiAiQSBkZXNjcmlwdG9yIGZvciB0aGUgaGlnaGxpZ2h0IGFwcGVhcmFuY2UuIiB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICIkcmVmIjogIk5vZGVJZCIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBub2Rl IHRvIGhpZ2hsaWdodC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0 SWQiLCAiJHJlZiI6ICJSdW50aW1lLlJlbW90ZU9iamVjdElkIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIkphdmFTY3JpcHQgb2JqZWN0IGlkIG9mIHRoZSBub2RlIHRvIGJlIGhp Z2hsaWdodGVkLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoaWdobGlnaHRD b25maWciLCAiJHJlZiI6ICJIaWdobGlnaHRDb25maWciLCAiZGVzY3JpcHRpb24iOiAiQSBkZXNj cmlwdG9yIGZvciB0aGUgaGlnaGxpZ2h0IGFwcGVhcmFuY2UuIiB9CisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAiJHJlZiI6ICJSdW50aW1lLlJlbW90ZU9iamVjdElk IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkphdmFTY3JpcHQgb2JqZWN0IGlk IG9mIHRoZSBub2RlIHRvIGJlIGhpZ2hsaWdodGVkLiIgfQogICAgICAgICAgICAgICAgIF0sCiAg ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgRE9NIG5vZGUgd2l0aCBn aXZlbiBpZCBvciB3aXRoIHRoZSBnaXZlbiBKYXZhU2NyaXB0IG9iamVjdCB3cmFwcGVyLiBFaXRo ZXIgbm9kZUlkIG9yIG9iamVjdElkIG11c3QgYmUgc3BlY2lmaWVkLiIKICAgICAgICAgICAgIH0s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRl eCA0OTE1YTBjMmRhYWQwZDIzYWIzZDQ4NzgxNjkxYTExM2EwZDBjYjk0Li4wZThhNzhkOGFkYjVm N2ViM2Y3YTIzYzhmMDY4Mjg0OWVmYzY4NzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTEwNzIsNyArMTA3Miw3IEBAIHZvaWQgSW5z cGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodFJlY3QoRXJyb3JTdHJpbmcqLCBpbnQgeCwgaW50IHks IGludCB3aWR0aCwgaW50CiAgICAgbV9vdmVybGF5LT5oaWdobGlnaHRSZWN0KGFkb3B0UHRyKG5l dyBJbnRSZWN0KHgsIHksIHdpZHRoLCBoZWlnaHQpKSwgKmhpZ2hsaWdodENvbmZpZyk7CiB9CiAK LXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqIGVycm9y U3RyaW5nLCBjb25zdCBpbnQqIG5vZGVJZCwgY29uc3QgU3RyaW5nKiBvYmplY3RJZCwgY29uc3Qg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCkKK3ZvaWQg SW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5n LCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0 LCBjb25zdCBpbnQqIG5vZGVJZCwgY29uc3QgU3RyaW5nKiBvYmplY3RJZCkKIHsKICAgICBOb2Rl KiBub2RlID0gMDsKICAgICBpZiAobm9kZUlkKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDgwY2Q1MDgxN2M2NzdjYjMzYzU1M2RiZjRiMTU2 YzQwZjg5YTczN2IuLjMwODA2ZDIyYWY1MjE3OTJmMmE4NzdjYzcxZjlmZmYxMjhhNWMzOWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC0xNDIs NyArMTQyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwdXNoTm9kZUJ5UGF0aFRvRnJv bnRlbmQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHBhdGgsIGludCogbm9kZUlkKTsKICAg ICB2aXJ0dWFsIHZvaWQgaGlkZUhpZ2hsaWdodChFcnJvclN0cmluZyopOwogICAgIHZpcnR1YWwg dm9pZCBoaWdobGlnaHRSZWN0KEVycm9yU3RyaW5nKiwgaW50IHgsIGludCB5LCBpbnQgd2lkdGgs IGludCBoZWlnaHQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBjb2xvciwgY29uc3Qg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG91dGxpbmVDb2xvcik7Ci0gICAgdmlydHVhbCB2b2lk IGhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqLCBjb25zdCBpbnQqIG5vZGVJZCwgY29uc3QgU3Ry aW5nKiBvYmplY3RJZCwgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIGhpZ2hsaWdodENv bmZpZyk7CisgICAgdmlydHVhbCB2b2lkIGhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqLCBjb25z dCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgaGlnaGxpZ2h0Q29uZmlnLCBjb25zdCBpbnQqIG5v ZGVJZCwgY29uc3QgU3RyaW5nKiBvYmplY3RJZCk7CiAgICAgdmlydHVhbCB2b2lkIGhpZ2hsaWdo dEZyYW1lKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiogY29sb3IsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBv dXRsaW5lQ29sb3IpOwogICAgIHZpcnR1YWwgdm9pZCBtb3ZlVG8oRXJyb3JTdHJpbmcqLCBpbnQg bm9kZUlkLCBpbnQgdGFyZ2V0Tm9kZUlkLCBjb25zdCBpbnQqIGFuY2hvck5vZGVJZCwgaW50KiBu ZXdOb2RlSWQpOwogICAgIHZpcnR1YWwgdm9pZCB1bmRvKEVycm9yU3RyaW5nKik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKaW5k ZXggZmFjNzcwY2Y5ZDg4NDM1MGIyOGIzZDBmNjY1MmUxNGI3YWQ4NTFiZi4uODJkZjk4YzVhZDEy NTczOTAzOGMwYWM0MWEyMjA5NzhjOTk2OTI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwpAQCAtNzczLDE2ICs3NzMsMTUg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucHJvdG90eXBlID0gewogICAgICAq IEBwYXJhbSB7bnVtYmVyfSBpbmRleAogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBuYW1lCiAgICAg ICogQHBhcmFtIHtzdHJpbmd9IHZhbHVlCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbig/V2ViSW5z cGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24pfSB1c2VyQ2FsbGJhY2sKKyAgICAgKiBAcGFyYW0g e2Z1bmN0aW9uKD9XZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbik9fSB1c2VyQ2FsbGJh Y2sKICAgICAgKi8KICAgICBpbnNlcnRQcm9wZXJ0eUF0OiBmdW5jdGlvbihpbmRleCwgbmFtZSwg dmFsdWUsIHVzZXJDYWxsYmFjaykKICAgICB7CiAgICAgICAgIC8qKgotICAgICAgICAgKiBAcGFy YW0ge2Z1bmN0aW9uKD9XZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbil9IHVzZXJDYWxs YmFjawogICAgICAgICAgKiBAcGFyYW0gez9zdHJpbmd9IGVycm9yCiAgICAgICAgICAqIEBwYXJh bSB7Q1NTQWdlbnQuQ1NTU3R5bGV9IHBheWxvYWQKICAgICAgICAgICovCi0gICAgICAgIGZ1bmN0 aW9uIGNhbGxiYWNrKHVzZXJDYWxsYmFjaywgZXJyb3IsIHBheWxvYWQpCisgICAgICAgIGZ1bmN0 aW9uIGNhbGxiYWNrKGVycm9yLCBwYXlsb2FkKQogICAgICAgICB7CiAgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuY3NzTW9kZWwuX3BlbmRpbmdDb21tYW5kc01ham9yU3RhdGUucG9wKCk7CiAgICAg ICAgICAgICBpZiAoIXVzZXJDYWxsYmFjaykKQEAgLTgwMCwxMyArNzk5LDEzIEBAIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRocm93 ICJObyBzdHlsZSBpZCI7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLl9wZW5kaW5n Q29tbWFuZHNNYWpvclN0YXRlLnB1c2godHJ1ZSk7Ci0gICAgICAgIENTU0FnZW50LnNldFByb3Bl cnR5VGV4dCh0aGlzLmlkLCBpbmRleCwgbmFtZSArICI6ICIgKyB2YWx1ZSArICI7IiwgZmFsc2Us IGNhbGxiYWNrLmJpbmQodGhpcywgdXNlckNhbGxiYWNrKSk7CisgICAgICAgIENTU0FnZW50LnNl dFByb3BlcnR5VGV4dCh0aGlzLmlkLCBpbmRleCwgbmFtZSArICI6ICIgKyB2YWx1ZSArICI7Iiwg ZmFsc2UsIGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge3N0cmluZ30gbmFtZQogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB2YWx1ZQotICAgICAq IEBwYXJhbSB7ZnVuY3Rpb24oP1dlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKX0gdXNl ckNhbGxiYWNrCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/V2ViSW5zcGVjdG9yLkNTU1N0eWxl RGVjbGFyYXRpb24pPX0gdXNlckNhbGxiYWNrCiAgICAgICovCiAgICAgYXBwZW5kUHJvcGVydHk6 IGZ1bmN0aW9uKG5hbWUsIHZhbHVlLCB1c2VyQ2FsbGJhY2spCiAgICAgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKaW5kZXgg ZTBmYzIxNGZjZTBhNzU3Y2NiNjNhNDVjMmUzOTU4MzlmYzdiOWYwYy4uMDgxN2Y3OWZhZjBkNGJj MjZlNWQ5ZTUxOGNhNjg3YThiNGRkZTk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCkBAIC0zNDksNyArMzQ5LDcgQEAg V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocHJvcGVydHkudHlwZSA9PT0gIm9i amVjdCIgJiYgcHJvcGVydHkuc3VidHlwZSA9PT0gIm5vZGUiKSB7CisgICAgICAgIGlmIChwcm9w ZXJ0eS50eXBlID09PSAib2JqZWN0IiAmJiBwcm9wZXJ0eS5zdWJ0eXBlID09PSAibm9kZSIgJiYg cHJvcGVydHkudmFsdWUpIHsKICAgICAgICAgICAgIHNwYW4uYWRkU3R5bGVDbGFzcygiY29uc29s ZS1mb3JtYXR0ZWQtcHJldmlldy1ub2RlIik7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuRE9N UHJlc2VudGF0aW9uVXRpbHMuY3JlYXRlU3BhbnNGb3JOb2RlVGl0bGUoc3BhbiwgcHJvcGVydHku dmFsdWUpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggYWZiYmQ3NjU1MTFkMmIzZDNlOGYwNWY5YjI0 MzUxMTQ3YzMxY2VkMS4uYWE5NjRmMzhiNjE2YjQ2MzZhMDVmM2Y5NzFjYjE5MzU3MDJiYTQxMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBA IC0xMTk2LDcgKzExOTYsNyBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0gewog ICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0gez9udW1iZXJ9IG5vZGVJZAorICAgICAq IEBwYXJhbSB7RE9NQWdlbnQuTm9kZUlkPX0gbm9kZUlkCiAgICAgICogQHBhcmFtIHtzdHJpbmc9 fSBtb2RlCiAgICAgICogQHBhcmFtIHtSdW50aW1lQWdlbnQuUmVtb3RlT2JqZWN0SWQ9fSBvYmpl Y3RJZAogICAgICAqLwpAQCAtMTIwOCw3ICsxMjA4LDcgQEAgV2ViSW5zcGVjdG9yLkRPTUFnZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChvYmplY3RJZCB8fCBub2Rl SWQpCi0gICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHROb2RlKG9iamVjdElkID8gdW5kZWZp bmVkIDogbm9kZUlkLCBvYmplY3RJZCwgdGhpcy5fYnVpbGRIaWdobGlnaHRDb25maWcobW9kZSkp OworICAgICAgICAgICAgRE9NQWdlbnQuaGlnaGxpZ2h0Tm9kZSh0aGlzLl9idWlsZEhpZ2hsaWdo dENvbmZpZyhtb2RlKSwgb2JqZWN0SWQgPyB1bmRlZmluZWQgOiBub2RlSWQsIG9iamVjdElkKTsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgRE9NQWdlbnQuaGlkZUhpZ2hsaWdodCgpOwogICAg IH0sCkBAIC0xMjE5LDcgKzEyMTksNyBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBl ID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0gez9ET01BZ2VudC5Ob2RlSWR9 IG5vZGVJZAorICAgICAqIEBwYXJhbSB7RE9NQWdlbnQuTm9kZUlkfSBub2RlSWQKICAgICAgKi8K ICAgICBoaWdobGlnaHRET01Ob2RlRm9yVHdvU2Vjb25kczogZnVuY3Rpb24obm9kZUlkKQogICAg IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NUHJl c2VudGF0aW9uVXRpbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RP TVByZXNlbnRhdGlvblV0aWxzLmpzCmluZGV4IGQ3MDU2OWRiZWY4OWQ4N2FiOGNmYjEyMGY4YWRm MzMxODIzMDA5NGMuLjBmOWY0ODM4MWNmN2Q1NjJlNDllMGNhYmI0Y2I0MGM1MWVhNGYzY2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NUHJlc2VudGF0 aW9uVXRpbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01Q cmVzZW50YXRpb25VdGlscy5qcwpAQCAtOTcsNyArOTcsNyBAQCBXZWJJbnNwZWN0b3IuRE9NUHJl c2VudGF0aW9uVXRpbHMubGlua2lmeU5vZGVSZWZlcmVuY2UgPSBmdW5jdGlvbihub2RlKQogICAg IFdlYkluc3BlY3Rvci5ET01QcmVzZW50YXRpb25VdGlscy5kZWNvcmF0ZU5vZGVMYWJlbChub2Rl LCBsaW5rKTsKIAogICAgIGxpbmsuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBXZWJJbnNwZWN0 b3IuZG9tQWdlbnQuaW5zcGVjdEVsZW1lbnQuYmluZChXZWJJbnNwZWN0b3IuZG9tQWdlbnQsIG5v ZGUuaWQpLCBmYWxzZSk7Ci0gICAgbGluay5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW92ZXIiLCBX ZWJJbnNwZWN0b3IuZG9tQWdlbnQuaGlnaGxpZ2h0RE9NTm9kZS5iaW5kKFdlYkluc3BlY3Rvci5k b21BZ2VudCwgbm9kZS5pZCwgIiIpLCBmYWxzZSk7CisgICAgbGluay5hZGRFdmVudExpc3RlbmVy KCJtb3VzZW92ZXIiLCBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuaGlnaGxpZ2h0RE9NTm9kZS5iaW5k KFdlYkluc3BlY3Rvci5kb21BZ2VudCwgbm9kZS5pZCwgIiIsIHVuZGVmaW5lZCksIGZhbHNlKTsK ICAgICBsaW5rLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgV2ViSW5zcGVjdG9yLmRvbUFn ZW50LmhpZGVET01Ob2RlSGlnaGxpZ2h0LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUFnZW50KSwgZmFs c2UpOwogCiAgICAgcmV0dXJuIGxpbms7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCBl NGJlNzgwZjk3YjRkMzk5YzAzMzkzMjM3NzkzMjc0NDUwNjc2NDEzLi5kYzBlYjNkMzU0NmJkMjdj MmE5MjMzODU3Yjg4M2MyZWUyYjNmMjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAg LTI0NSw3ICsyNDUsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC5hZGRTdHlsZUNsYXNz KCJjb25zb2xlLWZvcm1hdHRlZC0iICsgdGhpcy5wcm9wZXJ0eS52YWx1ZS50eXBlKTsKIAogICAg ICAgICB0aGlzLnZhbHVlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRo aXMuX2NvbnRleHRNZW51RmlyZWQuYmluZCh0aGlzLCB0aGlzLnByb3BlcnR5LnZhbHVlKSwgZmFs c2UpOwotICAgICAgICBpZiAodGhpcy5wcm9wZXJ0eS52YWx1ZS50eXBlID09PSAib2JqZWN0IiAm JiB0aGlzLnByb3BlcnR5LnZhbHVlLnN1YnR5cGUgPT09ICJub2RlIikgeworICAgICAgICBpZiAo dGhpcy5wcm9wZXJ0eS52YWx1ZS50eXBlID09PSAib2JqZWN0IiAmJiB0aGlzLnByb3BlcnR5LnZh bHVlLnN1YnR5cGUgPT09ICJub2RlIiAmJiB0aGlzLnByb3BlcnR5LnZhbHVlLmRlc2NyaXB0aW9u KSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuRE9NUHJlc2VudGF0aW9uVXRpbHMuY3JlYXRl U3BhbnNGb3JOb2RlVGl0bGUodGhpcy52YWx1ZUVsZW1lbnQsIHRoaXMucHJvcGVydHkudmFsdWUu ZGVzY3JpcHRpb24pOwogICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fbW91c2VNb3ZlLmJpbmQodGhpcywgdGhpcy5wcm9wZXJ0 eS52YWx1ZSksIGZhbHNlKTsKICAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fbW91c2VPdXQuYmluZCh0aGlzLCB0aGlzLnByb3Bl cnR5LnZhbHVlKSwgZmFsc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Ub29sYmFyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Ub29sYmFyLmpzCmluZGV4IDQ1MDEwZWM2MzQ0ODA2MTQ5YzM5ODI0ZGJjMWRlYzNkMWU5YjM4 MmQuLjJiNGE5NjhhMWI3ZTZiYzI0ZTY5MmJiMWY4Yzg4MmMxNDJhODQxM2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanMKQEAgLTk3LDcgKzk3LDcg QEAgV2ViSW5zcGVjdG9yLlRvb2xiYXIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioK LSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzQ29tcGFjdE1vZGUKKyAgICAgKiBAcGFyYW0ge2Jv b2xlYW59IGRvY2tlZFRvQm90dG9tCiAgICAgICovCiAgICAgc2V0RG9ja2VkVG9Cb3R0b206IGZ1 bmN0aW9uKGRvY2tlZFRvQm90dG9tKQogICAgIHsK