113489 2013-03-28 01:25:18 -0700 Web Inspector: Simplify ResourceScriptFile so that it stores hasDiverged state in it. 2013-03-28 05:32:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113488 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 865240 0 vsevik 2013-03-28 01:25:18 -0700 This is a preliminary step for https://bugs.webkit.org/show_bug.cgi?id=113488 (Web Inspector: ResourceScriptFile should check if resource content really matches VM script when determining hasDiverged state.) 865323 1 195526 vsevik 2013-03-28 04:12:17 -0700 Created attachment 195526 Patch 865380 2 vsevik 2013-03-28 05:32:35 -0700 Committed r147099: <http://trac.webkit.org/changeset/147099> 195526 2013-03-28 04:12:17 -0700 2013-03-28 05:31:39 -0700 Patch bug-113489-20130328151215.patch text/plain 18581 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE2YWZlOGZjMTM4Njhj Nzc2YTVmN2IxNjVlMjZjN2YzNjcxOTkzYS4uYjVhNjc4N2QwODJkYzgyZjkyZjBiZTZhMjdjYjYy NmVlYzdjZTE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEzLTAzLTI4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNpbXBsaWZ5IFJlc291cmNlU2NyaXB0RmlsZSBzbyB0aGF0IGl0IHN0b3JlcyBoYXNEaXZl cmdlZCBzdGF0ZSBpbiBpdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMzQ4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlc291cmNlU2NyaXB0RmlsZS5faGFzRGl2ZXJnZWQgaXMgdGhlIG9uZSBmbGFn IHRoYXQgc2hvd3Mgd2hldGhlciB3ZSBoYXZlIGRpdmVyZ2VkIGZyb20gVk0uCisgICAgICAgIEl0 J3MgdmFsdWVzIGlzIGJhc2VkIGJvdGggb24gZGlydHkgZmxhZyBvbiB1aVNvdXJjZUNvZGUgYW5k IGluZm9ybWF0aW9uIGFib3V0IGxpdmUgZWRpdCBmYWlsdXJlcyBzdG9yZWQgaW4gX2xhc3RMaXZl RWRpdEZhaWxlZCBmaWVsZC4KKyAgICAgICAgUmVtb3ZlZCB3aWxsTWVyZ2UvRGl2ZXJnZSBldmVu dHMgZnJvbSBTY3JpcHRGaWxlLgorICAgICAgICBKYXZhU2NyaXB0U291cmNlRnJhbWUgbm93IHVz ZXMgaXNNZXJnaW5nVG9WTS9EaXZlcmdpbmdGcm9tVk0gbWV0aG9kcyBvbiBTY3JpcHRGaWxlLgor ICAgICAgICB0byBkZXRlcm1pbmUgd2hldGhlciBicmVha3BvaW50QWRkZWQvUmVtb3ZlZCBldmVu dHMgc2hvdWxkIGJlIGlnbm9yZWQuCisgICAgICAgIEludHJvZHVjZWQgbXV0ZWQgc3RhdGUgb24g SmF2YVNjcmlwdFNvdXJjZUZyYW1lIHRvIGRldGVybWluZSB3aGV0aGVyIGl0IHNob3VsZCBpZ25v cmUgdXNlciBhdHRlbXB0cyB0byBzZXQvcmVtb3ZlIGJyZWFrcG9pbnRzLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLl9kaWRNZXJnZVRvVk0pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX2RpZERpdmVy Z2VGcm9tVk0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUuX211dGVCcmVha3BvaW50c1doaWxlRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fcmVzdG9yZUJyZWFrcG9pbnRz QWZ0ZXJFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJh bWUucHJvdG90eXBlLl9hZGRCcmVha3BvaW50RGVjb3JhdGlvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fcmVtb3ZlQnJlYWtwb2ludERl Y29yYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUuX3Nob3VsZElnbm9yZUV4dGVybmFsQnJlYWtwb2ludEV2ZW50cyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fYnJlYWtwb2lu dEFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJv dG90eXBlLl9icmVha3BvaW50UmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fdXBkYXRlU2NyaXB0RmlsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5vblRleHRFZGl0b3JD b250ZW50TG9hZGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0xpdmVFZGl0U3Vw cG9ydC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MaXZlRWRpdFNjcmlwdEZpbGUucHJvdG90 eXBlLmlzTWVyZ2luZ1RvVk0pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VTY3JpcHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0 TWFwcGluZy5wcm90b3R5cGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdEZpbGUucHJvdG90eXBlLmlzTWVyZ2luZ1RvVk0pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UmVzb3VyY2VTY3JpcHRGaWxlLnByb3RvdHlwZS5fd29ya2luZ0NvcHlDb21taXR0ZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUuX2lzRGl2ZXJn ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUu X3dvcmtpbmdDb3B5Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3Jp cHRGaWxlLnByb3RvdHlwZS5fdXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNjcmlwdEZpbGUucHJvdG90eXBlLl9kaXZlcmdlRnJvbVZNKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVNjcmlwdEZpbGUucHJvdG90eXBlLl9tZXJnZVRvVk0pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUuaGFzRGl2ZXJnZWRGcm9t Vk0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUu aXNNZXJnaW5nVG9WTSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlw cGV0TW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU25pcHBldFNjcmlwdEZpbGUucHJv dG90eXBlLmlzTWVyZ2luZ1RvVk0pOgorCiAyMDEzLTAzLTI3ICBLZWlzaGkgSGF0dG9yaSAgPGtl aXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIERyYWdnaW5nIHRvIGVkZ2Ugc2hvdWxkIGFsd2F5 cyBzbmFwIHRvIG1pbi9tYXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IDBiM2VjZTQ5NzA1 YWFiOGQyMDI0YzllYmFmMjliYzFjOWEwNmJhOTEuLmNhNDBlZTBkNGQ2MjhmZTg2Mjg2N2U4MmI0 NzYyNGRiNzEyMzYwMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC01OCw3ICs1OCw3IEBA IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRzUGFu ZWwsIHVpU291cmNlQ29kZSkKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZVJlbW92ZWQs IHRoaXMuX2NvbnNvbGVNZXNzYWdlUmVtb3ZlZCwgdGhpcyk7CiAgICAgdGhpcy5fdWlTb3VyY2VD b2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29u c29sZU1lc3NhZ2VzQ2xlYXJlZCwgdGhpcy5fY29uc29sZU1lc3NhZ2VzQ2xlYXJlZCwgdGhpcyk7 CiAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ0NoYW5nZWQsIHRoaXMuX29uU291cmNlTWFw cGluZ0NoYW5nZWQsIHRoaXMpOwotICAgIAorCiAgICAgdGhpcy5fdXBkYXRlU2NyaXB0RmlsZSgp OwogfQogCkBAIC0xMjksMzggKzEyOSwyNCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZy YW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUuY2FsbCh0aGlzLCBjb250 ZXh0TWVudSwgbGluZU51bWJlcik7CiAgICAgfSwKIAotICAgIF93aWxsTWVyZ2VUb1ZNOiBmdW5j dGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fc3VwcG9ydHNFbmFibGVkQnJlYWtwb2lu dHNXaGlsZUVkaXRpbmcoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fcHJl c2VydmVEZWNvcmF0aW9ucyA9IHRydWU7Ci0gICAgfSwKLQogICAgIF9kaWRNZXJnZVRvVk06IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zdXBwb3J0c0VuYWJsZWRCcmVha3Bv aW50c1doaWxlRWRpdGluZygpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBkZWxldGUg dGhpcy5fcHJlc2VydmVEZWNvcmF0aW9uczsKICAgICAgICAgdGhpcy5fcmVzdG9yZUJyZWFrcG9p bnRzQWZ0ZXJFZGl0aW5nKCk7CiAgICAgfSwKIAotICAgIF93aWxsRGl2ZXJnZUZyb21WTTogZnVu Y3Rpb24oKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3N1cHBvcnRzRW5hYmxlZEJyZWFrcG9p bnRzV2hpbGVFZGl0aW5nKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX3By ZXNlcnZlRGVjb3JhdGlvbnMgPSB0cnVlOwotICAgIH0sCi0KICAgICBfZGlkRGl2ZXJnZUZyb21W TTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3N1cHBvcnRzRW5hYmxlZEJy ZWFrcG9pbnRzV2hpbGVFZGl0aW5nKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGRl bGV0ZSB0aGlzLl9wcmVzZXJ2ZURlY29yYXRpb25zOwogICAgICAgICB0aGlzLl9tdXRlQnJlYWtw b2ludHNXaGlsZUVkaXRpbmcoKTsKICAgICB9LAogCiAgICAgX211dGVCcmVha3BvaW50c1doaWxl RWRpdGluZzogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX211dGVkKQorICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyID0gMDsgbGluZU51 bWJlciA8IHRoaXMuX3RleHRFZGl0b3IubGluZXNDb3VudDsgKytsaW5lTnVtYmVyKSB7CiAgICAg ICAgICAgICB2YXIgYnJlYWtwb2ludERlY29yYXRpb24gPSB0aGlzLl90ZXh0RWRpdG9yLmdldEF0 dHJpYnV0ZShsaW5lTnVtYmVyLCAiYnJlYWtwb2ludCIpOwogICAgICAgICAgICAgaWYgKCFicmVh a3BvaW50RGVjb3JhdGlvbikKQEAgLTE2OCw2ICsxNTQsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3JlbW92ZUJy ZWFrcG9pbnREZWNvcmF0aW9uKGxpbmVOdW1iZXIpOwogICAgICAgICAgICAgdGhpcy5fYWRkQnJl YWtwb2ludERlY29yYXRpb24obGluZU51bWJlciwgYnJlYWtwb2ludERlY29yYXRpb24uY29uZGl0 aW9uLCBicmVha3BvaW50RGVjb3JhdGlvbi5lbmFibGVkLCB0cnVlKTsKICAgICAgICAgfQorICAg ICAgICB0aGlzLl9tdXRlZCA9IHRydWU7CiAgICAgfSwKIAogICAgIF9zdXBwb3J0c0VuYWJsZWRC cmVha3BvaW50c1doaWxlRWRpdGluZzogZnVuY3Rpb24oKQpAQCAtMTc3LDYgKzE2NCw3IEBAIFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgX3Jl c3RvcmVCcmVha3BvaW50c0FmdGVyRWRpdGluZzogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAg ZGVsZXRlIHRoaXMuX211dGVkOwogICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSB7fTsKICAgICAg ICAgLy8gU2F2ZSBhbmQgcmVtb3ZlIG11dGVkIGJyZWFrcG9pbnQgZGVjb3JhdGlvbnMuCiAgICAg ICAgIGZvciAodmFyIGxpbmVOdW1iZXIgPSAwOyBsaW5lTnVtYmVyIDwgdGhpcy5fdGV4dEVkaXRv ci5saW5lc0NvdW50OyArK2xpbmVOdW1iZXIpIHsKQEAgLTMxMSwxMiArMjk5LDExIEBAIFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAqLwogICAg IF9hZGRCcmVha3BvaW50RGVjb3JhdGlvbjogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9u LCBlbmFibGVkLCBtdXRlZFdoaWxlRWRpdGluZykKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9w cmVzZXJ2ZURlY29yYXRpb25zKQotICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgYnJl YWtwb2ludCA9IHsKICAgICAgICAgICAgIGNvbmRpdGlvbjogY29uZGl0aW9uLAogICAgICAgICAg ICAgZW5hYmxlZDogZW5hYmxlZAogICAgICAgICB9OworCiAgICAgICAgIHRoaXMudGV4dEVkaXRv ci5zZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiLCBicmVha3BvaW50KTsKIAog ICAgICAgICB2YXIgZGlzYWJsZWQgPSAhZW5hYmxlZCB8fCBtdXRlZFdoaWxlRWRpdGluZzsKQEAg LTMyNSw4ICszMTIsNiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKIAogICAgIF9yZW1vdmVCcmVha3BvaW50RGVjb3JhdGlvbjogZnVuY3Rpb24obGlu ZU51bWJlcikKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9wcmVzZXJ2ZURlY29yYXRpb25zKQot ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLnRleHRFZGl0b3IucmVtb3ZlQXR0cmli dXRlKGxpbmVOdW1iZXIsICJicmVha3BvaW50Iik7CiAgICAgICAgIHRoaXMudGV4dEVkaXRvci5y ZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIpOwogICAgIH0sCkBAIC00MzAsMTIgKzQxNSwyNSBA QCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgcmV0dXJuIG5ld0xpbmVOdW1iZXI7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEByZXR1 cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgX3Nob3VsZElnbm9yZUV4dGVybmFsQnJlYWtwb2lu dEV2ZW50czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3N1cHBvcnRzRW5h YmxlZEJyZWFrcG9pbnRzV2hpbGVFZGl0aW5nKCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIGlmICh0aGlzLl9tdXRlZCkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICByZXR1cm4gdGhpcy5fc2NyaXB0RmlsZSAmJiAodGhpcy5fc2NyaXB0RmlsZS5pc0RpdmVy Z2luZ0Zyb21WTSgpIHx8IHRoaXMuX3NjcmlwdEZpbGUuaXNNZXJnaW5nVG9WTSgpKTsKKyAgICB9 LAorCiAgICAgX2JyZWFrcG9pbnRBZGRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB2YXIgdWlMb2NhdGlvbiA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJTG9jYXRpb259ICov IChldmVudC5kYXRhLnVpTG9jYXRpb24pOwotCiAgICAgICAgIGlmICh1aUxvY2F0aW9uLnVpU291 cmNlQ29kZSAhPT0gdGhpcy5fdWlTb3VyY2VDb2RlKQogICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBpZiAodGhpcy5fc2hvdWxkSWdub3JlRXh0ZXJuYWxCcmVha3BvaW50RXZlbnRzKCkpCisg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSAvKiogQHR5cGUg e1dlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5CcmVha3BvaW50fSAqLyAoZXZlbnQuZGF0 YS5icmVha3BvaW50KTsKICAgICAgICAgaWYgKHRoaXMubG9hZGVkKQpAQCAtNDQ3LDYgKzQ0NSw4 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICB2YXIgdWlMb2NhdGlvbiA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJTG9jYXRpb259 ICovIChldmVudC5kYXRhLnVpTG9jYXRpb24pOwogICAgICAgICBpZiAodWlMb2NhdGlvbi51aVNv dXJjZUNvZGUgIT09IHRoaXMuX3VpU291cmNlQ29kZSkKICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgaWYgKHRoaXMuX3Nob3VsZElnbm9yZUV4dGVybmFsQnJlYWtwb2ludEV2ZW50cygpKQor ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBicmVha3BvaW50ID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2ludH0gKi8gKGV2ZW50LmRh dGEuYnJlYWtwb2ludCk7CiAgICAgICAgIHZhciByZW1haW5pbmdCcmVha3BvaW50ID0gdGhpcy5f YnJlYWtwb2ludE1hbmFnZXIuZmluZEJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCB1aUxv Y2F0aW9uLmxpbmVOdW1iZXIpOwpAQCAtNDg0LDE2ICs0ODQsMTIgQEAgV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgX3VwZGF0ZVNjcmlwdEZpbGU6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zY3JpcHRGaWxlKSB7Ci0gICAg ICAgICAgICB0aGlzLl9zY3JpcHRGaWxlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LlNjcmlwdEZpbGUuRXZlbnRzLldpbGxNZXJnZVRvVk0sIHRoaXMuX3dpbGxNZXJnZVRvVk0sIHRo aXMpOwogICAgICAgICAgICAgdGhpcy5fc2NyaXB0RmlsZS5yZW1vdmVFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5TY3JpcHRGaWxlLkV2ZW50cy5EaWRNZXJnZVRvVk0sIHRoaXMuX2RpZE1lcmdl VG9WTSwgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9zY3JpcHRGaWxlLnJlbW92ZUV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdEZpbGUuRXZlbnRzLldpbGxEaXZlcmdlRnJvbVZNLCB0 aGlzLl93aWxsRGl2ZXJnZUZyb21WTSwgdGhpcyk7CiAgICAgICAgICAgICB0aGlzLl9zY3JpcHRG aWxlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdEZpbGUuRXZlbnRzLkRp ZERpdmVyZ2VGcm9tVk0sIHRoaXMuX2RpZERpdmVyZ2VGcm9tVk0sIHRoaXMpOwogICAgICAgICB9 CiAgICAgICAgIHRoaXMuX3NjcmlwdEZpbGUgPSB0aGlzLl91aVNvdXJjZUNvZGUuc2NyaXB0Rmls ZSgpOwogICAgICAgICBpZiAodGhpcy5fc2NyaXB0RmlsZSkgewotICAgICAgICAgICAgdGhpcy5f c2NyaXB0RmlsZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRGaWxlLkV2ZW50 cy5XaWxsTWVyZ2VUb1ZNLCB0aGlzLl93aWxsTWVyZ2VUb1ZNLCB0aGlzKTsKICAgICAgICAgICAg IHRoaXMuX3NjcmlwdEZpbGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0Rmls ZS5FdmVudHMuRGlkTWVyZ2VUb1ZNLCB0aGlzLl9kaWRNZXJnZVRvVk0sIHRoaXMpOwotICAgICAg ICAgICAgdGhpcy5fc2NyaXB0RmlsZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3Jp cHRGaWxlLkV2ZW50cy5XaWxsRGl2ZXJnZUZyb21WTSwgdGhpcy5fd2lsbERpdmVyZ2VGcm9tVk0s IHRoaXMpOwogICAgICAgICAgICAgdGhpcy5fc2NyaXB0RmlsZS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5TY3JpcHRGaWxlLkV2ZW50cy5EaWREaXZlcmdlRnJvbVZNLCB0aGlzLl9kaWRE aXZlcmdlRnJvbVZNLCB0aGlzKTsKICAgICAgICAgfQogICAgIH0sCkBAIC01MDQsMTAgKzUwMCw4 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5zZXRFeGVjdXRpb25MaW5lKHRoaXMuX2V4ZWN1dGlvbkxpbmVOdW1iZXIp OwogCiAgICAgICAgIHZhciBicmVha3BvaW50TG9jYXRpb25zID0gdGhpcy5fYnJlYWtwb2ludE1h bmFnZXIuYnJlYWtwb2ludExvY2F0aW9uc0ZvclVJU291cmNlQ29kZSh0aGlzLl91aVNvdXJjZUNv ZGUpOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGJyZWFrcG9pbnRMb2NhdGlvbnMubGVu Z3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gYnJlYWtwb2ludExvY2F0 aW9uc1tpXS5icmVha3BvaW50OwotICAgICAgICAgICAgdGhpcy5fYWRkQnJlYWtwb2ludERlY29y YXRpb24oYnJlYWtwb2ludExvY2F0aW9uc1tpXS51aUxvY2F0aW9uLmxpbmVOdW1iZXIsIGJyZWFr cG9pbnQuY29uZGl0aW9uKCksIGJyZWFrcG9pbnQuZW5hYmxlZCgpLCBmYWxzZSk7Ci0gICAgICAg IH0KKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50TG9jYXRpb25zLmxlbmd0 aDsgKytpKQorICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkKHtkYXRhOmJyZWFrcG9p bnRMb2NhdGlvbnNbaV19KTsKIAogICAgICAgICB2YXIgbWVzc2FnZXMgPSB0aGlzLl91aVNvdXJj ZUNvZGUuY29uc29sZU1lc3NhZ2VzKCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVz c2FnZXMubGVuZ3RoOyArK2kpIHsKQEAgLTUyMSw3ICs1MTUsNyBAQCBXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfaGFuZGxlR3V0 dGVyQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3VpU291 cmNlQ29kZS5pc0RpcnR5KCkgJiYgIXRoaXMuX3N1cHBvcnRzRW5hYmxlZEJyZWFrcG9pbnRzV2hp bGVFZGl0aW5nKCkpCisgICAgICAgIGlmICh0aGlzLl9tdXRlZCkKICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB2YXIgbGluZU51bWJlciA9IGV2ZW50LmRhdGEubGluZU51bWJlcjsKQEAg LTU1Miw3ICs1NDYsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKIAogICAgIHRvZ2dsZUJyZWFrcG9pbnRPbkN1cnJlbnRMaW5lOiBmdW5jdGlvbigp CiAgICAgewotICAgICAgICBpZiAodGhpcy5fdWlTb3VyY2VDb2RlLmlzRGlydHkoKSAmJiAhdGhp cy5fc3VwcG9ydHNFbmFibGVkQnJlYWtwb2ludHNXaGlsZUVkaXRpbmcoKSkKKyAgICAgICAgaWYg KHRoaXMuX211dGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBzZWxlY3Rp b24gPSB0aGlzLnRleHRFZGl0b3Iuc2VsZWN0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0xpdmVFZGl0U3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTGl2ZUVkaXRTdXBwb3J0LmpzCmluZGV4IDlhNDljZjg4 Zjk1M2IyNmNjZWZhY2M1MmRiNWE5MDM5ZGVlZTA0M2EuLjZiZDY4YzBhOTc4NzAxYTRlNDAyZjRh ZmQzZGUwMjczODRmYWIwYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTGl2ZUVkaXRTdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTGl2ZUVkaXRTdXBwb3J0LmpzCkBAIC0xMjYsNiArMTI2LDE0IEBAIFdlYklu c3BlY3Rvci5MaXZlRWRpdFNjcmlwdEZpbGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAg ICovCisgICAgaXNNZXJnaW5nVG9WTTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0sCisKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3QucHJv dG90eXBlCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKaW5kZXggNzVkNDExMjc0MWY1ZjQyZGNl ZDYxYTczMzczNzVmNzkxY2E4ZDlkYy4uNjQ5NzdhMTFkYzk3N2U4YTQ3MjFjZjFiYTVhOWU5YzYy OWUzODNiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKQEAgLTU0LDcgKzU0LDggQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGUgPSB0aGlzLl93b3Jrc3BhY2VVSVNvdXJjZUNvZGVGb3JTY3JpcHQoc2NyaXB0 KTsKICAgICAgICAgaWYgKCF1aVNvdXJjZUNvZGUpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsK LSAgICAgICAgaWYgKHVpU291cmNlQ29kZS5zY3JpcHRGaWxlKCkgJiYgdWlTb3VyY2VDb2RlLnNj cmlwdEZpbGUoKS5oYXNEaXZlcmdlZEZyb21WTSgpKQorICAgICAgICB2YXIgc2NyaXB0RmlsZSA9 IHVpU291cmNlQ29kZS5zY3JpcHRGaWxlKCk7CisgICAgICAgIGlmIChzY3JpcHRGaWxlICYmICgo c2NyaXB0RmlsZS5oYXNEaXZlcmdlZEZyb21WTSgpICYmICFzY3JpcHRGaWxlLmlzTWVyZ2luZ1Rv Vk0oKSkgfHwgc2NyaXB0RmlsZS5pc0RpdmVyZ2luZ0Zyb21WTSgpKSkKICAgICAgICAgICAgIHJl dHVybiBudWxsOwogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHVp U291cmNlQ29kZSwgZGVidWdnZXJNb2RlbExvY2F0aW9uLmxpbmVOdW1iZXIsIGRlYnVnZ2VyTW9k ZWxMb2NhdGlvbi5jb2x1bW5OdW1iZXIgfHwgMCk7CiAgICAgfSwKQEAgLTI0Miw5ICsyNDMsNyBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0RmlsZSA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9y LlNjcmlwdEZpbGUuRXZlbnRzID0gewotICAgIFdpbGxNZXJnZVRvVk06ICJXaWxsTWVyZ2VUb1ZN IiwKICAgICBEaWRNZXJnZVRvVk06ICJEaWRNZXJnZVRvVk0iLAotICAgIFdpbGxEaXZlcmdlRnJv bVZNOiAiV2lsbERpdmVyZ2VGcm9tVk0iLAogICAgIERpZERpdmVyZ2VGcm9tVk06ICJEaWREaXZl cmdlRnJvbVZNIiwKIH0KIApAQCAtMjU4LDYgKzI1NywxMSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 RmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KICAg ICBpc0RpdmVyZ2luZ0Zyb21WTTogZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSwKKworICAg IC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNNZXJnaW5nVG9W TTogZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSwKIH0KIAogLyoqCkBAIC0yNzIsOSArMjc2 LDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdEZpbGUgPSBmdW5jdGlvbihyZXNvdXJj ZVNjcmlwdE1hcHBpbmcsIHVpU291cmNlQ29kZSkKICAgICBXZWJJbnNwZWN0b3IuU2NyaXB0Rmls ZS5jYWxsKHRoaXMpOwogICAgIHRoaXMuX3Jlc291cmNlU2NyaXB0TWFwcGluZyA9IHJlc291cmNl U2NyaXB0TWFwcGluZzsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CisK ICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNvbW1pdHRlZCwgdGhpcy5fd29ya2luZ0NvcHlD b21taXR0ZWQsIHRoaXMpOwogICAgIHRoaXMuX3VpU291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q2hhbmdlZCwgdGhp cy5fd29ya2luZ0NvcHlDaGFuZ2VkLCB0aGlzKTsKLSAgICB0aGlzLl9tYXliZURpcnR5Q2hhbmdl ZChmYWxzZSk7CisgICAgdGhpcy5fdXBkYXRlKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNjcmlwdEZpbGUucHJvdG90eXBlID0gewpAQCAtMjg2LDE3ICsyOTEsMTUgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1bmN0aW9uIGlu bmVyQ2FsbGJhY2soZXJyb3IpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChlcnJvcikgewot ICAgICAgICAgICAgICAgIHRoaXMuX2hhc0RpdmVyZ2VkRnJvbVZNID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICB0aGlzLl9sYXN0TGl2ZUVkaXRGYWlsZWQgPSB0cnVlOwogICAgICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5zaG93RXJyb3JNZXNzYWdlKGVycm9yKTsKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRGaWxlLkV2ZW50cy5XaWxsTWVyZ2VUb1ZNLCB0 aGlzKTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9oYXNEaXZlcmdlZEZyb21WTTsKLSAgICAg ICAgICAgIHRoaXMuX3Jlc291cmNlU2NyaXB0TWFwcGluZy5faGFzTWVyZ2VkVG9WTSh0aGlzLl91 aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlNjcmlwdEZpbGUuRXZlbnRzLkRpZE1lcmdlVG9WTSwgdGhpcyk7CisgICAg ICAgICAgICAKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9sYXN0TGl2ZUVkaXRGYWlsZWQ7Cisg ICAgICAgICAgICB0aGlzLl9tZXJnZVRvVk0oKTsKICAgICAgICAgfQotCisgICAgICAgIAogICAg ICAgICB2YXIgcmF3TG9jYXRpb24gPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5EZWJ1Z2dlck1v ZGVsLkxvY2F0aW9ufSAqLyAodGhpcy5fdWlTb3VyY2VDb2RlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0 aW9uKDAsIDApKTsKICAgICAgICAgaWYgKCFyYXdMb2NhdGlvbikKICAgICAgICAgICAgIHJldHVy bjsKQEAgLTMwNCwyNSArMzA3LDQyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdEZpbGUu cHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zZXRTY3Jp cHRTb3VyY2Uoc2NyaXB0LnNjcmlwdElkLCB0aGlzLl91aVNvdXJjZUNvZGUud29ya2luZ0NvcHko KSwgaW5uZXJDYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9LAogCisgICAgX2lzRGl2ZXJnZWQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl91aVNvdXJjZUNvZGUuaXNEaXJ0 eSgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiB0aGlzLl9sYXN0 TGl2ZUVkaXRGYWlsZWQ7CisgICAgfSwKKwogICAgIF93b3JraW5nQ29weUNoYW5nZWQ6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHdhc0RpcnR5ID0gLyoqIEB0eXBlIHtib29s ZWFufSAqLyAoZXZlbnQuZGF0YS53YXNEaXJ0eSk7Ci0gICAgICAgIHRoaXMuX21heWJlRGlydHlD aGFuZ2VkKHdhc0RpcnR5KTsKKyAgICAgICAgdGhpcy5fdXBkYXRlKCk7CiAgICAgfSwKIAotICAg IF9tYXliZURpcnR5Q2hhbmdlZDogZnVuY3Rpb24od2FzRGlydHkpCisgICAgX3VwZGF0ZTogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF3YXNEaXJ0eSAmJiB0aGlzLl91aVNvdXJjZUNv ZGUuaXNEaXJ0eSgpICYmICF0aGlzLl9oYXNEaXZlcmdlZEZyb21WTSkgewotICAgICAgICAgICAg dGhpcy5faXNEaXZlcmdpbmdGcm9tVk0gPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdEZpbGUuRXZlbnRzLldpbGxEaXZl cmdlRnJvbVZNLCB0aGlzLl91aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgdGhpcy5fcmVzb3Vy Y2VTY3JpcHRNYXBwaW5nLl9oYXNEaXZlcmdlZEZyb21WTSh0aGlzLl91aVNvdXJjZUNvZGUpOwot ICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNj cmlwdEZpbGUuRXZlbnRzLkRpZERpdmVyZ2VGcm9tVk0sIHRoaXMuX3VpU291cmNlQ29kZSk7Ci0g ICAgICAgICAgICBkZWxldGUgdGhpcy5faXNEaXZlcmdpbmdGcm9tVk07Ci0gICAgICAgIH0gZWxz ZSBpZiAod2FzRGlydHkgJiYgIXRoaXMuX3VpU291cmNlQ29kZS5pc0RpcnR5KCkgJiYgIXRoaXMu X2hhc0RpdmVyZ2VkRnJvbVZNKSB7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0RmlsZS5FdmVudHMuV2lsbE1lcmdlVG9WTSwgdGhp cy5fdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlU2NyaXB0TWFwcGlu Zy5faGFzTWVyZ2VkVG9WTSh0aGlzLl91aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdEZpbGUuRXZlbnRzLkRp ZE1lcmdlVG9WTSwgdGhpcy5fdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgfQorICAgICAgICBpZiAo dGhpcy5faXNEaXZlcmdlZCgpICYmICF0aGlzLl9oYXNEaXZlcmdlZEZyb21WTSkKKyAgICAgICAg ICAgIHRoaXMuX2RpdmVyZ2VGcm9tVk0oKTsKKyAgICAgICAgZWxzZSBpZiAoIXRoaXMuX2lzRGl2 ZXJnZWQoKSAmJiB0aGlzLl9oYXNEaXZlcmdlZEZyb21WTSkKKyAgICAgICAgICAgIHRoaXMuX21l cmdlVG9WTSgpOworICAgIH0sCisKKyAgICBfZGl2ZXJnZUZyb21WTTogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdGhpcy5faXNEaXZlcmdpbmdGcm9tVk0gPSB0cnVlOworICAgICAgICB0aGlz Ll9yZXNvdXJjZVNjcmlwdE1hcHBpbmcuX2hhc0RpdmVyZ2VkRnJvbVZNKHRoaXMuX3VpU291cmNl Q29kZSk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9pc0RpdmVyZ2luZ0Zyb21WTTsKKyAgICAgICAg dGhpcy5faGFzRGl2ZXJnZWRGcm9tVk0gPSB0cnVlOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0RmlsZS5FdmVudHMuRGlkRGl2ZXJnZUZy b21WTSwgdGhpcy5fdWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgX21lcmdlVG9WTTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2hhc0RpdmVyZ2VkRnJvbVZNOwor ICAgICAgICB0aGlzLl9pc01lcmdpbmdUb1ZNID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fcmVzb3Vy Y2VTY3JpcHRNYXBwaW5nLl9oYXNNZXJnZWRUb1ZNKHRoaXMuX3VpU291cmNlQ29kZSk7CisgICAg ICAgIGRlbGV0ZSB0aGlzLl9pc01lcmdpbmdUb1ZNOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0RmlsZS5FdmVudHMuRGlkTWVyZ2VUb1ZN LCB0aGlzLl91aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTMzMCw3ICszNTAs NyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRGaWxlLnByb3RvdHlwZSA9IHsKICAgICAg Ki8KICAgICBoYXNEaXZlcmdlZEZyb21WTTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX3VpU291cmNlQ29kZS5pc0RpcnR5KCkgfHwgdGhpcy5faGFzRGl2ZXJnZWRGcm9t Vk07CisgICAgICAgIHJldHVybiB0aGlzLl9oYXNEaXZlcmdlZEZyb21WTTsKICAgICB9LAogCiAg ICAgLyoqCkBAIC0zNDEsNiArMzYxLDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdEZp bGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5faXNEaXZlcmdpbmdGcm9tVk07 CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisg ICAgaXNNZXJnaW5nVG9WTTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu X2lzTWVyZ2luZ1RvVk07CisgICAgfSwKKwogICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q29tbWl0dGVkLCB0aGlzLl93b3Jr aW5nQ29weUNvbW1pdHRlZCwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFNuaXBwZXRNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCmluZGV4IDEyMjIyZGZhYzE5 YWU5MGU1M2JmMTk1NGNiNGZhMmU0MWFmMDUzNmYuLjRhZDdlZTIxZjg1ODQxMzQzOTBmMGRlYjI3 NzQ4NWE1YWZhNGU5MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCkBAIC00MzQsNiArNDM0LDE0IEBAIFdl Ykluc3BlY3Rvci5TbmlwcGV0U2NyaXB0RmlsZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAg IC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNNZXJnaW5nVG9W TTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0sCisKKyAg ICAvKioKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzRGl2ZXJnaW5nRnJvbVZNCiAgICAgICov CiAgICAgc2V0SXNEaXZlcmdpbmdGcm9tVk06IGZ1bmN0aW9uKGlzRGl2ZXJnaW5nRnJvbVZNKQo=