55569 2011-03-02 03:45:06 -0800 Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js 2011-03-03 03:04:00 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 360706 0 podivilov 2011-03-02 03:45:06 -0800 Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js. sourceFileId better reflects the intention to have unique identifier for each source that is shown in scripts panel. 360709 1 84395 podivilov 2011-03-02 03:45:52 -0800 Created attachment 84395 Patch. 361483 2 podivilov 2011-03-03 03:04:00 -0800 Committed r80224: <http://trac.webkit.org/changeset/80224> 84395 2011-03-02 03:45:52 -0800 2011-03-03 02:57:28 -0800 Patch. patch text/plain 18128 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MGY4NWNmLi5mYjZmNTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDMtMDIgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcmVuYW1lICJzb3VyY2VOYW1lIiB0byAic291cmNlRmlsZUlkIiBpbiBTY3JpcHRz UGFuZWwuanMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NTU2OQorCisgICAgICAgIHNvdXJjZUZpbGVJZCBiZXR0ZXIgcmVmbGVjdHMgdGhlIGludGVu dGlvbiB0byBoYXZlIHVuaXF1ZSBpZGVudGlmaWVyIGZvciBlYWNoIHNvdXJjZSB0aGF0IGlzIHNo b3duIGluIHNjcmlwdHMgcGFuZWwuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanM6CisKIDIwMTEtMDMtMDEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2 aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggNDQ3MzdmOS4uM2YyZDIxOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtNDQsMTIgKzQ0LDEyIEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cyA9IHsKIH0KIAogV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewotICAgIGJyZWFrcG9p bnRzRm9yU291cmNlTmFtZTogZnVuY3Rpb24oc291cmNlTmFtZSkKKyAgICBicmVha3BvaW50c0Zv clNvdXJjZUZpbGVJZDogZnVuY3Rpb24oc291cmNlRmlsZUlkKQogICAgIHsKICAgICAgICAgdmFy IGJyZWFrcG9pbnRzID0gW107CiAgICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX2JyZWFrcG9p bnRzKSB7CiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9pbnRzW2lk XTsKLSAgICAgICAgICAgIGlmIChicmVha3BvaW50LnNvdXJjZU5hbWUgPT09IHNvdXJjZU5hbWUp CisgICAgICAgICAgICBpZiAoYnJlYWtwb2ludC5zb3VyY2VGaWxlSWQgPT09IHNvdXJjZUZpbGVJ ZCkKICAgICAgICAgICAgICAgICBicmVha3BvaW50cy5wdXNoKGJyZWFrcG9pbnQpOwogICAgICAg ICB9CiAgICAgICAgIHJldHVybiBicmVha3BvaW50czsKQEAgLTYxLDcgKzYxLDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB2 YXIgbG9jYXRpb24gPSBicmVha3BvaW50LmxvY2F0aW9ucy5sZW5ndGggPyBicmVha3BvaW50Lmxv Y2F0aW9uc1swXSA6IGJyZWFrcG9pbnQ7CiAgICAgICAgIHZhciBzb3VyY2VMb2NhdGlvbiA9IHRo aXMuX2FjdHVhbExvY2F0aW9uVG9Tb3VyY2VMb2NhdGlvbihicmVha3BvaW50LnVybCB8fCBicmVh a3BvaW50LnNvdXJjZUlELCBsb2NhdGlvbi5saW5lTnVtYmVyLCBsb2NhdGlvbi5jb2x1bW5OdW1i ZXIpOwogCi0gICAgICAgIHZhciBlbmNvZGVkU291cmNlTG9jYXRpb24gPSB0aGlzLl9lbmNvZGVT b3VyY2VMb2NhdGlvbihzb3VyY2VMb2NhdGlvbi5zb3VyY2VOYW1lLCBzb3VyY2VMb2NhdGlvbi5s aW5lTnVtYmVyKTsKKyAgICAgICAgdmFyIGVuY29kZWRTb3VyY2VMb2NhdGlvbiA9IHRoaXMuX2Vu Y29kZVNvdXJjZUxvY2F0aW9uKHNvdXJjZUxvY2F0aW9uLnNvdXJjZUZpbGVJZCwgc291cmNlTG9j YXRpb24ubGluZU51bWJlcik7CiAgICAgICAgIGlmIChlbmNvZGVkU291cmNlTG9jYXRpb24gaW4g dGhpcy5fc291cmNlTG9jYXRpb25Ub0JyZWFrcG9pbnRJZCkgewogICAgICAgICAgICAgLy8gV2Ug Y2FuJ3Qgc2hvdyBtb3JlIHRoYW4gb25lIGJyZWFrcG9pbnQgb24gYSBzaW5nbGUgc291cmNlIGZy YW1lIGxpbmUuIFJlbW92ZSBuZXdseSBhZGRlZCBicmVha3BvaW50LgogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwucmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50LmlkKTsK QEAgLTY5LDcgKzY5LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdmFyIHByZXNlbnRhdGlvbkJyZWFr cG9pbnQgPSB7Ci0gICAgICAgICAgICBzb3VyY2VOYW1lOiBzb3VyY2VMb2NhdGlvbi5zb3VyY2VO YW1lLAorICAgICAgICAgICAgc291cmNlRmlsZUlkOiBzb3VyY2VMb2NhdGlvbi5zb3VyY2VGaWxl SWQsCiAgICAgICAgICAgICBsaW5lTnVtYmVyOiBzb3VyY2VMb2NhdGlvbi5saW5lTnVtYmVyLAog ICAgICAgICAgICAgdXJsOiBicmVha3BvaW50LnVybCwKICAgICAgICAgICAgIHJlc29sdmVkOiAh IWJyZWFrcG9pbnQubG9jYXRpb25zLmxlbmd0aCwKQEAgLTg3LDcgKzg3LDcgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAg ICAgdmFyIGJyZWFrcG9pbnRJZCA9IGV2ZW50LmRhdGE7CiAgICAgICAgIHZhciBicmVha3BvaW50 ID0gdGhpcy5fYnJlYWtwb2ludHNbYnJlYWtwb2ludElkXTsKLSAgICAgICAgdmFyIGVuY29kZWRT b3VyY2VMb2NhdGlvbiA9IHRoaXMuX2VuY29kZVNvdXJjZUxvY2F0aW9uKGJyZWFrcG9pbnQuc291 cmNlTmFtZSwgYnJlYWtwb2ludC5saW5lTnVtYmVyKTsKKyAgICAgICAgdmFyIGVuY29kZWRTb3Vy Y2VMb2NhdGlvbiA9IHRoaXMuX2VuY29kZVNvdXJjZUxvY2F0aW9uKGJyZWFrcG9pbnQuc291cmNl RmlsZUlkLCBicmVha3BvaW50LmxpbmVOdW1iZXIpOwogICAgICAgICBkZWxldGUgdGhpcy5fYnJl YWtwb2ludHNbYnJlYWtwb2ludElkXTsKICAgICAgICAgZGVsZXRlIHRoaXMuX3NvdXJjZUxvY2F0 aW9uVG9CcmVha3BvaW50SWRbZW5jb2RlZFNvdXJjZUxvY2F0aW9uXTsKICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCBicmVha3BvaW50KTsKQEAgLTEwMCwxNSAr MTAwLDE1IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkKHsgZGF0YTogYnJlYWtwb2ludCB9 KTsKICAgICB9LAogCi0gICAgX2VuY29kZVNvdXJjZUxvY2F0aW9uOiBmdW5jdGlvbihzb3VyY2VO YW1lLCBsaW5lTnVtYmVyKQorICAgIF9lbmNvZGVTb3VyY2VMb2NhdGlvbjogZnVuY3Rpb24oc291 cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHNvdXJjZU5hbWUg KyAiOiIgKyBsaW5lTnVtYmVyOworICAgICAgICByZXR1cm4gc291cmNlRmlsZUlkICsgIjoiICsg bGluZU51bWJlcjsKICAgICB9LAogCi0gICAgX2FjdHVhbExvY2F0aW9uVG9Tb3VyY2VMb2NhdGlv bjogZnVuY3Rpb24oc291cmNlTmFtZSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKQorICAgIF9h Y3R1YWxMb2NhdGlvblRvU291cmNlTG9jYXRpb246IGZ1bmN0aW9uKHNvdXJjZUlELCBsaW5lTnVt YmVyLCBjb2x1bW5OdW1iZXIpCiAgICAgewogICAgICAgICAvLyBUT0RPOiB1c2Ugc291cmNlIG1h cHBpbmcgdG8gb2J0YWluIHNvdXJjZSBsb2NhdGlvbi4KLSAgICAgICAgcmV0dXJuIHsgc291cmNl TmFtZTogc291cmNlTmFtZSwgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBj b2x1bW5OdW1iZXIgfTsKKyAgICAgICAgcmV0dXJuIHsgc291cmNlRmlsZUlkOiBzb3VyY2VJRCwg bGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKaW5kZXggZjI1NjQ3YS4uZmNiN2U0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI2NSw4ICsyNjUs OCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHNjcmlwdC5yZXNvdXJjZS5zZXRDb250ZW50KHNjcmlwdC5zb3VyY2UsIHJldmVydEhhbmRsZSk7 CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgc291cmNlTmFtZSA9IHRoaXMuX3NvdXJjZU5hbWVG b3JTY3JpcHQoc2NyaXB0KTsKLSAgICAgICAgdGhpcy5fcmVjcmVhdGVTb3VyY2VGcmFtZShzb3Vy Y2VOYW1lKTsKKyAgICAgICAgdmFyIHNvdXJjZUZpbGVJZCA9IHRoaXMuX3NvdXJjZUZpbGVJZEZv clNjcmlwdChzY3JpcHQpOworICAgICAgICB0aGlzLl9yZWNyZWF0ZVNvdXJjZUZyYW1lKHNvdXJj ZUZpbGVJZCk7CiAKICAgICAgICAgdmFyIGNhbGxGcmFtZXMgPSBXZWJJbnNwZWN0b3IuZGVidWdn ZXJNb2RlbC5jYWxsRnJhbWVzOwogICAgICAgICBpZiAoY2FsbEZyYW1lcy5sZW5ndGgpCkBAIC0y ODcsNyArMjg3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICAgICAgc2NyaXB0LnJlc291cmNlID0gcmVzb3VyY2U7CiAKICAgICAgICAgICAg ICAgICAvLyBBZGQgcmVzb3VyY2UgdXJsIHRvIGZpbGVzIHNlbGVjdCBpZiBub3QgYWxyZWFkeSBh ZGRlZCB3aGlsZSBkZWJ1Z2dpbmcgaW5saW5lZCBzY3JpcHRzLgotICAgICAgICAgICAgICAgIGlm ICghKHJlc291cmNlLnVybCBpbiB0aGlzLl9zb3VyY2VOYW1lVG9GaWxlc1NlbGVjdE9wdGlvbikp CisgICAgICAgICAgICAgICAgaWYgKCEocmVzb3VyY2UudXJsIGluIHRoaXMuX3NvdXJjZUZpbGVJ ZFRvRmlsZXNTZWxlY3RPcHRpb24pKQogICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRPcHRp b25Ub0ZpbGVzU2VsZWN0QW5kU2hvd1NvdXJjZUZyYW1lSWZOZWVkZWQocmVzb3VyY2UudXJsKTsK ICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gUmVzb3VyY2UgaXMgbm90 IGZpbmlzaGVkLCBiaW5kIHRoZSBzY3JpcHQgbGF0ZXIuCkBAIC0zMDAsNyArMzAwLDcgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgLy8g U291cmNlIGZyYW1lIGNvbnRlbnQgaXMgb3V0ZGF0ZWQgc2luY2Ugd2UgaGF2ZSBuZXcgc2NyaXB0 IHBhcnNlZC4KICAgICAgICAgICAgICAgICB0aGlzLl9yZWNyZWF0ZVNvdXJjZUZyYW1lKHNjcmlw dC5zb3VyY2VVUkwpOwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKCEoc2NyaXB0 LnNvdXJjZVVSTCBpbiB0aGlzLl9zb3VyY2VOYW1lVG9GaWxlc1NlbGVjdE9wdGlvbikpIHsKKyAg ICAgICAgfSBlbHNlIGlmICghKHNjcmlwdC5zb3VyY2VVUkwgaW4gdGhpcy5fc291cmNlRmlsZUlk VG9GaWxlc1NlbGVjdE9wdGlvbikpIHsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBkeW5hbWlj IHNjcmlwdCB3aXRoICIvL0Agc291cmNlVVJMPSIgY29tbWVudC4KICAgICAgICAgICAgIHRoaXMu X2FkZE9wdGlvblRvRmlsZXNTZWxlY3RBbmRTaG93U291cmNlRnJhbWVJZk5lZWRlZChzY3JpcHQu c291cmNlVVJMKTsKICAgICAgICAgfQpAQCAtMzI2LDcgKzMyNiw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9yZWNyZWF0ZVNvdXJjZUZy YW1lKHJlc291cmNlLnVybCk7CiAKICAgICAgICAgLy8gQWRkIHJlc291cmNlIHVybCB0byBmaWxl cyBzZWxlY3QgaWYgbm90IGFscmVhZHkgYWRkZWQgd2hpbGUgZGVidWdnaW5nIGlubGluZWQgc2Ny aXB0cy4KLSAgICAgICAgaWYgKCEocmVzb3VyY2UudXJsIGluIHRoaXMuX3NvdXJjZU5hbWVUb0Zp bGVzU2VsZWN0T3B0aW9uKSkKKyAgICAgICAgaWYgKCEocmVzb3VyY2UudXJsIGluIHRoaXMuX3Nv dXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb24pKQogICAgICAgICAgICAgdGhpcy5fYWRkT3B0 aW9uVG9GaWxlc1NlbGVjdEFuZFNob3dTb3VyY2VGcmFtZUlmTmVlZGVkKHJlc291cmNlLnVybCk7 CiAgICAgfSwKIApAQCAtMzQ2LDkgKzM0Niw5IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9I aXN0b3J5KHVybCk7CiAgICAgfSwKIAotICAgIF9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0OiBmdW5j dGlvbihzb3VyY2VOYW1lKQorICAgIF9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0OiBmdW5jdGlvbihz b3VyY2VGaWxlSWQpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0Rm9y U291cmNlTmFtZShzb3VyY2VOYW1lKTsKKyAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3Njcmlw dEZvclNvdXJjZUZpbGVJZChzb3VyY2VGaWxlSWQpOwogICAgICAgICB2YXIgc2VsZWN0ID0gdGhp cy5fZmlsZXNTZWxlY3RFbGVtZW50OwogICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgib3B0aW9uIik7CiAgICAgICAgIG9wdGlvbi50ZXh0ID0gc2NyaXB0LnNvdXJj ZVVSTCA/IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTChzY3JpcHQuc291cmNlVVJMKSA6 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CkBAIC0zNjYsMTQgKzM2NiwxNCBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgc2VsZWN0Lmluc2VydEJlZm9yZShvcHRpb24sIHNlbGVjdC5jaGlsZE5vZGVz Lml0ZW0oaW5zZXJ0aW9uSW5kZXgpKTsKIAotICAgICAgICBvcHRpb24uX3NvdXJjZU5hbWUgPSBz b3VyY2VOYW1lOwotICAgICAgICB0aGlzLl9zb3VyY2VOYW1lVG9GaWxlc1NlbGVjdE9wdGlvbltz b3VyY2VOYW1lXSA9IG9wdGlvbjsKKyAgICAgICAgb3B0aW9uLl9zb3VyY2VGaWxlSWQgPSBzb3Vy Y2VGaWxlSWQ7CisgICAgICAgIHRoaXMuX3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb25b c291cmNlRmlsZUlkXSA9IG9wdGlvbjsKICAgICB9LAogCiAgICAgYWRkQ29uc29sZU1lc3NhZ2U6 IGZ1bmN0aW9uKG1lc3NhZ2UpCiAgICAgewogICAgICAgICB0aGlzLl9tZXNzYWdlcy5wdXNoKG1l c3NhZ2UpOwotICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VOYW1lVG9Tb3Vy Y2VGcmFtZVttZXNzYWdlLnVybF07CisgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3Nv dXJjZUZpbGVJZFRvU291cmNlRnJhbWVbbWVzc2FnZS51cmxdOwogICAgICAgICBpZiAoc291cmNl RnJhbWUpCiAgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRNZXNzYWdlKG1lc3NhZ2UpOwogICAg IH0sCkBAIC0zODEsMTUgKzM4MSwxNSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICBjbGVhckNvbnNvbGVNZXNzYWdlczogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgdXJsIGluIHRoaXMu X3NvdXJjZU5hbWVUb1NvdXJjZUZyYW1lKQotICAgICAgICAgICAgdGhpcy5fc291cmNlTmFtZVRv U291cmNlRnJhbWVbdXJsXS5jbGVhck1lc3NhZ2VzKCk7CisgICAgICAgIGZvciAodmFyIHVybCBp biB0aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lKQorICAgICAgICAgICAgdGhpcy5fc291 cmNlRmlsZUlkVG9Tb3VyY2VGcmFtZVt1cmxdLmNsZWFyTWVzc2FnZXMoKTsKICAgICB9LAogCiAg ICAgX2JyZWFrcG9pbnRBZGRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIg YnJlYWtwb2ludCA9IGV2ZW50LmRhdGE7CiAKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhp cy5fc291cmNlTmFtZVRvU291cmNlRnJhbWVbYnJlYWtwb2ludC5zb3VyY2VOYW1lXTsKKyAgICAg ICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRmlsZUlkVG9Tb3VyY2VGcmFtZVticmVh a3BvaW50LnNvdXJjZUZpbGVJZF07CiAgICAgICAgIGlmIChzb3VyY2VGcmFtZSAmJiBzb3VyY2VG cmFtZS5sb2FkZWQpCiAgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRCcmVha3BvaW50KGJyZWFr cG9pbnQubGluZU51bWJlciwgYnJlYWtwb2ludC5yZXNvbHZlZCwgYnJlYWtwb2ludC5jb25kaXRp b24sIGJyZWFrcG9pbnQuZW5hYmxlZCk7CiAgICAgfSwKQEAgLTM5OCw3ICszOTgsNyBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBi cmVha3BvaW50ID0gZXZlbnQuZGF0YTsKIAotICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlz Ll9zb3VyY2VOYW1lVG9Tb3VyY2VGcmFtZVticmVha3BvaW50LnNvdXJjZU5hbWVdOworICAgICAg ICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lW2JyZWFr cG9pbnQuc291cmNlRmlsZUlkXTsKICAgICAgICAgaWYgKHNvdXJjZUZyYW1lICYmIHNvdXJjZUZy YW1lLmxvYWRlZCkKICAgICAgICAgICAgIHNvdXJjZUZyYW1lLnJlbW92ZUJyZWFrcG9pbnQoYnJl YWtwb2ludC5saW5lTnVtYmVyKTsKICAgICB9LApAQCAtNDkxLDggKzQ5MSw4IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jdXJyZW50QmFj a0ZvcndhcmRJbmRleCA9IC0xOwogICAgICAgICB0aGlzLl91cGRhdGVCYWNrQW5kRm9yd2FyZEJ1 dHRvbnMoKTsKIAotICAgICAgICB0aGlzLl9zb3VyY2VOYW1lVG9Tb3VyY2VGcmFtZSA9IHt9Owot ICAgICAgICB0aGlzLl9zb3VyY2VOYW1lVG9GaWxlc1NlbGVjdE9wdGlvbiA9IHt9OworICAgICAg ICB0aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lID0ge307CisgICAgICAgIHRoaXMuX3Nv dXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb24gPSB7fTsKICAgICAgICAgdGhpcy5fbWVzc2Fn ZXMgPSBbXTsKICAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CiAgICAgICAgIHRoaXMuZnVuY3Rpb25zU2VsZWN0RWxlbWVudC5yZW1vdmVDaGlsZHJlbigp OwpAQCAtNTI0LDEyICs1MjQsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICBjYW5TaG93U291cmNlTGluZTogZnVuY3Rpb24odXJsLCBsaW5lKQogICAg IHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RlYnVnZ2VyRW5hYmxlZCAmJiAodXJsIGluIHRoaXMu X3NvdXJjZU5hbWVUb0ZpbGVzU2VsZWN0T3B0aW9uKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2Rl YnVnZ2VyRW5hYmxlZCAmJiAodXJsIGluIHRoaXMuX3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RP cHRpb24pOwogICAgIH0sCiAKICAgICBzaG93U291cmNlTGluZTogZnVuY3Rpb24odXJsLCBsaW5l KQogICAgIHsKLSAgICAgICAgaWYgKCEodXJsIGluIHRoaXMuX3NvdXJjZU5hbWVUb0ZpbGVzU2Vs ZWN0T3B0aW9uKSkKKyAgICAgICAgaWYgKCEodXJsIGluIHRoaXMuX3NvdXJjZUZpbGVJZFRvRmls ZXNTZWxlY3RPcHRpb24pKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgc291cmNl RnJhbWUgPSB0aGlzLl9zaG93U291cmNlRnJhbWVBbmRBZGRUb0hpc3RvcnkodXJsKTsKICAgICAg ICAgc291cmNlRnJhbWUuaGlnaGxpZ2h0TGluZShsaW5lKTsKQEAgLTU0Niw5ICs1NDYsOSBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMu c2lkZWJhclBhbmVzLmNhbGxzdGFjay5oYW5kbGVTaG9ydGN1dChldmVudCk7CiAgICAgfSwKIAot ICAgIF9zaG93U291cmNlRnJhbWVBbmRBZGRUb0hpc3Rvcnk6IGZ1bmN0aW9uKHNvdXJjZU5hbWUp CisgICAgX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlzdG9yeTogZnVuY3Rpb24oc291cmNlRmls ZUlkKQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1NvdXJjZUZy YW1lKHNvdXJjZU5hbWUpOworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zaG93U291 cmNlRnJhbWUoc291cmNlRmlsZUlkKTsKIAogICAgICAgICB2YXIgb2xkSW5kZXggPSB0aGlzLl9j dXJyZW50QmFja0ZvcndhcmRJbmRleDsKICAgICAgICAgaWYgKG9sZEluZGV4ID49IDApCkBAIC01 NTYsMTEgKzU1NiwxMSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK IAogICAgICAgICAvLyBDaGVjayBmb3IgYSBwcmV2aW91cyBlbnRyeSBvZiB0aGUgc2FtZSBvYmpl Y3QgaW4gX2JhY2tGb3J3YXJkTGlzdC4KICAgICAgICAgLy8gSWYgb25lIGlzIGZvdW5kLCByZW1v dmUgaXQuCi0gICAgICAgIHZhciBwcmV2aW91c0VudHJ5SW5kZXggPSB0aGlzLl9iYWNrRm9yd2Fy ZExpc3QuaW5kZXhPZihzb3VyY2VOYW1lKTsKKyAgICAgICAgdmFyIHByZXZpb3VzRW50cnlJbmRl eCA9IHRoaXMuX2JhY2tGb3J3YXJkTGlzdC5pbmRleE9mKHNvdXJjZUZpbGVJZCk7CiAgICAgICAg IGlmIChwcmV2aW91c0VudHJ5SW5kZXggIT09IC0xKQogICAgICAgICAgICAgdGhpcy5fYmFja0Zv cndhcmRMaXN0LnNwbGljZShwcmV2aW91c0VudHJ5SW5kZXgsIDEpOwogCi0gICAgICAgIHRoaXMu X2JhY2tGb3J3YXJkTGlzdC5wdXNoKHNvdXJjZU5hbWUpOworICAgICAgICB0aGlzLl9iYWNrRm9y d2FyZExpc3QucHVzaChzb3VyY2VGaWxlSWQpOwogICAgICAgICB0aGlzLl9jdXJyZW50QmFja0Zv cndhcmRJbmRleCA9IHRoaXMuX2JhY2tGb3J3YXJkTGlzdC5sZW5ndGggLSAxOwogCiAgICAgICAg IHRoaXMuX3VwZGF0ZUJhY2tBbmRGb3J3YXJkQnV0dG9ucygpOwpAQCAtNTY4LDUwICs1NjgsNTAg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biBzb3VyY2VGcmFtZTsKICAgICB9LAogCi0gICAgX3Nob3dTb3VyY2VGcmFtZTogZnVuY3Rpb24o c291cmNlTmFtZSkKKyAgICBfc2hvd1NvdXJjZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQp CiAgICAgewotICAgICAgICB2YXIgaW5kZXggPSB0aGlzLl9zb3VyY2VOYW1lVG9GaWxlc1NlbGVj dE9wdGlvbltzb3VyY2VOYW1lXS5pbmRleDsKKyAgICAgICAgdmFyIGluZGV4ID0gdGhpcy5fc291 cmNlRmlsZUlkVG9GaWxlc1NlbGVjdE9wdGlvbltzb3VyY2VGaWxlSWRdLmluZGV4OwogICAgICAg ICB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRleCA9IGluZGV4OwogCi0gICAg ICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lRm9yU291cmNlTmFtZShzb3Vy Y2VOYW1lKTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVGb3JT b3VyY2VGaWxlSWQoc291cmNlRmlsZUlkKTsKICAgICAgICAgdGhpcy52aXNpYmxlVmlldyA9IHNv dXJjZUZyYW1lOwogCi0gICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRGb3JTb3VyY2VO YW1lKHNvdXJjZU5hbWUpOworICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0Rm9yU291 cmNlRmlsZUlkKHNvdXJjZUZpbGVJZCk7CiAgICAgICAgIGlmIChzY3JpcHQuc291cmNlVVJMKQog ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmxhc3RWaWV3ZWRTY3JpcHRGaWxlID0g c2NyaXB0LnNvdXJjZVVSTDsKIAogICAgICAgICByZXR1cm4gc291cmNlRnJhbWU7CiAgICAgfSwK IAotICAgIF9zb3VyY2VGcmFtZUZvclNvdXJjZU5hbWU6IGZ1bmN0aW9uKHNvdXJjZU5hbWUpCisg ICAgX3NvdXJjZUZyYW1lRm9yU291cmNlRmlsZUlkOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAg ICAgewotICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VOYW1lVG9Tb3VyY2VG cmFtZVtzb3VyY2VOYW1lXTsKLSAgICAgICAgcmV0dXJuIHNvdXJjZUZyYW1lIHx8IHRoaXMuX2Ny ZWF0ZVNvdXJjZUZyYW1lKHNvdXJjZU5hbWUpOworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0 aGlzLl9zb3VyY2VGaWxlSWRUb1NvdXJjZUZyYW1lW3NvdXJjZUZpbGVJZF07CisgICAgICAgIHJl dHVybiBzb3VyY2VGcmFtZSB8fCB0aGlzLl9jcmVhdGVTb3VyY2VGcmFtZShzb3VyY2VGaWxlSWQp OwogICAgIH0sCiAKLSAgICBfY3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHNvdXJjZU5hbWUp CisgICAgX2NyZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewot ICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0Rm9yU291cmNlTmFtZShzb3VyY2VOYW1l KTsKKyAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdEZvclNvdXJjZUZpbGVJZChzb3Vy Y2VGaWxlSWQpOwogICAgICAgICB2YXIgZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwoc2NyaXB0KTsKICAgICAgICAgc291cmNlRnJh bWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKGRlbGVnYXRlLCBzY3JpcHQuc291cmNl VVJMKTsKLSAgICAgICAgc291cmNlRnJhbWUuX3NvdXJjZU5hbWUgPSBzb3VyY2VOYW1lOworICAg ICAgICBzb3VyY2VGcmFtZS5fc291cmNlRmlsZUlkID0gc291cmNlRmlsZUlkOwogICAgICAgICBz b3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5FdmVu dHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFtZUxvYWRlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMu X3NvdXJjZU5hbWVUb1NvdXJjZUZyYW1lW3NvdXJjZU5hbWVdID0gc291cmNlRnJhbWU7CisgICAg ICAgIHRoaXMuX3NvdXJjZUZpbGVJZFRvU291cmNlRnJhbWVbc291cmNlRmlsZUlkXSA9IHNvdXJj ZUZyYW1lOwogICAgICAgICByZXR1cm4gc291cmNlRnJhbWU7CiAgICAgfSwKIAotICAgIF9yZWNy ZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VOYW1lKQorICAgIF9yZWNyZWF0ZVNvdXJj ZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewotICAgICAgICB2YXIgb2xkU291 cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VOYW1lVG9Tb3VyY2VGcmFtZVtzb3VyY2VOYW1lXTsKKyAg ICAgICAgdmFyIG9sZFNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRmlsZUlkVG9Tb3VyY2VGcmFt ZVtzb3VyY2VGaWxlSWRdOwogICAgICAgICBpZiAoIW9sZFNvdXJjZUZyYW1lKQogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICBvbGRTb3VyY2VGcmFtZS5yZW1vdmVFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFtZUxv YWRlZCwgdGhpcyk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9zb3VyY2VOYW1lVG9Tb3VyY2VGcmFt ZVtzb3VyY2VOYW1lXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3NvdXJjZUZpbGVJZFRvU291cmNl RnJhbWVbc291cmNlRmlsZUlkXTsKICAgICAgICAgb2xkU291cmNlRnJhbWUucmVtb3ZlRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzLkxvYWRlZCwgdGhpcy5fc291 cmNlRnJhbWVMb2FkZWQsIHRoaXMpOwogICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldyAhPT0g b2xkU291cmNlRnJhbWUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIG5ld1Nv dXJjZUZyYW1lID0gdGhpcy5fY3JlYXRlU291cmNlRnJhbWUoc291cmNlTmFtZSkKKyAgICAgICAg dmFyIG5ld1NvdXJjZUZyYW1lID0gdGhpcy5fY3JlYXRlU291cmNlRnJhbWUoc291cmNlRmlsZUlk KQogICAgICAgICBuZXdTb3VyY2VGcmFtZS5zY3JvbGxUb3AgPSBvbGRTb3VyY2VGcmFtZS5zY3Jv bGxUb3A7CiAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSBuZXdTb3VyY2VGcmFtZTsKICAgICB9 LApAQCAtNjE5LDE1ICs2MTksMTUgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgX3NvdXJjZUZyYW1lTG9hZGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAg ICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IGV2ZW50LnRhcmdldDsKLSAgICAgICAgdmFyIHNvdXJj ZU5hbWUgPSBzb3VyY2VGcmFtZS5fc291cmNlTmFtZTsKKyAgICAgICAgdmFyIHNvdXJjZUZpbGVJ ZCA9IHNvdXJjZUZyYW1lLl9zb3VyY2VGaWxlSWQ7CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCB0aGlzLl9tZXNzYWdlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIG1lc3Nh Z2UgPSB0aGlzLl9tZXNzYWdlc1tpXTsKLSAgICAgICAgICAgIGlmIChtZXNzYWdlLnVybCA9PT0g c291cmNlTmFtZSkKKyAgICAgICAgICAgIGlmIChtZXNzYWdlLnVybCA9PT0gc291cmNlRmlsZUlk KQogICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lLmFkZE1lc3NhZ2UobWVzc2FnZSk7CiAgICAg ICAgIH0KIAotICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5icmVha3BvaW50c0ZvclNvdXJjZU5hbWUoc291cmNlTmFtZSk7CisgICAgICAgIHZhciBicmVh a3BvaW50cyA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmJyZWFrcG9pbnRzRm9yU291cmNlRmls ZUlkKHNvdXJjZUZpbGVJZCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2lu dHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gYnJlYWtwb2lu dHNbaV07CiAgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRCcmVha3BvaW50KGJyZWFrcG9pbnQu bGluZU51bWJlciwgYnJlYWtwb2ludC5yZXNvbHZlZCwgYnJlYWtwb2ludC5jb25kaXRpb24sIGJy ZWFrcG9pbnQuZW5hYmxlZCk7CkBAIC02MzYsMjMgKzYzNiwyMyBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHNlbGVjdGVkQ2FsbEZyYW1lID0g dGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lOwogICAgICAgICBp ZiAoc2VsZWN0ZWRDYWxsRnJhbWUpIHsKICAgICAgICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNw ZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChzZWxlY3RlZENhbGxGcmFtZS5z b3VyY2VJRCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5fc291cmNlTmFtZUZvclNjcmlwdChzY3Jp cHQpID09PSBzb3VyY2VOYW1lKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fc291cmNlRmlsZUlk Rm9yU2NyaXB0KHNjcmlwdCkgPT09IHNvdXJjZUZpbGVJZCkgewogICAgICAgICAgICAgICAgIHNv dXJjZUZyYW1lLnNldEV4ZWN1dGlvbkxpbmUoc2VsZWN0ZWRDYWxsRnJhbWUubGluZSk7CiAgICAg ICAgICAgICAgICAgdGhpcy5fZXhlY3V0aW9uU291cmNlRnJhbWUgPSBzb3VyY2VGcmFtZTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfc291cmNlTmFtZUZvclNjcmlw dDogZnVuY3Rpb24oc2NyaXB0KQorICAgIF9zb3VyY2VGaWxlSWRGb3JTY3JpcHQ6IGZ1bmN0aW9u KHNjcmlwdCkKICAgICB7CiAgICAgICAgIHJldHVybiBzY3JpcHQuc291cmNlVVJMIHx8IHNjcmlw dC5zb3VyY2VJRDsKICAgICB9LAogCi0gICAgX3NjcmlwdEZvclNvdXJjZU5hbWU6IGZ1bmN0aW9u KHNvdXJjZU5hbWUpCisgICAgX3NjcmlwdEZvclNvdXJjZUZpbGVJZDogZnVuY3Rpb24oc291cmNl RmlsZUlkKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gZmlsdGVyKHNjcmlwdCkKICAgICAgICAg ewotICAgICAgICAgICAgcmV0dXJuIChzY3JpcHQuc291cmNlVVJMIHx8IHNjcmlwdC5zb3VyY2VJ RCkgPT09IHNvdXJjZU5hbWU7CisgICAgICAgICAgICByZXR1cm4gKHNjcmlwdC5zb3VyY2VVUkwg fHwgc2NyaXB0LnNvdXJjZUlEKSA9PT0gc291cmNlRmlsZUlkOwogICAgICAgICB9CiAgICAgICAg IHJldHVybiBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5xdWVyeVNjcmlwdHMoZmlsdGVyKVsw XTsKICAgICB9LApAQCAtNjc3LDE0ICs2NzcsMTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lv bnMucmVmcmVzaEV4cHJlc3Npb25zKCk7CiAKICAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlwdEZvclNvdXJjZUlEKGN1cnJlbnRGcmFtZS5zb3VyY2VJ RCk7Ci0gICAgICAgIHZhciBzb3VyY2VOYW1lID0gdGhpcy5fc291cmNlTmFtZUZvclNjcmlwdChz Y3JpcHQpOwotICAgICAgICBpZiAoIShzb3VyY2VOYW1lIGluIHRoaXMuX3NvdXJjZU5hbWVUb0Zp bGVzU2VsZWN0T3B0aW9uKSkgeworICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gdGhpcy5fc291 cmNlRmlsZUlkRm9yU2NyaXB0KHNjcmlwdCk7CisgICAgICAgIGlmICghKHNvdXJjZUZpbGVJZCBp biB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uKSkgewogICAgICAgICAgICAg Ly8gVGhpcyBoYXBwZW5zIGluIHR3byBjYXNlczoKICAgICAgICAgICAgIC8vIDEpIEN1cnJlbnQg Y2FsbCBmcmFtZSBmdW5jdGlvbiBpcyBkZWZpbmVkIGluIGFub255bW91cyBzY3JpcHQgKGFub255 bW91cyBzY3JpcHRzIGFyZW4ndCBhZGRlZCB0byBmaWxlcyBzZWxlY3QgYnkgZGVmYXVsdCkKICAg ICAgICAgICAgIC8vIDIpIFdlIGFyZSBkZWJ1Z2dpbmcgc3luY2hyb25vdXNseSBleGVjdXRlZCBp bmxpbmVkIHNjcmlwdCBhbmQgdGhlcmUgaXMgbm8gcmVzb3VyY2Ugc28gZmFyCi0gICAgICAgICAg ICB0aGlzLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KHNvdXJjZU5hbWUpOworICAgICAgICAgICAg dGhpcy5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdChzb3VyY2VGaWxlSWQpOwogICAgICAgICB9Ci0g ICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlz dG9yeShzb3VyY2VOYW1lKTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1Nv dXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5KHNvdXJjZUZpbGVJZCk7CiAgICAgICAgIGlmIChzb3Vy Y2VGcmFtZS5sb2FkZWQpIHsKICAgICAgICAgICAgIHNvdXJjZUZyYW1lLnNldEV4ZWN1dGlvbkxp bmUoY3VycmVudEZyYW1lLmxpbmUpOwogICAgICAgICAgICAgdGhpcy5fZXhlY3V0aW9uU291cmNl RnJhbWUgPSBzb3VyY2VGcmFtZTsKQEAgLTY5Myw4ICs2OTMsOCBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9maWxlc1NlbGVjdENoYW5nZWQ6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBzb3VyY2VOYW1lID0gdGhpcy5fZmlsZXNTZWxlY3RF bGVtZW50W3RoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4XS5fc291cmNlTmFt ZTsKLSAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5KHNvdXJjZU5h bWUpOworICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50 W3RoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4XS5fc291cmNlRmlsZUlkOwor ICAgICAgICB0aGlzLl9zaG93U291cmNlRnJhbWVBbmRBZGRUb0hpc3Rvcnkoc291cmNlRmlsZUlk KTsKICAgICB9LAogCiAgICAgX3N0YXJ0U2lkZWJhclJlc2l6ZURyYWc6IGZ1bmN0aW9uKGV2ZW50 KQo=