80859 2012-03-12 10:58:12 -0700 Web Inspector: move ResourceScriptMapping to a separate file. 2012-03-13 02:41:08 -0700 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 576276 0 podivilov 2012-03-12 10:58:12 -0700 Web Inspector: move ResourceScriptMapping to a separate file. 576277 1 131351 podivilov 2012-03-12 10:59:19 -0700 Created attachment 131351 Patch 577190 2 podivilov 2012-03-13 02:41:08 -0700 Committed r110549: <http://trac.webkit.org/changeset/110549> 131351 2012-03-12 10:59:19 -0700 2012-03-12 11:28:49 -0700 Patch bug-80859-20120312215917.patch text/plain 21384 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjViMjBiZTJlYzI0YjI3 ZTk5OTNiOTJkNzIwM2ViN2ExYWFmY2IyNy4uNzRjNjlmNWZjYmY1MmQ5NGUwYTQxOWJkNWY2YjRi ZGYyNmZlZDUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEyLTAzLTEyICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IG1vdmUgUmVzb3VyY2VTY3JpcHRNYXBwaW5nIHRvIGEgc2VwYXJhdGUgZmlsZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODU5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5 cGk6CisgICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2o6CisgICAgICAgICog aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdE1hcHBpbmcuanMuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlLnVpU291 cmNlQ29kZUxpc3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGlu Zy5wcm90b3R5cGUuX2hhbmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlLl91aVNvdXJjZUNvZGVM aXN0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5fYmluZFNjcmlwdFRvUmF3U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5zZXRGb3JtYXRTb3VyY2UpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuZm9y Y2VVcGRhdGVTb3VyY2VNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNj cmlwdE1hcHBpbmcucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdE1hcHBpbmcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJL aXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisK KzIwMTItMDMtMTIgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisK ICAgICAgICAgV2ViIEluc3BlY3RvcjogZXh0cmFjdCBSZXNvdXJjZVNjcmlwdE1hcHBpbmcgZnJv bSBNYWluU2NyaXB0TWFwcGluZy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgwODM0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBiODE3MWVjNjg0NTRjN2Nj YTI0YTMyMWZhM2U0YWNmZmRhMWM0MzIzLi5hNWRiN2Y2NDg0MGRkZTQzMmUzNDJmNDZmZTcwMTc5 ZjlhMmVhMGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC02MjY0LDYgKzYyNjQsNyBAQAogICAgICAg ICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VKU09OVmlldy5qcycsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUhUTUxWaWV3LmpzJywKICAgICAgICAg ICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlUmVzcG9uc2VWaWV3LmpzJywKKyAgICAg ICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qcycsCiAg ICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRpbWluZ1ZpZXcuanMnLAog ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMnLAog ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qcycsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDNhZDA5Y2Y0 NTQ4ZWQ4ZDNmNDY5ZTdjNjA5MjRkOTFmMzQ3YTgyYWUuLjU0ZTQ2MTUyODFjZmE2ODU4N2M0NjMy Y2FhZDI3NzE4MDFhZTAwOTAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNw cm9qL1dlYkNvcmUudmNwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dl YkNvcmUudmNwcm9qCkBAIC03Mzc2NSw2ICs3Mzc2NSwxMCBAQAogCQkJCQk+CiAJCQkJPC9GaWxl PgogCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxS ZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMiCisJCQkJCT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZpbGUK IAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFJlc291cmNlVGltaW5n Vmlldy5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCA3ZmYwZDU1NzE1YTI0MThlNDRhMGViYmI2ZGY0 MzEyNjU0OTQ0ZGJlLi42MmI1MzU1OWNjNmU1NGM3ZDI4YjUxNWYzYmFlNWY4MzhhMGVhYzFlIDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCkBAIC00 NSw3ICs0NSw3IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9k ZXRhaWxfbGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0tanMgU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCiAgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVnaXN0cnkuanMg XAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVj dG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjM0Ompz bW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjM1OmpzbW9kdWxlX2Nv bW1vbiBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9J bnNwZWN0b3JCYWNrZW5kLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcyBcCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db2xvci5qcyBcCkBAIC03Niw2ICs3Niw3 IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9kZXRhaWxfbGV2 ZWwgMyAtLWNvbXBpbGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMgXAogICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgXAogICAgICAgICAtLWpz IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDYXRlZ29yeS5qcyBc CisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVNjcmlwdE1hcHBpbmcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qcyBcCiAgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBc CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl U2NyaXB0TWFwcGluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VTY3JpcHRNYXBwaW5nLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM3OTZmZjQ2ZjljZjhkYTkzMDlhN2E2 NTdkZjZiNWRhNmNiYzkzY2EKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qcwpAQCAtMCwwICsxLDE5NSBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAq ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0 aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl CisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJ bmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8g ZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2Fy ZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICog T1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK Ky8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNjcmlwdE1h cHBpbmd9CisgKi8KK1dlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcgPSBmdW5jdGlv bigpCit7CisgICAgdGhpcy5fcmF3U291cmNlQ29kZXMgPSBbXTsKKyAgICB0aGlzLl9yYXdTb3Vy Y2VDb2RlRm9yU2NyaXB0SWQgPSB7fTsKKyAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVVJMID0g e307CisgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMID0ge307CisgICAgdGhp cy5fcmF3U291cmNlQ29kZUZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKKyAgICB0aGlzLl9m b3JtYXR0ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlcigpOworICAgIHRoaXMu X2Zvcm1hdFNvdXJjZSA9IGZhbHNlOworfQorCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRN YXBwaW5nLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0RlYnVnZ2VyQWdl bnQuTG9jYXRpb259IHJhd0xvY2F0aW9uCisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlVJ TG9jYXRpb259CisgICAgICovCisgICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1bmN0aW9u KHJhd0xvY2F0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9y YXdTb3VyY2VDb2RlRm9yU2NyaXB0SWRbcmF3TG9jYXRpb24uc2NyaXB0SWRdOworICAgICAgICBy ZXR1cm4gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihyYXdMb2NhdGlvbik7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHtudW1iZXJ9IGxpbmVOdW1iZXIKKyAg ICAgKiBAcGFyYW0ge251bWJlcn0gY29sdW1uTnVtYmVyCisgICAgICogQHJldHVybiB7RGVidWdn ZXJBZ2VudC5Mb2NhdGlvbn0KKyAgICAgKi8KKyAgICB1aUxvY2F0aW9uVG9SYXdMb2NhdGlvbjog ZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCisgICAgewor ICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JVSVNvdXJj ZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHJldHVybiByYXdTb3VyY2VDb2RlLnVp TG9jYXRpb25Ub1Jhd0xvY2F0aW9uKHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29sdW1uTnVt YmVyKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7QXJyYXkuPFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGU+fQorICAgICAqLworICAgIHVpU291cmNlQ29kZUxpc3Q6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHZhciByZXN1bHQgPSBbXTsKKyAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCB0aGlzLl9yYXdTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgeworICAgICAgICAg ICAgdmFyIHVpU291cmNlQ29kZUxpc3QgPSB0aGlzLl9yYXdTb3VyY2VDb2Rlc1tpXS51aVNvdXJj ZUNvZGVMaXN0KCk7CisgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IHVpU291cmNlQ29k ZUxpc3QubGVuZ3RoOyArK2opCisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2godWlTb3VyY2VD b2RlTGlzdFtqXSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9LAor CisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0fSBzY3JpcHQKKyAg ICAgKi8KKyAgICBhZGRTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkKKyAgICB7CisgICAgICAgIHZh ciByZXNvdXJjZSA9IG51bGw7CisgICAgICAgIHZhciBpc0lubGluZVNjcmlwdCA9IGZhbHNlOwor ICAgICAgICBpZiAoc2NyaXB0LmlzSW5saW5lU2NyaXB0KCkpIHsKKyAgICAgICAgICAgIHJlc291 cmNlID0gV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmluZmxpZ2h0UmVzb3VyY2VGb3JVUkwo c2NyaXB0LnNvdXJjZVVSTCkgfHwgV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHNjcmlwdC5z b3VyY2VVUkwpOworICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnR5cGUgPT09 IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLkRvY3VtZW50KSB7CisgICAgICAgICAgICAgICAg aXNJbmxpbmVTY3JpcHQgPSB0cnVlOworICAgICAgICAgICAgICAgIHZhciByYXdTb3VyY2VDb2Rl ID0gdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMW3NjcmlwdC5zb3VyY2VVUkxdOwor ICAgICAgICAgICAgICAgIGlmIChyYXdTb3VyY2VDb2RlKSB7CisgICAgICAgICAgICAgICAgICAg IHJhd1NvdXJjZUNvZGUuYWRkU2NyaXB0KHNjcmlwdCk7CisgICAgICAgICAgICAgICAgICAgIHRo aXMuX2JpbmRTY3JpcHRUb1Jhd1NvdXJjZUNvZGUoc2NyaXB0LCByYXdTb3VyY2VDb2RlKTsKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorCisgICAgICAgIHZhciBjb21waWxlclNvdXJjZU1hcHBpbmcgPSBudWxs OworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNvdXJjZU1hcHNFbmFibGVkLmdl dCgpICYmIHNjcmlwdC5zb3VyY2VNYXBVUkwpCisgICAgICAgICAgICBjb21waWxlclNvdXJjZU1h cHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcoc2Ny aXB0LnNvdXJjZU1hcFVSTCwgc2NyaXB0LnNvdXJjZVVSTCk7CisKKyAgICAgICAgdmFyIHJhd1Nv dXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUoc2NyaXB0LnNjcmlwdElk LCBzY3JpcHQsIHJlc291cmNlLCB0aGlzLl9mb3JtYXR0ZXIsIHRoaXMuX2Zvcm1hdFNvdXJjZSwg Y29tcGlsZXJTb3VyY2VNYXBwaW5nKTsKKyAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZXMucHVz aChyYXdTb3VyY2VDb2RlKTsKKyAgICAgICAgdGhpcy5fYmluZFNjcmlwdFRvUmF3U291cmNlQ29k ZShzY3JpcHQsIHJhd1NvdXJjZUNvZGUpOworCisgICAgICAgIGlmIChpc0lubGluZVNjcmlwdCkK KyAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JEb2N1bWVudFVSTFtzY3JpcHQuc291 cmNlVVJMXSA9IHJhd1NvdXJjZUNvZGU7CisKKyAgICAgICAgaWYgKHJhd1NvdXJjZUNvZGUudWlT b3VyY2VDb2RlTGlzdCgpLmxlbmd0aCkKKyAgICAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUxp c3RDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIFtdLCByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZUxp c3QoKSk7CisgICAgICAgIHJhd1NvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuUmF3U291cmNlQ29kZS5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRoaXMuX2hh bmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzKTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hh bmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAg ICAgIHZhciByYXdTb3VyY2VDb2RlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmF3U291cmNl Q29kZX0gKi8gZXZlbnQudGFyZ2V0OworICAgICAgICB2YXIgb2xkVUlTb3VyY2VDb2RlTGlzdCA9 IC8qKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLyBldmVudC5k YXRhWyJvbGRVSVNvdXJjZUNvZGVMaXN0Il07CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUxp c3RDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIG9sZFVJU291cmNlQ29kZUxpc3QsIHJhd1NvdXJjZUNv ZGUudWlTb3VyY2VDb2RlTGlzdCgpKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQorICAgICAqIEBwYXJh bSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSByZW1vdmVkSXRlbXMKKyAgICAg KiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gYWRkZWRJdGVtcwor ICAgICAqLworICAgIF91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZDogZnVuY3Rpb24ocmF3U291cmNl Q29kZSwgcmVtb3ZlZEl0ZW1zLCBhZGRlZEl0ZW1zKQorICAgIHsKKyAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCByZW1vdmVkSXRlbXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLl9y YXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnJlbW92ZShyZW1vdmVkSXRlbXNbaV0pOworICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFkZGVkSXRlbXMubGVuZ3RoOyArK2kpCisgICAgICAg ICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnB1dChhZGRlZEl0ZW1zW2ld LCByYXdTb3VyY2VDb2RlKTsKKworICAgICAgICB2YXIgc2NyaXB0SWRzID0gW107CisgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgcmF3U291cmNlQ29kZS5fc2NyaXB0cy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgIHNjcmlwdElkcy5wdXNoKHJhd1NvdXJjZUNvZGUuX3NjcmlwdHNbaV0uc2Ny aXB0SWQpOworICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiByZW1vdmVkSXRlbXMs IGFkZGVkSXRlbXM6IGFkZGVkSXRlbXMsIHNjcmlwdElkczogc2NyaXB0SWRzIH07CisgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRNYXBwaW5n LkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7CisgICAgfSwKKworICAgIC8q KgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0gc2NyaXB0CisgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQorICAgICAqLwor ICAgIF9iaW5kU2NyaXB0VG9SYXdTb3VyY2VDb2RlOiBmdW5jdGlvbihzY3JpcHQsIHJhd1NvdXJj ZUNvZGUpCisgICAgeworICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0SWRbc2Ny aXB0LnNjcmlwdElkXSA9IHJhd1NvdXJjZUNvZGU7CisgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNv ZGVGb3JVUkxbc2NyaXB0LnNvdXJjZVVSTF0gPSByYXdTb3VyY2VDb2RlOworICAgIH0sCisKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGZvcm1hdFNvdXJjZQorICAgICAqLworICAg IHNldEZvcm1hdFNvdXJjZTogZnVuY3Rpb24oZm9ybWF0U291cmNlKQorICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX2Zvcm1hdFNvdXJjZSA9PT0gZm9ybWF0U291cmNlKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIHRoaXMuX2Zvcm1hdFNvdXJjZSA9IGZvcm1hdFNvdXJjZTsKKyAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yYXdTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVzW2ldLnNldEZvcm1hdHRlZCh0aGlzLl9m b3JtYXRTb3VyY2UpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0RlYnVnZ2Vy QWdlbnQuTG9jYXRpb259IHJhd0xvY2F0aW9uCisgICAgICovCisgICAgZm9yY2VVcGRhdGVTb3Vy Y2VNYXBwaW5nOiBmdW5jdGlvbihyYXdMb2NhdGlvbikKKyAgICB7CisgICAgICAgIHZhciByYXdT b3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdElkW3Jhd0xvY2F0aW9uLnNj cmlwdElkXTsKKyAgICAgICAgcmF3U291cmNlQ29kZS5mb3JjZVVwZGF0ZVNvdXJjZU1hcHBpbmco KTsKKyAgICB9LAorCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdGhpcy5fcmF3U291cmNlQ29kZXMubGVuZ3RoOyArK2kpIHsKKyAgICAg ICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZXNbaV07CisgICAg ICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZChyYXdTb3VyY2VDb2RlLCByYXdT b3VyY2VDb2RlLnVpU291cmNlQ29kZUxpc3QoKSwgW10pOworICAgICAgICAgICAgcmF3U291cmNl Q29kZS5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9yYXdT b3VyY2VDb2RlcyA9IFtdOworICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0SWQg PSB7fTsKKyAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvclVSTCA9IHt9OworICAgICAgICB0 aGlzLl9yYXdTb3VyY2VDb2RlRm9yRG9jdW1lbnRVUkwgPSB7fTsKKyAgICAgICAgdGhpcy5fcmF3 U291cmNlQ29kZUZvclVJU291cmNlQ29kZS5jbGVhcigpOworICAgIH0KK30KKworV2ViSW5zcGVj dG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVj dG9yLlNjcmlwdE1hcHBpbmcucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRNYXBwaW5nLmpzCmluZGV4IDZhMzhlOWJmNTI5NTY2ZTBl OTc5YWQ1YWFlY2NhMGJkMmM1MTM1NTMuLjMwOTRkOTNlMDgzM2Q2MzQ4ZjE3MTJiYjExN2M3OGU4 ZjIwOGE5OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0TWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdE1hcHBpbmcuanMKQEAgLTY1LDE3MiArNjUsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 TWFwcGluZy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5 cGU7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNj cmlwdE1hcHBpbmd9Ci0gKi8KLVdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcgPSBm dW5jdGlvbigpCi17Ci0gICAgdGhpcy5fcmF3U291cmNlQ29kZXMgPSBbXTsKLSAgICB0aGlzLl9y YXdTb3VyY2VDb2RlRm9yU2NyaXB0SWQgPSB7fTsKLSAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9y VVJMID0ge307Ci0gICAgdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMID0ge307Ci0g ICAgdGhpcy5fcmF3U291cmNlQ29kZUZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKLSAgICB0 aGlzLl9mb3JtYXR0ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlcigpOwotICAg IHRoaXMuX2Zvcm1hdFNvdXJjZSA9IGZhbHNlOwotfQotCi1XZWJJbnNwZWN0b3IuUmVzb3VyY2VT Y3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0RlYnVn Z2VyQWdlbnQuTG9jYXRpb259IHJhd0xvY2F0aW9uCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVj dG9yLlVJTG9jYXRpb259Ci0gICAgICovCi0gICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1 bmN0aW9uKHJhd0xvY2F0aW9uKQotICAgIHsKLSAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0 aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0SWRbcmF3TG9jYXRpb24uc2NyaXB0SWRdOwotICAg ICAgICByZXR1cm4gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihyYXdMb2Nh dGlvbik7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IGxpbmVOdW1i ZXIKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gY29sdW1uTnVtYmVyCi0gICAgICogQHJldHVybiB7 RGVidWdnZXJBZ2VudC5Mb2NhdGlvbn0KLSAgICAgKi8KLSAgICB1aUxvY2F0aW9uVG9SYXdMb2Nh dGlvbjogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCi0g ICAgewotICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JV SVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7Ci0gICAgICAgIHJldHVybiByYXdTb3VyY2VD b2RlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fQotICAgICAqLwotICAgIHVpU291cmNlQ29kZUxpc3Q6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yYXdTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgewotICAg ICAgICAgICAgdmFyIHVpU291cmNlQ29kZUxpc3QgPSB0aGlzLl9yYXdTb3VyY2VDb2Rlc1tpXS51 aVNvdXJjZUNvZGVMaXN0KCk7Ci0gICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IHVpU291 cmNlQ29kZUxpc3QubGVuZ3RoOyArK2opCi0gICAgICAgICAgICAgICAgcmVzdWx0LnB1c2godWlT b3VyY2VDb2RlTGlzdFtqXSk7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAg ICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0fSBzY3Jp cHQKLSAgICAgKi8KLSAgICBhZGRTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkKLSAgICB7Ci0gICAg ICAgIHZhciByZXNvdXJjZSA9IG51bGw7Ci0gICAgICAgIHZhciBpc0lubGluZVNjcmlwdCA9IGZh bHNlOwotICAgICAgICBpZiAoc2NyaXB0LmlzSW5saW5lU2NyaXB0KCkpIHsKLSAgICAgICAgICAg IHJlc291cmNlID0gV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmluZmxpZ2h0UmVzb3VyY2VG b3JVUkwoc2NyaXB0LnNvdXJjZVVSTCkgfHwgV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHNj cmlwdC5zb3VyY2VVUkwpOwotICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLkRvY3VtZW50KSB7Ci0gICAgICAgICAg ICAgICAgaXNJbmxpbmVTY3JpcHQgPSB0cnVlOwotICAgICAgICAgICAgICAgIHZhciByYXdTb3Vy Y2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMW3NjcmlwdC5zb3VyY2VV UkxdOwotICAgICAgICAgICAgICAgIGlmIChyYXdTb3VyY2VDb2RlKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHJhd1NvdXJjZUNvZGUuYWRkU2NyaXB0KHNjcmlwdCk7Ci0gICAgICAgICAgICAgICAg ICAgIHRoaXMuX2JpbmRTY3JpcHRUb1Jhd1NvdXJjZUNvZGUoc2NyaXB0LCByYXdTb3VyY2VDb2Rl KTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIHZhciBjb21waWxlclNvdXJjZU1hcHBpbmcg PSBudWxsOwotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNvdXJjZU1hcHNFbmFi bGVkLmdldCgpICYmIHNjcmlwdC5zb3VyY2VNYXBVUkwpCi0gICAgICAgICAgICBjb21waWxlclNv dXJjZU1hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBp bmcoc2NyaXB0LnNvdXJjZU1hcFVSTCwgc2NyaXB0LnNvdXJjZVVSTCk7Ci0KLSAgICAgICAgdmFy IHJhd1NvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUoc2NyaXB0LnNj cmlwdElkLCBzY3JpcHQsIHJlc291cmNlLCB0aGlzLl9mb3JtYXR0ZXIsIHRoaXMuX2Zvcm1hdFNv dXJjZSwgY29tcGlsZXJTb3VyY2VNYXBwaW5nKTsKLSAgICAgICAgdGhpcy5fcmF3U291cmNlQ29k ZXMucHVzaChyYXdTb3VyY2VDb2RlKTsKLSAgICAgICAgdGhpcy5fYmluZFNjcmlwdFRvUmF3U291 cmNlQ29kZShzY3JpcHQsIHJhd1NvdXJjZUNvZGUpOwotCi0gICAgICAgIGlmIChpc0lubGluZVNj cmlwdCkKLSAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JEb2N1bWVudFVSTFtzY3Jp cHQuc291cmNlVVJMXSA9IHJhd1NvdXJjZUNvZGU7Ci0KLSAgICAgICAgaWYgKHJhd1NvdXJjZUNv ZGUudWlTb3VyY2VDb2RlTGlzdCgpLmxlbmd0aCkKLSAgICAgICAgICAgIHRoaXMuX3VpU291cmNl Q29kZUxpc3RDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIFtdLCByYXdTb3VyY2VDb2RlLnVpU291cmNl Q29kZUxpc3QoKSk7Ci0gICAgICAgIHJhd1NvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRo aXMuX2hhbmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzKTsKLSAgICB9LAotCi0gICAg LyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50Ci0gICAgICovCi0g ICAgX2hhbmRsZVVJU291cmNlQ29kZUxpc3RDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7 Ci0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmF3 U291cmNlQ29kZX0gKi8gZXZlbnQudGFyZ2V0OwotICAgICAgICB2YXIgb2xkVUlTb3VyY2VDb2Rl TGlzdCA9IC8qKiBAdHlwZSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLyBl dmVudC5kYXRhWyJvbGRVSVNvdXJjZUNvZGVMaXN0Il07Ci0gICAgICAgIHRoaXMuX3VpU291cmNl Q29kZUxpc3RDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIG9sZFVJU291cmNlQ29kZUxpc3QsIHJhd1Nv dXJjZUNvZGUudWlTb3VyY2VDb2RlTGlzdCgpKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQotICAgICAq IEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSByZW1vdmVkSXRlbXMK LSAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gYWRkZWRJ dGVtcwotICAgICAqLwotICAgIF91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZDogZnVuY3Rpb24ocmF3 U291cmNlQ29kZSwgcmVtb3ZlZEl0ZW1zLCBhZGRlZEl0ZW1zKQotICAgIHsKLSAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkSXRlbXMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0 aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnJlbW92ZShyZW1vdmVkSXRlbXNbaV0p OwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFkZGVkSXRlbXMubGVuZ3RoOyArK2kpCi0g ICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlLnB1dChhZGRlZEl0 ZW1zW2ldLCByYXdTb3VyY2VDb2RlKTsKLQotICAgICAgICB2YXIgc2NyaXB0SWRzID0gW107Ci0g ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmF3U291cmNlQ29kZS5fc2NyaXB0cy5sZW5ndGg7 ICsraSkKLSAgICAgICAgICAgIHNjcmlwdElkcy5wdXNoKHJhd1NvdXJjZUNvZGUuX3NjcmlwdHNb aV0uc2NyaXB0SWQpOwotICAgICAgICB2YXIgZGF0YSA9IHsgcmVtb3ZlZEl0ZW1zOiByZW1vdmVk SXRlbXMsIGFkZGVkSXRlbXM6IGFkZGVkSXRlbXMsIHNjcmlwdElkczogc2NyaXB0SWRzIH07Ci0g ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRN YXBwaW5nLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgZGF0YSk7Ci0gICAgfSwKLQot ICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNjcmlwdH0gc2NyaXB0Ci0gICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQotICAg ICAqLwotICAgIF9iaW5kU2NyaXB0VG9SYXdTb3VyY2VDb2RlOiBmdW5jdGlvbihzY3JpcHQsIHJh d1NvdXJjZUNvZGUpCi0gICAgewotICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0 SWRbc2NyaXB0LnNjcmlwdElkXSA9IHJhd1NvdXJjZUNvZGU7Ci0gICAgICAgIHRoaXMuX3Jhd1Nv dXJjZUNvZGVGb3JVUkxbc2NyaXB0LnNvdXJjZVVSTF0gPSByYXdTb3VyY2VDb2RlOwotICAgIH0s Ci0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGZvcm1hdFNvdXJjZQotICAgICAq LwotICAgIHNldEZvcm1hdFNvdXJjZTogZnVuY3Rpb24oZm9ybWF0U291cmNlKQotICAgIHsKLSAg ICAgICAgaWYgKHRoaXMuX2Zvcm1hdFNvdXJjZSA9PT0gZm9ybWF0U291cmNlKQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX2Zvcm1hdFNvdXJjZSA9IGZvcm1hdFNvdXJjZTsK LSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yYXdTb3VyY2VDb2Rlcy5sZW5ndGg7 ICsraSkKLSAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVzW2ldLnNldEZvcm1hdHRlZCh0 aGlzLl9mb3JtYXRTb3VyY2UpOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0Rl YnVnZ2VyQWdlbnQuTG9jYXRpb259IHJhd0xvY2F0aW9uCi0gICAgICovCi0gICAgZm9yY2VVcGRh dGVTb3VyY2VNYXBwaW5nOiBmdW5jdGlvbihyYXdMb2NhdGlvbikKLSAgICB7Ci0gICAgICAgIHZh ciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdElkW3Jhd0xvY2F0 aW9uLnNjcmlwdElkXTsKLSAgICAgICAgcmF3U291cmNlQ29kZS5mb3JjZVVwZGF0ZVNvdXJjZU1h cHBpbmcoKTsKLSAgICB9LAotCi0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcmF3U291cmNlQ29kZXMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZXNbaV07 Ci0gICAgICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZChyYXdTb3VyY2VDb2Rl LCByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZUxpc3QoKSwgW10pOwotICAgICAgICAgICAgcmF3 U291cmNlQ29kZS5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKLSAgICAgICAgfQotICAgICAgICB0aGlz Ll9yYXdTb3VyY2VDb2RlcyA9IFtdOwotICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2Ny aXB0SWQgPSB7fTsKLSAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvclVSTCA9IHt9OwotICAg ICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yRG9jdW1lbnRVUkwgPSB7fTsKLSAgICAgICAgdGhp cy5fcmF3U291cmNlQ29kZUZvclVJU291cmNlQ29kZS5jbGVhcigpOwotICAgIH0KLX0KLQotV2Vi SW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLlNjcmlwdE1hcHBpbmcucHJvdG90eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3Rv cgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CiAgKi8KIFdlYkluc3BlY3Rvci5N YWluU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCA1N2M1OGU2NTFjMjE3NjAxOWU2MmYxOGUxZTA1 ZjQ0YTI1MmRjMTVmLi43YjY5MzJlMGFjNWI1YTZiMzYwN2ExYzRjNzBkYzc0YjU4YThlNThlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC0x MDksNiArMTA5LDcgQEAKICAgICA8ZmlsZT5SZXNvdXJjZUhlYWRlcnNWaWV3LmpzPC9maWxlPgog ICAgIDxmaWxlPlJlc291cmNlUHJldmlld1ZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+UmVzb3Vy Y2VSZXNwb25zZVZpZXcuanM8L2ZpbGU+CisgICAgPGZpbGU+UmVzb3VyY2VTY3JpcHRNYXBwaW5n LmpzPC9maWxlPgogICAgIDxmaWxlPlJlc291cmNlVGltaW5nVmlldy5qczwvZmlsZT4KICAgICA8 ZmlsZT5SZXNvdXJjZVRyZWVNb2RlbC5qczwvZmlsZT4KICAgICA8ZmlsZT5SZXNvdXJjZVV0aWxz LmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmh0bWwKaW5kZXggN2MyMDc3OGFlY2U3MWU4YmJlNzdhYjJkOWZkN2VkODViNDdkZjlm YS4uYjNmODZhZjFhZTU5ZWYyMWQ1MzQyOWMwYTU3YzQyNjVlYTE5ZTBjNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xNzQs NiArMTc0LDcgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJVSVNvdXJjZUNvZGUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9q YXZhc2NyaXB0IiBzcmM9IkNvbnRlbnRQcm92aWRlcnMuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJhd1NvdXJjZUNvZGUuanMiPjwvc2NyaXB0 PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlU2NyaXB0 TWFwcGluZy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iQ29tcGlsZXJTb3VyY2VNYXBwaW5nLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTY3JpcHRzU2VhcmNoU2NvcGUuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkRPTUFnZW50LmpzIj48 L3NjcmlwdD4K