189860 2018-09-21 15:02:24 -0700 Web Inspector: determine hasVisibleEffect for each RecordingAction as it's processed 2018-09-26 23:10:23 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 173807 175485 1 hi hi commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1462112 0 hi 2018-09-21 15:02:24 -0700 Ever since <https://webkit.org/b/185152>, we now process recordings in a much more non-blocking way, meaning that we can do a bit more work for each action. As such, we should attempt to determine `hasVisibleEffect` during this time, as if the experimental flag created in <https://webkit.org/b/185758> was always enabled. 1462123 1 350441 hi 2018-09-21 15:27:15 -0700 Created attachment 350441 Patch 1463823 2 350441 joepeck 2018-09-26 16:44:32 -0700 Comment on attachment 350441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350441&action=review r=me, nice! > Source/WebInspectorUI/UserInterface/Base/Utilities.js:430 > + function isArray(x) { How about naming this `isArrayLike` or `isNativeArrayType` 1463886 3 350943 hi 2018-09-26 22:31:28 -0700 Created attachment 350943 Patch 1463897 4 350943 commit-queue 2018-09-26 23:09:55 -0700 Comment on attachment 350943 Patch Clearing flags on attachment: 350943 Committed r236539: <https://trac.webkit.org/changeset/236539> 1463898 5 commit-queue 2018-09-26 23:09:57 -0700 All reviewed patches have been landed. Closing bug. 1463899 6 webkit-bug-importer 2018-09-26 23:10:23 -0700 <rdar://problem/44820587> 350441 2018-09-21 15:27:15 -0700 2018-09-26 22:31:27 -0700 Patch bug-189860-20180921152715.patch text/plain 18761 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRlNjQzNzgzMDkyYmMxZjJmYjQ0ZWQ2NWJkZmYz ZDEwMzhhMDkxZGEuLjY1MzBhNDcxZmMyNWQ1MzkyNTk5MmVhYzUwYjBlYjA0YzA1YWZiMjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA5LTIxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk ZXRlcm1pbmUgaGFzVmlzaWJsZUVmZmVjdCBmb3IgZWFjaCBSZWNvcmRpbmdBY3Rpb24gYXMgaXQn cyBwcm9jZXNzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4OTg2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQmFzZS9VdGlsaXRpZXMuanM6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9S ZWNvcmRpbmdBY3Rpb24uanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdBY3Rpb24ucHJvdG90eXBl LnByb2Nlc3MuZ2V0Q29udGVudCk6CisgICAgICAgIChXSS5SZWNvcmRpbmdBY3Rpb24ucHJvdG90 eXBlLnByb2Nlc3MpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdB Y3Rpb25UcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLlJlY29yZGluZ0FjdGlvblRyZWVFbGVt ZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5nQ29udGVudFZp ZXcucHJvdG90eXBlLl91cGRhdGVJbWFnZUdyaWQpOgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NU YWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdzVmlldyk6 CisKIDIwMTgtMDktMjEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBzZXR0aW5nIGZvciBTb3VyY2VzIHRhYgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggZjNiNGZjMWUzMzhkOWE3MmJjOGYzNTBhM2Ez YjBkZTRmMDc3MTEyZi4uY2FlYTRhOWU5YmRmYjJkNmI4NGYxYTRlYzBhNTdlOTU2MDU0NGFhYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0xNTcsNyArMTU3LDYgQEAgbG9j YWxpemVkU3RyaW5nc1siQ2FudmFzIl0gPSAiQ2FudmFzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNh bnZhcyAlZCJdID0gIkNhbnZhcyAlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW52YXMgJXMiXSA9 ICJDYW52YXMgJXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FudmFzIEVsZW1lbnQiXSA9ICJDYW52 YXMgRWxlbWVudCI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJDYW52YXM6Il0gPSAiQ2FudmFzOiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJDYW52YXNlcyJdID0gIkNhbnZhc2VzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkNhcHR1cmUgU2NyZWVuc2hvdCJdID0gIkNhcHR1cmUgU2NyZWVuc2hvdCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJDYXB0dXJpbmciXSA9ICJDYXB0dXJpbmciOwpAQCAtMzM1LDcgKzMzNCw2IEBA IGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBFdmVudCBMaXN0ZW5lciJdID0gIkVuYWJsZSBFdmVu dCBMaXN0ZW5lciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgTGF5ZXJzIFRhYiJdID0gIkVu YWJsZSBMYXllcnMgVGFiIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBOZXcgVGFiIEJhciJd ID0gIkVuYWJsZSBOZXcgVGFiIEJhciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgUHJvZ3Jh bSJdID0gIkVuYWJsZSBQcm9ncmFtIjsKLWxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBWaXN1YWwg Q2hhbmdlIERldGVjdGlvbiJdID0gIkVuYWJsZSBWaXN1YWwgQ2hhbmdlIERldGVjdGlvbiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgYWxsIGJyZWFrcG9pbnRzICglcykiXSA9ICJFbmFibGUg YWxsIGJyZWFrcG9pbnRzICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIGJyZWFrcG9p bnRzIl0gPSAiRW5hYmxlIGJyZWFrcG9pbnRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBw YWludCBmbGFzaGluZyJdID0gIkVuYWJsZSBwYWludCBmbGFzaGluZyI7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggMTMy YTM3YjBlNjE1MDIwNmJlMzhjNTA3MzM1YjUyNjcyOGU0ZjVjMy4uZDEzNjc4ZTkzNDNkOWM1Yjhl MjlmODQ0MmNlNzFhZTM4ZjQ1MWUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwpAQCAtMTE1LDEzICsxMTUsMTMgQEAgV0ku c2V0dGluZ3MgPSB7CiAgICAgc2hvd1Njb3BlQ2hhaW5PblBhdXNlOiBuZXcgV0kuU2V0dGluZygi c2hvdy1zY29wZS1jaGFpbi1zaWRlYmFyIiwgdHJ1ZSksCiAgICAgc2hvd0ltYWdlR3JpZDogbmV3 IFdJLlNldHRpbmcoInNob3ctaW1hZ2UtZ3JpZCIsIGZhbHNlKSwKICAgICBzaG93Q2FudmFzUGF0 aDogbmV3IFdJLlNldHRpbmcoInNob3ctY2FudmFzLXBhdGgiLCBmYWxzZSksCisgICAgcmVjb3Jk aW5nRGV0ZWN0VmlzdWFsQ2hhbmdlOiBuZXcgV0kuU2V0dGluZygicmVjb3JkaW5nLWRldGVjdC12 aXN1YWwtY2hhbmdlIiwgZmFsc2UpLAogICAgIHNlbGVjdGVkTmV0d29ya0RldGFpbENvbnRlbnRW aWV3SWRlbnRpZmllcjogbmV3IFdJLlNldHRpbmcoIm5ldHdvcmstZGV0YWlsLWNvbnRlbnQtdmll dy1pZGVudGlmaWVyIiwgInByZXZpZXciKSwKICAgICBzaG93UnVsZXJzOiBuZXcgV0kuU2V0dGlu Zygic2hvdy1ydWxlcnMiLCBmYWxzZSksCiAKICAgICAvLyBFeHBlcmltZW50YWwKICAgICBleHBl cmltZW50YWxFbmFibGVMYXllcnNUYWI6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5h YmxlLWxheWVycy10YWIiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFy OiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1uZXctdGFiLWJhciIsIGZhbHNl KSwKLSAgICBleHBlcmltZW50YWxSZWNvcmRpbmdIYXNWaXN1YWxFZmZlY3Q6IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtcmVjb3JkaW5nLWhhcy12aXN1YWwtZWZmZWN0IiwgZmFsc2UpLAog CiAgICAgLy8gRGVidWdVSQogICAgIGF1dG9Mb2dQcm90b2NvbE1lc3NhZ2VzOiBuZXcgV0kuU2V0 dGluZygiYXV0by1jb2xsZWN0LXByb3RvY29sLW1lc3NhZ2VzIiwgZmFsc2UpLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpp bmRleCBjZDVkNWRlYTJiZGVlYzEwOTZlMmI4NWZkY2Q3NTc3MWY4ZDVlMGM5Li5lYmIyYWRjMDAx Yzc3MGE4YWM5YjhlNmYzMmVkOTg0OWQwY2ViNjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtNDAzLDExICs0 MDMsMzUgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEV2ZW50LnByb3RvdHlwZSwgInN0b3AiLAog ICAgIH0KIH0pOwogCitPYmplY3QuZGVmaW5lUHJvcGVydHkoQXJyYXksICJpc1R5cGVkQXJyYXki LAoreworICAgIHZhbHVlKGFycmF5KQorICAgIHsKKyAgICAgICAgaWYgKCFhcnJheSkKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBsZXQgY29uc3RydWN0b3IgPSBhcnJheS5j b25zdHJ1Y3RvcjsKKyAgICAgICAgcmV0dXJuIGNvbnN0cnVjdG9yID09PSBJbnQ4QXJyYXkKKyAg ICAgICAgICAgIHx8IGNvbnN0cnVjdG9yID09PSBJbnQxNkFycmF5CisgICAgICAgICAgICB8fCBj b25zdHJ1Y3RvciA9PT0gSW50MzJBcnJheQorICAgICAgICAgICAgfHwgY29uc3RydWN0b3IgPT09 IFVpbnQ4QXJyYXkKKyAgICAgICAgICAgIHx8IGNvbnN0cnVjdG9yID09PSBVaW50OENsYW1wZWRB cnJheQorICAgICAgICAgICAgfHwgY29uc3RydWN0b3IgPT09IFVpbnQxNkFycmF5CisgICAgICAg ICAgICB8fCBjb25zdHJ1Y3RvciA9PT0gVWludDMyQXJyYXkKKyAgICAgICAgICAgIHx8IGNvbnN0 cnVjdG9yID09PSBGbG9hdDMyQXJyYXkKKyAgICAgICAgICAgIHx8IGNvbnN0cnVjdG9yID09PSBG bG9hdDY0QXJyYXk7CisgICAgfQorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBcnJheSwg InNoYWxsb3dFcXVhbCIsCiB7CiAgICAgdmFsdWUoYSwgYikKICAgICB7Ci0gICAgICAgIGlmICgh QXJyYXkuaXNBcnJheShhKSB8fCAhQXJyYXkuaXNBcnJheShiKSkKKyAgICAgICAgZnVuY3Rpb24g aXNBcnJheSh4KSB7CisgICAgICAgICAgICByZXR1cm4gQXJyYXkuaXNBcnJheSh4KSB8fCBBcnJh eS5pc1R5cGVkQXJyYXkoeCk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoIWlzQXJyYXkoYSkg fHwgIWlzQXJyYXkoYikpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgaWYg KGEgPT09IGIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvUmVjb3JkaW5nQWN0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZ0FjdGlvbi5qcwppbmRleCA4OWM4YjUxZDBjMTk2MWE5 NzZjMjc0ZTE0ZDE5MGEwODRhZTI2NDg3Li4yNjNjZTJhOTEwMGFhYmQxOTUzZmViNWQ1NjdkMTRi NDI4ZTU3YmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvUmVjb3JkaW5nQWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9SZWNvcmRpbmdBY3Rpb24uanMKQEAgLTEyOCwyMiArMTI4LDIw IEBAIFdJLlJlY29yZGluZ0FjdGlvbiA9IGNsYXNzIFJlY29yZGluZ0FjdGlvbiBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICBpZiAocmVjb3JkaW5nLnR5cGUgPT09IFdJLlJlY29yZGluZy5UeXBl LkNhbnZhc1dlYkdMKSB7CiAgICAgICAgICAgICAvLyBXZSBhZGQgZWFjaCBSZWNvcmRpbmdBY3Rp b24gdG8gdGhlIGxpc3Qgb2YgdmlzdWFsQWN0aW9uSW5kZXhlcyBhZnRlciBpdCBpcyBwcm9jZXNz ZWQuCiAgICAgICAgICAgICBpZiAodGhpcy5fdmFsaWQgJiYgdGhpcy5faXNWaXN1YWwpIHsKLSAg ICAgICAgICAgICAgICBsZXQgY29udGVudEJlZm9yZSA9IHJlY29yZGluZy52aXN1YWxBY3Rpb25J bmRleGVzLmxlbmd0aCA/IHJlY29yZGluZy52aXN1YWxBY3Rpb25JbmRleGVzLmxhc3RWYWx1ZS5z bmFwc2hvdCA6IHJlY29yZGluZy5pbml0aWFsU3RhdGUuY29udGVudDsKKyAgICAgICAgICAgICAg ICBsZXQgY29udGVudEJlZm9yZSA9IHJlY29yZGluZy52aXN1YWxBY3Rpb25JbmRleGVzLmxlbmd0 aCA/IHJlY29yZGluZy5hY3Rpb25zW3JlY29yZGluZy52aXN1YWxBY3Rpb25JbmRleGVzLmxhc3RW YWx1ZV0uc25hcHNob3QgOiByZWNvcmRpbmcuaW5pdGlhbFN0YXRlLmNvbnRlbnQ7CiAgICAgICAg ICAgICAgICAgdGhpcy5faGFzVmlzaWJsZUVmZmVjdCA9IHRoaXMuX3NuYXBzaG90ICE9PSBjb250 ZW50QmVmb3JlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKICAgICAgICAgZnVuY3Rpb24gZ2V0Q29udGVudCgpIHsKLSAgICAgICAgICAgIGlmIChjb250 ZXh0IGluc3RhbmNlb2YgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKSB7Ci0gICAgICAgICAgICAg ICAgbGV0IGltYWdlRGF0YSA9IGNvbnRleHQuZ2V0SW1hZ2VEYXRhKDAsIDAsIGNvbnRleHQuY2Fu dmFzLndpZHRoLCBjb250ZXh0LmNhbnZhcy5oZWlnaHQpOwotICAgICAgICAgICAgICAgIHJldHVy biBbaW1hZ2VEYXRhLndpZHRoLCBpbWFnZURhdGEuaGVpZ2h0LCAuLi5pbWFnZURhdGEuZGF0YV07 Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoY29udGV4dCBpbnN0YW5jZW9mIENhbnZh c1JlbmRlcmluZ0NvbnRleHQyRCkKKyAgICAgICAgICAgICAgICByZXR1cm4gY29udGV4dC5nZXRJ bWFnZURhdGEoMCwgMCwgY29udGV4dC5jYW52YXMud2lkdGgsIGNvbnRleHQuY2FudmFzLmhlaWdo dCkuZGF0YTsKIAogICAgICAgICAgICAgaWYgKGNvbnRleHQgaW5zdGFuY2VvZiBXZWJHTFJlbmRl cmluZ0NvbnRleHQgfHwgY29udGV4dCBpbnN0YW5jZW9mIFdlYkdMMlJlbmRlcmluZ0NvbnRleHQp IHsKICAgICAgICAgICAgICAgICBsZXQgcGl4ZWxzID0gbmV3IFVpbnQ4QXJyYXkoY29udGV4dC5k cmF3aW5nQnVmZmVyV2lkdGggKiBjb250ZXh0LmRyYXdpbmdCdWZmZXJIZWlnaHQgKiA0KTsKICAg ICAgICAgICAgICAgICBjb250ZXh0LnJlYWRQaXhlbHMoMCwgMCwgY29udGV4dC5jYW52YXMud2lk dGgsIGNvbnRleHQuY2FudmFzLmhlaWdodCwgY29udGV4dC5SR0JBLCBjb250ZXh0LlVOU0lHTkVE X0JZVEUsIHBpeGVscyk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFsuLi5waXhlbHNdOworICAg ICAgICAgICAgICAgIHJldHVybiBwaXhlbHM7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IGlmIChjb250ZXh0LmNhbnZhcyBpbnN0YW5jZW9mIEhUTUxDYW52YXNFbGVtZW50KQpAQCAtMTU0 LDcgKzE1Miw3IEBAIFdJLlJlY29yZGluZ0FjdGlvbiA9IGNsYXNzIFJlY29yZGluZ0FjdGlvbiBl eHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9CiAKICAgICAgICAgbGV0IGNvbnRlbnRCZWZvcmUg PSBudWxsOwotICAgICAgICBsZXQgc2hvdWxkQ2hlY2tIYXNWaXN1YWxFZmZlY3QgPSBXSS5zZXR0 aW5ncy5leHBlcmltZW50YWxSZWNvcmRpbmdIYXNWaXN1YWxFZmZlY3QudmFsdWUgJiYgdGhpcy5f dmFsaWQgJiYgdGhpcy5faXNWaXN1YWw7CisgICAgICAgIGxldCBzaG91bGRDaGVja0hhc1Zpc3Vh bEVmZmVjdCA9IHRoaXMuX3ZhbGlkICYmIHRoaXMuX2lzVmlzdWFsOwogICAgICAgICBpZiAoc2hv dWxkQ2hlY2tIYXNWaXN1YWxFZmZlY3QpCiAgICAgICAgICAgICBjb250ZW50QmVmb3JlID0gZ2V0 Q29udGVudCgpOwogCkBAIC0zNjYsNyArMzY0LDYgQEAgV0kuUmVjb3JkaW5nQWN0aW9uID0gY2xh c3MgUmVjb3JkaW5nQWN0aW9uIGV4dGVuZHMgV0kuT2JqZWN0CiAKIFdJLlJlY29yZGluZ0FjdGlv bi5FdmVudCA9IHsKICAgICBWYWxpZGl0eUNoYW5nZWQ6ICJyZWNvcmRpbmctYWN0aW9uLW1hcmtl ZC1pbnZhbGlkIiwKLSAgICBIYXNWaXNpYmxlRWZmZWN0Q2hhbmdlZDogInJlY29yZGluZy1hY3Rp b24taGFzLXZpc2libGUtZWZmZWN0LWNoYW5nZWQiLAogfTsKIAogV0kuUmVjb3JkaW5nQWN0aW9u Ll92aXN1YWxOYW1lcyA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1l bnQuanMKaW5kZXggZjUxYjlmYzQ0YTQyMDQwYWViMGViNGYwOTdkMTM5N2ZhYzg1YmEyMy4uNWQz MTgxMDViNTI2YmUxZWU4MDZjM2MwMjZmMDU1NDA0YzM5N2EwNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQWN0aW9uVHJlZUVs ZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQuanMKQEAgLTQwMCw3ICs0MDAsNyBAQCBXSS5SZWNv cmRpbmdBY3Rpb25UcmVlRWxlbWVudCA9IGNsYXNzIFJlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50 IGV4dGVuZHMgV0kuR2VuZQogCiAgICAgICAgIHRoaXMuZWxlbWVudC5kYXRhc2V0LmluZGV4ID0g dGhpcy5faW5kZXgudG9Mb2NhbGVTdHJpbmcoKTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3Mu ZXhwZXJpbWVudGFsUmVjb3JkaW5nSGFzVmlzdWFsRWZmZWN0LnZhbHVlICYmIHRoaXMucmVwcmVz ZW50ZWRPYmplY3QudmFsaWQgJiYgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc1Zpc3VhbCAmJiAh dGhpcy5yZXByZXNlbnRlZE9iamVjdC5oYXNWaXNpYmxlRWZmZWN0KSB7CisgICAgICAgIGlmICh0 aGlzLnJlcHJlc2VudGVkT2JqZWN0LnZhbGlkICYmIHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaXNW aXN1YWwgJiYgIXRoaXMucmVwcmVzZW50ZWRPYmplY3QuaGFzVmlzaWJsZUVmZmVjdCkgewogICAg ICAgICAgICAgdGhpcy5hZGRDbGFzc05hbWUoIm5vLXZpc2libGUtZWZmZWN0Iik7CiAKICAgICAg ICAgICAgIGNvbnN0IHRpdGxlID0gV0kuVUlTdHJpbmcoIlRoaXMgYWN0aW9uIGNhdXNlcyBubyB2 aXN1YWwgY2hhbmdlIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDIy ZmNjZmUyYzU2NmZiOWRlNWIxZDZhODdhOWNiNGViNTFhYjBjMzcuLmQxNjQzNTA1NzU2ODkxOWMw NGMwNGQ4Nzk5MGViY2Y3Y2YwMDBlNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3 LmpzCkBAIC00NDQsNyArNDQ0LDcgQEAgV0kuUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBS ZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIGxldCBh Y3RpdmF0ZWQgPSBXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZhbHVlOwogICAgICAgICB0aGlz Ll9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9IGFjdGl2YXRlZDsKIAot ICAgICAgICBpZiAoIWlzTmFOKHRoaXMuX2luZGV4KSkKKyAgICAgICAgaWYgKHRoaXMuZGlkSW5p dGlhbExheW91dCAmJiAhaXNOYU4odGhpcy5faW5kZXgpKQogICAgICAgICAgICAgdGhpcy5fcHJl dmlld0NvbnRhaW5lci5maXJzdEVsZW1lbnRDaGlsZC5jbGFzc0xpc3QudG9nZ2xlKCJzaG93LWdy aWQiLCBhY3RpdmF0ZWQpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZp ZXcuanMKaW5kZXggMzg1NGVjMjViMDgwYmZhMmI2NDQ1YWY1ZDY0ZDM5MDBjNTRmZDI5ZS4uYjQ5 MTAwNWU0OGQ0NDA0ZTMwYzc4MjczZGZhODQxOTkzMDUzZWQ3NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNDcsOSArMjQ3LDYgQEAgV0kuU2V0dGluZ3NUYWJD b250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJD b250ZW50VmkKICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0ku VUlTdHJpbmcoIlVzZXIgSW50ZXJmYWNlOiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFi bGVOZXdUYWJCYXIsIFdJLlVJU3RyaW5nKCJFbmFibGUgTmV3IFRhYiBCYXIiKSk7CiAgICAgICAg IGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIAotICAgICAgICBleHBl cmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0cmluZygiQ2FudmFzOiIpLCBX SS5zZXR0aW5ncy5leHBlcmltZW50YWxSZWNvcmRpbmdIYXNWaXN1YWxFZmZlY3QsIFdJLlVJU3Ry aW5nKCJFbmFibGUgVmlzdWFsIENoYW5nZSBEZXRlY3Rpb24iKSk7Ci0gICAgICAgIGV4cGVyaW1l bnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKLQogICAgICAgICBsZXQgcmVsb2FkSW5z cGVjdG9yQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CiAgICAgICAg IHJlbG9hZEluc3BlY3RvckJ1dHRvbi50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJSZWxvYWQg V2ViIEluc3BlY3RvciIpOwogICAgICAgICByZWxvYWRJbnNwZWN0b3JCdXR0b24uYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCAoKSA9PiB7IHdpbmRvdy5sb2NhdGlvbi5yZWxvYWQoKTsgfSk7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggZGU1NWUxNGQ5MjI5OTk2OGM1OTExN2FmZDQyMzRhMTkwMjFlMmE3Yi4uNzkzZDJkZWVh YmM1YzlmNzI5MGJmYjZhMTQwMTY1NjY0ZWJjYmU4OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDE4LTA5LTIxICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBkZXRlcm1pbmUgaGFzVmlzaWJsZUVmZmVjdCBmb3IgZWFjaCBSZWNvcmRp bmdBY3Rpb24gYXMgaXQncyBwcm9jZXNzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4OTg2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVz LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9hcnJheS11dGls aXRpZXMuaHRtbDoKKwogMjAxOC0wOS0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBNYWtlICJvdmVyZmxvdzogb3ZlcmxheSIgYSBzeW5vbnltIGZv ciAib3ZlcmZsb3c6IGF1dG8iCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5p dC10ZXN0cy9hcnJheS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVzLWV4cGVjdGVkLnR4dAppbmRleCA4NzE4ODAw MmMwZmJmZmJiODkxZTliMjE4MmI2OGZhNzNkZjczMTI3Li45MjM2MDYzM2Q5YWUxYjQ2ZmZlNmQw OTFiY2U3YTZhNzI1Y2NmMWZjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5p dC10ZXN0cy9hcnJheS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGllcy1leHBlY3RlZC50eHQKQEAgLTMzLDYg KzMzLDE5IEBAIFBBU1M6IHBhcnRpdGlvbiBzaG91bGQgaGFuZGxlIGR1cGxpY2F0ZXMuCiBQQVNT OiBwYXJ0aXRpb24gc2hvdWxkIHByb2R1Y2UgYW4gZW1wdHkgbGlzdCBmb3IgdGhlIG5lZ2F0aXZl IHNpZGUuCiBQQVNTOiBwYXJ0aXRpb24gc2hvdWxkIHByb2R1Y2UgYW4gZW1wdHkgbGlzdCBmb3Ig dGhlIHBvc2l0aXZlIHNpZGUuCiAKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBBcnJheS5pc1R5cGVk QXJyYXkKK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBub24tYXJyYXkuCitQQVNTOiBpc1R5cGVkQXJy YXkgb2Ygbm9uLXR5cGVkLWFycmF5IHNob3VsZCBiZSBmYWxzZS4KK1BBU1M6IGlzVHlwZWRBcnJh eSBvZiBJbnQ4QXJyYXkgc2hvdWxkIGJlIHRydWUuCitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgSW50 MTZBcnJheSBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBJbnQzMkFycmF5 IHNob3VsZCBiZSB0cnVlLgorUEFTUzogaXNUeXBlZEFycmF5IG9mIFVpbnQ4QXJyYXkgc2hvdWxk IGJlIHRydWUuCitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgVWludDhDbGFtcGVkQXJyYXkgc2hvdWxk IGJlIHRydWUuCitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgVWludDE2QXJyYXkgc2hvdWxkIGJlIHRy dWUuCitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgVWludDMyQXJyYXkgc2hvdWxkIGJlIHRydWUuCitQ QVNTOiBpc1R5cGVkQXJyYXkgb2YgRmxvYXQzMkFycmF5IHNob3VsZCBiZSB0cnVlLgorUEFTUzog aXNUeXBlZEFycmF5IG9mIEZsb2F0NjRBcnJheSBzaG91bGQgYmUgdHJ1ZS4KKwogLS0gUnVubmlu ZyB0ZXN0IGNhc2U6IEFycmF5LnNoYWxsb3dFcXVhbAogUEFTUzogc2hhbGxvd0VxdWFsIG9mIGVt cHR5IGFycmF5cyBzaG91bGQgYmUgdHJ1ZS4KIFBBU1M6IHNoYWxsb3dFcXVhbCBvZiBhbiBhcnJh eSB3aXRoIGl0c2VsZiBzaG91bGQgYmUgdHJ1ZS4KQEAgLTQyLDYgKzU1LDE4IEBAIFBBU1M6IHNo YWxsb3dFcXVhbCBvZiB1bmVxdWFsIGFycmF5cyBzaG91bGQgYmUgZmFsc2UuCiBQQVNTOiBzaGFs bG93RXF1YWwgb2YgdW5lcXVhbCBhcnJheXMgc2hvdWxkIGJlIGZhbHNlLgogUEFTUzogc2hhbGxv d0VxdWFsIG9mIGFuIGFycmF5IGFuZCBudWxsIHNob3VsZCBiZSBmYWxzZS4KIFBBU1M6IHNoYWxs b3dFcXVhbCBvZiBhbiBhcnJheSBhbmQgbm9uLWFycmF5IHNob3VsZCBiZSBmYWxzZS4KK1BBU1M6 IHNoYWxsb3dFcXVhbCBvZiBhIHR5cGVkLWFycmF5IGFuZCBpdCdzIGFycmF5IGNvdW50ZXJwYXJ0 IHNob3VsZCBiZSB0cnVlLgorUEFTUzogc2hhbGxvd0VxdWFsIG9mIGEgdHlwZWQtYXJyYXkgd2l0 aCBpdHNlbGYgc2hvdWxkIGJlIHRydWUuCitQQVNTOiBzaGFsbG93RXF1YWwgb2YgZXF1YWwgdHlw ZWQtYXJyYXkgYW5kIGl0J3MgYXJyYXkgY291bnRlcnBhcnQgc2hvdWxkIGJlIHRydWUuCitQQVNT OiBzaGFsbG93RXF1YWwgb2YgZXF1YWwgdHlwZWQtYXJyYXlzIHNob3VsZCBiZSB0cnVlLgorUEFT Uzogc2hhbGxvd0VxdWFsIG9mIGVxdWFsIHR5cGVkLWFycmF5IGFuZCBpdCdzIGFycmF5IGNvdW50 ZXJwYXJ0IHNob3VsZCBiZSB0cnVlLgorUEFTUzogc2hhbGxvd0VxdWFsIG9mIGVxdWFsIHR5cGVk LWFycmF5cyBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IHNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5 cGVkLWFycmF5IGFuZCBpdCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSBmYWxzZS4KK1BB U1M6IHNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5cyBzaG91bGQgYmUgZmFsc2Uu CitQQVNTOiBzaGFsbG93RXF1YWwgb2YgdW5lcXVhbCB0eXBlZC1hcnJheSBhbmQgaXQncyBhcnJh eSBjb3VudGVycGFydCBzaG91bGQgYmUgZmFsc2UuCitQQVNTOiBzaGFsbG93RXF1YWwgb2YgdW5l cXVhbCB0eXBlZC1hcnJheXMgc2hvdWxkIGJlIGZhbHNlLgorUEFTUzogc2hhbGxvd0VxdWFsIG9m IGEgdHlwZWQtYXJyYXkgYW5kIG51bGwgc2hvdWxkIGJlIGZhbHNlLgorUEFTUzogc2hhbGxvd0Vx dWFsIG9mIGEgdHlwZWQtYXJyYXkgYW5kIG5vbi1hcnJheSBzaG91bGQgYmUgZmFsc2UuCiBQQVNT OiBzaGFsbG93RXF1YWwgb2YgYSBub24tYXJyYXkgd2l0aCBpdHNlbGYgc2hvdWxkIGJlIGZhbHNl LgogUEFTUzogc2hhbGxvd0VxdWFsIG9mIG5vbi1hcnJheXMgc2hvdWxkIGJlIGZhbHNlLgogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9hcnJheS11dGlsaXRp ZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGll cy5odG1sCmluZGV4IDcyZjNhYzkyNjBhOTQxMDgzMTE4NWU1M2JlMGQ5ZDlhMjA0NjAxZjkuLmZh MDZiOGMzZGU3MzFmZTE5Njc1ZTc1ODBjOWIzYzBhMWE4Zjc4ZGYgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGllcy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGllcy5odG1sCkBAIC04 NSw2ICs4NSwyNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgfQogICAgIH0pOwogCisgICAg c3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiQXJyYXkuaXNUeXBlZEFycmF5IiwK KyAgICAgICAgdGVzdCgpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2Uo QXJyYXkuaXNUeXBlZEFycmF5KG51bGwpLCAiaXNUeXBlZEFycmF5IG9mIG5vbi1hcnJheS4iKTsK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuaXNUeXBlZEFycmF5 KFtdKSwgImlzVHlwZWRBcnJheSBvZiBub24tdHlwZWQtYXJyYXkgc2hvdWxkIGJlIGZhbHNlLiIp OworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJyYXkuaXNUeXBlZEFy cmF5KG5ldyBJbnQ4QXJyYXkpLCAiaXNUeXBlZEFycmF5IG9mIEludDhBcnJheSBzaG91bGQgYmUg dHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5pc1R5 cGVkQXJyYXkobmV3IEludDE2QXJyYXkpLCAiaXNUeXBlZEFycmF5IG9mIEludDE2QXJyYXkgc2hv dWxkIGJlIHRydWUuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJy YXkuaXNUeXBlZEFycmF5KG5ldyBJbnQzMkFycmF5KSwgImlzVHlwZWRBcnJheSBvZiBJbnQzMkFy cmF5IHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RU aGF0KEFycmF5LmlzVHlwZWRBcnJheShuZXcgVWludDhBcnJheSksICJpc1R5cGVkQXJyYXkgb2Yg VWludDhBcnJheSBzaG91bGQgYmUgdHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0VGhhdChBcnJheS5pc1R5cGVkQXJyYXkobmV3IFVpbnQ4Q2xhbXBlZEFycmF5KSwgImlz VHlwZWRBcnJheSBvZiBVaW50OENsYW1wZWRBcnJheSBzaG91bGQgYmUgdHJ1ZS4iKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5pc1R5cGVkQXJyYXkobmV3IFVp bnQxNkFycmF5KSwgImlzVHlwZWRBcnJheSBvZiBVaW50MTZBcnJheSBzaG91bGQgYmUgdHJ1ZS4i KTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5pc1R5cGVkQXJy YXkobmV3IFVpbnQzMkFycmF5KSwgImlzVHlwZWRBcnJheSBvZiBVaW50MzJBcnJheSBzaG91bGQg YmUgdHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5p c1R5cGVkQXJyYXkobmV3IEZsb2F0MzJBcnJheSksICJpc1R5cGVkQXJyYXkgb2YgRmxvYXQzMkFy cmF5IHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RU aGF0KEFycmF5LmlzVHlwZWRBcnJheShuZXcgRmxvYXQ2NEFycmF5KSwgImlzVHlwZWRBcnJheSBv ZiBGbG9hdDY0QXJyYXkgc2hvdWxkIGJlIHRydWUuIik7CisKKyAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgICAgICB9CisgICAgfSk7CisKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAg ICAgIG5hbWU6ICJBcnJheS5zaGFsbG93RXF1YWwiLAogICAgICAgICB0ZXN0KCkgewpAQCAtMTA0 LDYgKzEyNCwyNSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKFtdLCBudWxsKSwgInNoYWxsb3dFcXVhbCBv ZiBhbiBhcnJheSBhbmQgbnVsbCBzaG91bGQgYmUgZmFsc2UuIik7CiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV4cGVjdEZhbHNlKEFycmF5LnNoYWxsb3dFcXVhbChbXSwgMS4yMyksICJzaGFs bG93RXF1YWwgb2YgYW4gYXJyYXkgYW5kIG5vbi1hcnJheSBzaG91bGQgYmUgZmFsc2UuIik7CiAK KyAgICAgICAgICAgIGxldCB0eXBlZEFycmF5MSA9IEludDhBcnJheS5mcm9tKGFycjEpOworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LnNoYWxsb3dFcXVhbCh0eXBl ZEFycmF5MSwgYXJyMSksICJzaGFsbG93RXF1YWwgb2YgYSB0eXBlZC1hcnJheSBhbmQgaXQncyBh cnJheSBjb3VudGVycGFydCBzaG91bGQgYmUgdHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0VGhhdChBcnJheS5zaGFsbG93RXF1YWwodHlwZWRBcnJheTEsIHR5cGVkQXJy YXkxKSwgInNoYWxsb3dFcXVhbCBvZiBhIHR5cGVkLWFycmF5IHdpdGggaXRzZWxmIHNob3VsZCBi ZSB0cnVlLiIpOworCisgICAgICAgICAgICBsZXQgdHlwZWRBcnJheTIgPSBJbnQ4QXJyYXkuZnJv bShhcnIyKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5zaGFs bG93RXF1YWwodHlwZWRBcnJheTEsIGFycjIpLCAic2hhbGxvd0VxdWFsIG9mIGVxdWFsIHR5cGVk LWFycmF5IGFuZCBpdCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSB0cnVlLiIpOworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LnNoYWxsb3dFcXVhbCh0eXBl ZEFycmF5MSwgdHlwZWRBcnJheTIpLCAic2hhbGxvd0VxdWFsIG9mIGVxdWFsIHR5cGVkLWFycmF5 cyBzaG91bGQgYmUgdHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhh dChBcnJheS5zaGFsbG93RXF1YWwodHlwZWRBcnJheTIsIGFycjEpLCAic2hhbGxvd0VxdWFsIG9m IGVxdWFsIHR5cGVkLWFycmF5IGFuZCBpdCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSB0 cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LnNoYWxs b3dFcXVhbCh0eXBlZEFycmF5MiwgdHlwZWRBcnJheTEpLCAic2hhbGxvd0VxdWFsIG9mIGVxdWFs IHR5cGVkLWFycmF5cyBzaG91bGQgYmUgdHJ1ZS4iKTsKKworICAgICAgICAgICAgbGV0IHR5cGVk QXJyYXkzID0gSW50OEFycmF5LmZyb20oYXJyMyk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdEZhbHNlKEFycmF5LnNoYWxsb3dFcXVhbCh0eXBlZEFycmF5MSwgYXJyMyksICJzaGFs bG93RXF1YWwgb2YgdW5lcXVhbCB0eXBlZC1hcnJheSBhbmQgaXQncyBhcnJheSBjb3VudGVycGFy dCBzaG91bGQgYmUgZmFsc2UuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZh bHNlKEFycmF5LnNoYWxsb3dFcXVhbCh0eXBlZEFycmF5MSwgdHlwZWRBcnJheTMpLCAic2hhbGxv d0VxdWFsIG9mIHVuZXF1YWwgdHlwZWQtYXJyYXlzIHNob3VsZCBiZSBmYWxzZS4iKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKHR5cGVk QXJyYXkzLCBhcnIxKSwgInNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5IGFuZCBp dCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSBmYWxzZS4iKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKHR5cGVkQXJyYXkzLCB0 eXBlZEFycmF5MSksICJzaGFsbG93RXF1YWwgb2YgdW5lcXVhbCB0eXBlZC1hcnJheXMgc2hvdWxk IGJlIGZhbHNlLiIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKEFy cmF5LnNoYWxsb3dFcXVhbChuZXcgSW50OEFycmF5LCBudWxsKSwgInNoYWxsb3dFcXVhbCBvZiBh IHR5cGVkLWFycmF5IGFuZCBudWxsIHNob3VsZCBiZSBmYWxzZS4iKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKG5ldyBJbnQ4QXJyYXks IDEuMjMpLCAic2hhbGxvd0VxdWFsIG9mIGEgdHlwZWQtYXJyYXkgYW5kIG5vbi1hcnJheSBzaG91 bGQgYmUgZmFsc2UuIik7CisKICAgICAgICAgICAgIGxldCBzdHIgPSAiYWJjIjsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKHN0ciwgc3Ry KSwgInNoYWxsb3dFcXVhbCBvZiBhIG5vbi1hcnJheSB3aXRoIGl0c2VsZiBzaG91bGQgYmUgZmFs c2UuIik7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKEFycmF5LnNoYWxs b3dFcXVhbCh7fSwge30pLCAic2hhbGxvd0VxdWFsIG9mIG5vbi1hcnJheXMgc2hvdWxkIGJlIGZh bHNlLiIpOwo= 350943 2018-09-26 22:31:28 -0700 2018-09-26 23:09:55 -0700 Patch bug-189860-20180926223127.patch text/plain 19510 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiYzIwMGRmOWM0ZjRiOGIzODhiMGU5OGFmNjJl M2QwMjM1NTFlMjIuLmUyMjRmZmNlZTIwNzY4MTliNGM3NzljNjMwMWZmYzcyYjZlYmM0NzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE4LTA5LTI2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk ZXRlcm1pbmUgaGFzVmlzaWJsZUVmZmVjdCBmb3IgZWFjaCBSZWNvcmRpbmdBY3Rpb24gYXMgaXQn cyBwcm9jZXNzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4OTg2MAorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAg ICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0Jhc2UvVXRpbGl0aWVzLmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMv UmVjb3JkaW5nQWN0aW9uLmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5nQWN0aW9uLnByb3RvdHlw ZS5wcm9jZXNzLmdldENvbnRlbnQpOgorICAgICAgICAoV0kuUmVjb3JkaW5nQWN0aW9uLnByb3Rv dHlwZS5wcm9jZXNzKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5n QWN0aW9uVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdBY3Rpb25UcmVlRWxl bWVudC5wcm90b3R5cGUub25hdHRhY2gpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250 ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdzVmlldyk6CisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl91cGRhdGVJbWFnZUdyaWQp OgorICAgICAgICBEcml2ZS1ieTogZG9uJ3QgYXR0ZW1wdCB0byBzaG93IHRoZSBpbWFnZSBncmlk IGlmIHdlIGhhdmVuJ3QgY2FsbGVkIGluaXRpYWxpemVkIHlldC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuQ2FudmFz U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdHJlZU91dGxpbmVTZWxlY3Rpb25EaWRDaGFuZ2UpOgor ICAgICAgICBEcml2ZS1ieTogZW5zdXJlIHRoYXQgdGhlIGBXSS5SZWNvcmRpbmdDb250ZW50Vmll d2AgaXMgc2hvd2luZyBiZWZvcmUgYXBwbHlpbmcgdGhlIGFjdGlvbi4KKwogMjAxOC0wOS0yMSAg TmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OKHIyMzYyMzcpOiBXZWIgSW5zcGVjdG9yOiBEYXJrTW9kZTogd2hpdGUgYmFja2dyb3VuZCBp biBFbGVtZW50cyBhbmQgVGltZWxpbmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpp bmRleCBmM2I0ZmMxZTMzOGQ5YTcyYmM4ZjM1MGEzYTNiMGRlNGYwNzcxMTJmLi5jYWVhNGE5ZTli ZGZiMmQ2Yjg0ZjFhNGVjMGE1N2U5NTYwNTQ0YWFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKQEAgLTE1Nyw3ICsxNTcsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDYW52YXMiXSA9 ICJDYW52YXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FudmFzICVkIl0gPSAiQ2FudmFzICVkIjsK IGxvY2FsaXplZFN0cmluZ3NbIkNhbnZhcyAlcyJdID0gIkNhbnZhcyAlcyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJDYW52YXMgRWxlbWVudCJdID0gIkNhbnZhcyBFbGVtZW50IjsKLWxvY2FsaXplZFN0 cmluZ3NbIkNhbnZhczoiXSA9ICJDYW52YXM6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhbnZhc2Vz Il0gPSAiQ2FudmFzZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2FwdHVyZSBTY3JlZW5zaG90Il0g PSAiQ2FwdHVyZSBTY3JlZW5zaG90IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhcHR1cmluZyJdID0g IkNhcHR1cmluZyI7CkBAIC0zMzUsNyArMzM0LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRW5hYmxl IEV2ZW50IExpc3RlbmVyIl0gPSAiRW5hYmxlIEV2ZW50IExpc3RlbmVyIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkVuYWJsZSBMYXllcnMgVGFiIl0gPSAiRW5hYmxlIExheWVycyBUYWIiOwogbG9jYWxp emVkU3RyaW5nc1siRW5hYmxlIE5ldyBUYWIgQmFyIl0gPSAiRW5hYmxlIE5ldyBUYWIgQmFyIjsK IGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBQcm9ncmFtIl0gPSAiRW5hYmxlIFByb2dyYW0iOwot bG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIFZpc3VhbCBDaGFuZ2UgRGV0ZWN0aW9uIl0gPSAiRW5h YmxlIFZpc3VhbCBDaGFuZ2UgRGV0ZWN0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBh bGwgYnJlYWtwb2ludHMgKCVzKSJdID0gIkVuYWJsZSBhbGwgYnJlYWtwb2ludHMgKCVzKSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgYnJlYWtwb2ludHMiXSA9ICJFbmFibGUgYnJlYWtwb2lu dHMiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIHBhaW50IGZsYXNoaW5nIl0gPSAiRW5hYmxl IHBhaW50IGZsYXNoaW5nIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwppbmRleCAxMzJhMzdiMGU2MTUwMjA2YmUzOGM1MDczMzVi NTI2NzI4ZTRmNWMzLi41ODY5YTMxYzFhZDM0Yzc2YmE2ZTQ5OTRiZWI5MWJkZWEzZmNiY2E4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRp bmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0 aW5nLmpzCkBAIC0xMjEsNyArMTIxLDYgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgLy8gRXhwZXJp bWVudGFsCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiOiBuZXcgV0kuU2V0dGluZygi ZXhwZXJpbWVudGFsLWVuYWJsZS1sYXllcnMtdGFiIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRh bEVuYWJsZU5ld1RhYkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtbmV3 LXRhYi1iYXIiLCBmYWxzZSksCi0gICAgZXhwZXJpbWVudGFsUmVjb3JkaW5nSGFzVmlzdWFsRWZm ZWN0OiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLXJlY29yZGluZy1oYXMtdmlzdWFsLWVm ZmVjdCIsIGZhbHNlKSwKIAogICAgIC8vIERlYnVnVUkKICAgICBhdXRvTG9nUHJvdG9jb2xNZXNz YWdlczogbmV3IFdJLlNldHRpbmcoImF1dG8tY29sbGVjdC1wcm90b2NvbC1tZXNzYWdlcyIsIGZh bHNlKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9VdGlsaXRpZXMuanMKaW5kZXggY2Q1ZDVkZWEyYmRlZWMxMDk2ZTJiODVmZGNkNzU3NzFmOGQ1 ZTBjOS4uNjM4MDE4MTMxZGRiNThkNDU0YjE5ZTI1YjNhOTVkZDM4ZWU3YjM4ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMu anMKQEAgLTQwMywxMSArNDAzLDM1IEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShFdmVudC5wcm90 b3R5cGUsICJzdG9wIiwKICAgICB9CiB9KTsKIAorT2JqZWN0LmRlZmluZVByb3BlcnR5KEFycmF5 LCAiaXNUeXBlZEFycmF5IiwKK3sKKyAgICB2YWx1ZShhcnJheSkKKyAgICB7CisgICAgICAgIGlm ICghYXJyYXkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgbGV0IGNvbnN0 cnVjdG9yID0gYXJyYXkuY29uc3RydWN0b3I7CisgICAgICAgIHJldHVybiBjb25zdHJ1Y3RvciA9 PT0gSW50OEFycmF5CisgICAgICAgICAgICB8fCBjb25zdHJ1Y3RvciA9PT0gSW50MTZBcnJheQor ICAgICAgICAgICAgfHwgY29uc3RydWN0b3IgPT09IEludDMyQXJyYXkKKyAgICAgICAgICAgIHx8 IGNvbnN0cnVjdG9yID09PSBVaW50OEFycmF5CisgICAgICAgICAgICB8fCBjb25zdHJ1Y3RvciA9 PT0gVWludDhDbGFtcGVkQXJyYXkKKyAgICAgICAgICAgIHx8IGNvbnN0cnVjdG9yID09PSBVaW50 MTZBcnJheQorICAgICAgICAgICAgfHwgY29uc3RydWN0b3IgPT09IFVpbnQzMkFycmF5CisgICAg ICAgICAgICB8fCBjb25zdHJ1Y3RvciA9PT0gRmxvYXQzMkFycmF5CisgICAgICAgICAgICB8fCBj b25zdHJ1Y3RvciA9PT0gRmxvYXQ2NEFycmF5OworICAgIH0KK30pOworCiBPYmplY3QuZGVmaW5l UHJvcGVydHkoQXJyYXksICJzaGFsbG93RXF1YWwiLAogewogICAgIHZhbHVlKGEsIGIpCiAgICAg ewotICAgICAgICBpZiAoIUFycmF5LmlzQXJyYXkoYSkgfHwgIUFycmF5LmlzQXJyYXkoYikpCisg ICAgICAgIGZ1bmN0aW9uIGlzQXJyYXlMaWtlKHgpIHsKKyAgICAgICAgICAgIHJldHVybiBBcnJh eS5pc0FycmF5KHgpIHx8IEFycmF5LmlzVHlwZWRBcnJheSh4KTsKKyAgICAgICAgfQorCisgICAg ICAgIGlmICghaXNBcnJheUxpa2UoYSkgfHwgIWlzQXJyYXlMaWtlKGIpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgICAgIGlmIChhID09PSBiKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZ0FjdGlvbi5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZWNvcmRpbmdBY3Rp b24uanMKaW5kZXggODljOGI1MWQwYzE5NjFhOTc2YzI3NGUxNGQxOTBhMDg0YWUyNjQ4Ny4uMjYz Y2UyYTkxMDBhYWJkMTk1M2ZlYjVkNTY3ZDE0YjQyOGU1N2JhMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZ0FjdGlvbi5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVjb3JkaW5n QWN0aW9uLmpzCkBAIC0xMjgsMjIgKzEyOCwyMCBAQCBXSS5SZWNvcmRpbmdBY3Rpb24gPSBjbGFz cyBSZWNvcmRpbmdBY3Rpb24gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKHJlY29yZGlu Zy50eXBlID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52YXNXZWJHTCkgewogICAgICAgICAgICAg Ly8gV2UgYWRkIGVhY2ggUmVjb3JkaW5nQWN0aW9uIHRvIHRoZSBsaXN0IG9mIHZpc3VhbEFjdGlv bkluZGV4ZXMgYWZ0ZXIgaXQgaXMgcHJvY2Vzc2VkLgogICAgICAgICAgICAgaWYgKHRoaXMuX3Zh bGlkICYmIHRoaXMuX2lzVmlzdWFsKSB7Ci0gICAgICAgICAgICAgICAgbGV0IGNvbnRlbnRCZWZv cmUgPSByZWNvcmRpbmcudmlzdWFsQWN0aW9uSW5kZXhlcy5sZW5ndGggPyByZWNvcmRpbmcudmlz dWFsQWN0aW9uSW5kZXhlcy5sYXN0VmFsdWUuc25hcHNob3QgOiByZWNvcmRpbmcuaW5pdGlhbFN0 YXRlLmNvbnRlbnQ7CisgICAgICAgICAgICAgICAgbGV0IGNvbnRlbnRCZWZvcmUgPSByZWNvcmRp bmcudmlzdWFsQWN0aW9uSW5kZXhlcy5sZW5ndGggPyByZWNvcmRpbmcuYWN0aW9uc1tyZWNvcmRp bmcudmlzdWFsQWN0aW9uSW5kZXhlcy5sYXN0VmFsdWVdLnNuYXBzaG90IDogcmVjb3JkaW5nLmlu aXRpYWxTdGF0ZS5jb250ZW50OwogICAgICAgICAgICAgICAgIHRoaXMuX2hhc1Zpc2libGVFZmZl Y3QgPSB0aGlzLl9zbmFwc2hvdCAhPT0gY29udGVudEJlZm9yZTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGdldENvbnRl bnQoKSB7Ci0gICAgICAgICAgICBpZiAoY29udGV4dCBpbnN0YW5jZW9mIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRCkgewotICAgICAgICAgICAgICAgIGxldCBpbWFnZURhdGEgPSBjb250ZXh0Lmdl dEltYWdlRGF0YSgwLCAwLCBjb250ZXh0LmNhbnZhcy53aWR0aCwgY29udGV4dC5jYW52YXMuaGVp Z2h0KTsKLSAgICAgICAgICAgICAgICByZXR1cm4gW2ltYWdlRGF0YS53aWR0aCwgaW1hZ2VEYXRh LmhlaWdodCwgLi4uaW1hZ2VEYXRhLmRhdGFdOwotICAgICAgICAgICAgfQorICAgICAgICAgICAg aWYgKGNvbnRleHQgaW5zdGFuY2VvZiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGNvbnRleHQuZ2V0SW1hZ2VEYXRhKDAsIDAsIGNvbnRleHQuY2FudmFz LndpZHRoLCBjb250ZXh0LmNhbnZhcy5oZWlnaHQpLmRhdGE7CiAKICAgICAgICAgICAgIGlmIChj b250ZXh0IGluc3RhbmNlb2YgV2ViR0xSZW5kZXJpbmdDb250ZXh0IHx8IGNvbnRleHQgaW5zdGFu Y2VvZiBXZWJHTDJSZW5kZXJpbmdDb250ZXh0KSB7CiAgICAgICAgICAgICAgICAgbGV0IHBpeGVs cyA9IG5ldyBVaW50OEFycmF5KGNvbnRleHQuZHJhd2luZ0J1ZmZlcldpZHRoICogY29udGV4dC5k cmF3aW5nQnVmZmVySGVpZ2h0ICogNCk7CiAgICAgICAgICAgICAgICAgY29udGV4dC5yZWFkUGl4 ZWxzKDAsIDAsIGNvbnRleHQuY2FudmFzLndpZHRoLCBjb250ZXh0LmNhbnZhcy5oZWlnaHQsIGNv bnRleHQuUkdCQSwgY29udGV4dC5VTlNJR05FRF9CWVRFLCBwaXhlbHMpOwotICAgICAgICAgICAg ICAgIHJldHVybiBbLi4ucGl4ZWxzXTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcGl4ZWxzOwog ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoY29udGV4dC5jYW52YXMgaW5zdGFuY2Vv ZiBIVE1MQ2FudmFzRWxlbWVudCkKQEAgLTE1NCw3ICsxNTIsNyBAQCBXSS5SZWNvcmRpbmdBY3Rp b24gPSBjbGFzcyBSZWNvcmRpbmdBY3Rpb24gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfQog CiAgICAgICAgIGxldCBjb250ZW50QmVmb3JlID0gbnVsbDsKLSAgICAgICAgbGV0IHNob3VsZENo ZWNrSGFzVmlzdWFsRWZmZWN0ID0gV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsUmVjb3JkaW5nSGFz VmlzdWFsRWZmZWN0LnZhbHVlICYmIHRoaXMuX3ZhbGlkICYmIHRoaXMuX2lzVmlzdWFsOworICAg ICAgICBsZXQgc2hvdWxkQ2hlY2tIYXNWaXN1YWxFZmZlY3QgPSB0aGlzLl92YWxpZCAmJiB0aGlz Ll9pc1Zpc3VhbDsKICAgICAgICAgaWYgKHNob3VsZENoZWNrSGFzVmlzdWFsRWZmZWN0KQogICAg ICAgICAgICAgY29udGVudEJlZm9yZSA9IGdldENvbnRlbnQoKTsKIApAQCAtMzY2LDcgKzM2NCw2 IEBAIFdJLlJlY29yZGluZ0FjdGlvbiA9IGNsYXNzIFJlY29yZGluZ0FjdGlvbiBleHRlbmRzIFdJ Lk9iamVjdAogCiBXSS5SZWNvcmRpbmdBY3Rpb24uRXZlbnQgPSB7CiAgICAgVmFsaWRpdHlDaGFu Z2VkOiAicmVjb3JkaW5nLWFjdGlvbi1tYXJrZWQtaW52YWxpZCIsCi0gICAgSGFzVmlzaWJsZUVm ZmVjdENoYW5nZWQ6ICJyZWNvcmRpbmctYWN0aW9uLWhhcy12aXNpYmxlLWVmZmVjdC1jaGFuZ2Vk IiwKIH07CiAKIFdJLlJlY29yZGluZ0FjdGlvbi5fdmlzdWFsTmFtZXMgPSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFy UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNTaWRlYmFyUGFuZWwuanMKaW5kZXggYzkyNGQ1N2QxNTdjZTc0MWJhZjRjYTNhZjgzNzQyODkx YzY0YWNiYS4uODg1ZWU0ZmQ5ODc0NTY3MTNiZDQ2YjIwZjYyYjk1MmExZWE1YTQxOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcwpAQCAtMzE5LDYgKzMxOSw4IEBAIFdJLkNhbnZhc1Np ZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRp b25TaWRlYmFyUGFuCiAgICAgICAgIGlmICghcmVjb3JkaW5nQ29udGVudFZpZXcpCiAgICAgICAg ICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5zaG93Q29udGVudFZp ZXcocmVjb3JkaW5nQ29udGVudFZpZXcpOworCiAgICAgICAgIHRoaXMuX3NlbGVjdGVkUmVjb3Jk aW5nQWN0aW9uSW5kZXggPSB0cmVlRWxlbWVudC5pbmRleDsKICAgICAgICAgcmVjb3JkaW5nQ29u dGVudFZpZXcudXBkYXRlQWN0aW9uSW5kZXgodGhpcy5fc2VsZWN0ZWRSZWNvcmRpbmdBY3Rpb25J bmRleCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVudC5q cwppbmRleCBmNTFiOWZjNDRhNDIwNDBhZWIwZWI0ZjA5N2QxMzk3ZmFjODViYTIzLi41ZDMxODEw NWI1MjZiZTFlZTgwNmMzYzAyNmYwNTU0MDRjMzk3YTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVu dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNv cmRpbmdBY3Rpb25UcmVlRWxlbWVudC5qcwpAQCAtNDAwLDcgKzQwMCw3IEBAIFdJLlJlY29yZGlu Z0FjdGlvblRyZWVFbGVtZW50ID0gY2xhc3MgUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXSS5HZW5lCiAKICAgICAgICAgdGhpcy5lbGVtZW50LmRhdGFzZXQuaW5kZXggPSB0aGlz Ll9pbmRleC50b0xvY2FsZVN0cmluZygpOwogCi0gICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBl cmltZW50YWxSZWNvcmRpbmdIYXNWaXN1YWxFZmZlY3QudmFsdWUgJiYgdGhpcy5yZXByZXNlbnRl ZE9iamVjdC52YWxpZCAmJiB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlzVmlzdWFsICYmICF0aGlz LnJlcHJlc2VudGVkT2JqZWN0Lmhhc1Zpc2libGVFZmZlY3QpIHsKKyAgICAgICAgaWYgKHRoaXMu cmVwcmVzZW50ZWRPYmplY3QudmFsaWQgJiYgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc1Zpc3Vh bCAmJiAhdGhpcy5yZXByZXNlbnRlZE9iamVjdC5oYXNWaXNpYmxlRWZmZWN0KSB7CiAgICAgICAg ICAgICB0aGlzLmFkZENsYXNzTmFtZSgibm8tdmlzaWJsZS1lZmZlY3QiKTsKIAogICAgICAgICAg ICAgY29uc3QgdGl0bGUgPSBXSS5VSVN0cmluZygiVGhpcyBhY3Rpb24gY2F1c2VzIG5vIHZpc3Vh bCBjaGFuZ2UiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggMjJmY2Nm ZTJjNTY2ZmI5ZGU1YjFkNmE4N2E5Y2I0ZWI1MWFiMGMzNy4uZDE2NDM1MDU3NTY4OTE5YzA0YzA0 ZDg3OTkwZWJjZjdjZjAwMGU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMK QEAgLTQ0NCw3ICs0NDQsNyBAQCBXSS5SZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFJlY29y ZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgbGV0IGFjdGl2 YXRlZCA9IFdJLnNldHRpbmdzLnNob3dJbWFnZUdyaWQudmFsdWU7CiAgICAgICAgIHRoaXMuX3No b3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gYWN0aXZhdGVkOwogCi0gICAg ICAgIGlmICghaXNOYU4odGhpcy5faW5kZXgpKQorICAgICAgICBpZiAodGhpcy5kaWRJbml0aWFs TGF5b3V0ICYmICFpc05hTih0aGlzLl9pbmRleCkpCiAgICAgICAgICAgICB0aGlzLl9wcmV2aWV3 Q29udGFpbmVyLmZpcnN0RWxlbWVudENoaWxkLmNsYXNzTGlzdC50b2dnbGUoInNob3ctZ3JpZCIs IGFjdGl2YXRlZCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q cwppbmRleCAzODU0ZWMyNWIwODBiZmEyYjY0NDVhZjVkNjRkMzkwMGM1NGZkMjllLi5iNDkxMDA1 ZTQ4ZDQ0MDRlMzBjNzgyNzNkZmE4NDE5OTMwNTNlZDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdz VGFiQ29udGVudFZpZXcuanMKQEAgLTI0Nyw5ICsyNDcsNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRl bnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRl bnRWaQogICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0 cmluZygiVXNlciBJbnRlcmZhY2U6IiksIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZU5l d1RhYkJhciwgV0kuVUlTdHJpbmcoIkVuYWJsZSBOZXcgVGFiIEJhciIpKTsKICAgICAgICAgZXhw ZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwogCi0gICAgICAgIGV4cGVyaW1l bnRhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJDYW52YXM6IiksIFdJLnNl dHRpbmdzLmV4cGVyaW1lbnRhbFJlY29yZGluZ0hhc1Zpc3VhbEVmZmVjdCwgV0kuVUlTdHJpbmco IkVuYWJsZSBWaXN1YWwgQ2hhbmdlIERldGVjdGlvbiIpKTsKLSAgICAgICAgZXhwZXJpbWVudGFs U2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwotCiAgICAgICAgIGxldCByZWxvYWRJbnNwZWN0 b3JCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKICAgICAgICAgcmVs b2FkSW5zcGVjdG9yQnV0dG9uLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlJlbG9hZCBXZWIg SW5zcGVjdG9yIik7CiAgICAgICAgIHJlbG9hZEluc3BlY3RvckJ1dHRvbi5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsICgpID0+IHsgd2luZG93LmxvY2F0aW9uLnJlbG9hZCgpOyB9KTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA0NGFhYTliZTMyNjE3ZTE5MzgwMTc3OWNlYzViNWMwMzZlODU5YTllLi4yYWQ4YjM2Mzg3OGM1 ZDg4YzliOWYzYjQ5Y2U3NGU0MTJjMTQzNGE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgt MDktMjYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IGRldGVybWluZSBoYXNWaXNpYmxlRWZmZWN0IGZvciBlYWNoIFJlY29yZGluZ0Fj dGlvbiBhcyBpdCdzIHByb2Nlc3NlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg5ODYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgICogaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVzLWV4 cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9hcnJheS11dGlsaXRp ZXMuaHRtbDoKKwogMjAxOC0wOS0yNSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OOiAocjIzNTk0OCkgTGF5b3V0IFRlc3QgY29tcG9zaXRp bmcvYmFja2luZy9iYWNraW5nLXN0b3JlLWF0dGFjaG1lbnQtZmlsbC1mb3J3YXJkcy1hbmltYXRp b24uaHRtbCBpcyBhIGZsYWt5IGZhaWx1cmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGllcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9hcnJheS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0CmluZGV4 IDg3MTg4MDAyYzBmYmZmYmI4OTFlOWIyMTgyYjY4ZmE3M2RmNzMxMjcuLjkyMzYwNjMzZDlhZTFi NDZmZmU2ZDA5MWJjZTdhNmE3MjVjY2YxZmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci91bml0LXRlc3RzL2FycmF5LXV0aWxpdGllcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVzLWV4cGVjdGVkLnR4dApA QCAtMzMsNiArMzMsMTkgQEAgUEFTUzogcGFydGl0aW9uIHNob3VsZCBoYW5kbGUgZHVwbGljYXRl cy4KIFBBU1M6IHBhcnRpdGlvbiBzaG91bGQgcHJvZHVjZSBhbiBlbXB0eSBsaXN0IGZvciB0aGUg bmVnYXRpdmUgc2lkZS4KIFBBU1M6IHBhcnRpdGlvbiBzaG91bGQgcHJvZHVjZSBhbiBlbXB0eSBs aXN0IGZvciB0aGUgcG9zaXRpdmUgc2lkZS4KIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IEFycmF5 LmlzVHlwZWRBcnJheQorUEFTUzogaXNUeXBlZEFycmF5IG9mIG5vbi1hcnJheS4KK1BBU1M6IGlz VHlwZWRBcnJheSBvZiBub24tdHlwZWQtYXJyYXkgc2hvdWxkIGJlIGZhbHNlLgorUEFTUzogaXNU eXBlZEFycmF5IG9mIEludDhBcnJheSBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJh eSBvZiBJbnQxNkFycmF5IHNob3VsZCBiZSB0cnVlLgorUEFTUzogaXNUeXBlZEFycmF5IG9mIElu dDMyQXJyYXkgc2hvdWxkIGJlIHRydWUuCitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgVWludDhBcnJh eSBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBVaW50OENsYW1wZWRBcnJh eSBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBVaW50MTZBcnJheSBzaG91 bGQgYmUgdHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBVaW50MzJBcnJheSBzaG91bGQgYmUg dHJ1ZS4KK1BBU1M6IGlzVHlwZWRBcnJheSBvZiBGbG9hdDMyQXJyYXkgc2hvdWxkIGJlIHRydWUu CitQQVNTOiBpc1R5cGVkQXJyYXkgb2YgRmxvYXQ2NEFycmF5IHNob3VsZCBiZSB0cnVlLgorCiAt LSBSdW5uaW5nIHRlc3QgY2FzZTogQXJyYXkuc2hhbGxvd0VxdWFsCiBQQVNTOiBzaGFsbG93RXF1 YWwgb2YgZW1wdHkgYXJyYXlzIHNob3VsZCBiZSB0cnVlLgogUEFTUzogc2hhbGxvd0VxdWFsIG9m IGFuIGFycmF5IHdpdGggaXRzZWxmIHNob3VsZCBiZSB0cnVlLgpAQCAtNDIsNiArNTUsMTggQEAg UEFTUzogc2hhbGxvd0VxdWFsIG9mIHVuZXF1YWwgYXJyYXlzIHNob3VsZCBiZSBmYWxzZS4KIFBB U1M6IHNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIGFycmF5cyBzaG91bGQgYmUgZmFsc2UuCiBQQVNT OiBzaGFsbG93RXF1YWwgb2YgYW4gYXJyYXkgYW5kIG51bGwgc2hvdWxkIGJlIGZhbHNlLgogUEFT Uzogc2hhbGxvd0VxdWFsIG9mIGFuIGFycmF5IGFuZCBub24tYXJyYXkgc2hvdWxkIGJlIGZhbHNl LgorUEFTUzogc2hhbGxvd0VxdWFsIG9mIGEgdHlwZWQtYXJyYXkgYW5kIGl0J3MgYXJyYXkgY291 bnRlcnBhcnQgc2hvdWxkIGJlIHRydWUuCitQQVNTOiBzaGFsbG93RXF1YWwgb2YgYSB0eXBlZC1h cnJheSB3aXRoIGl0c2VsZiBzaG91bGQgYmUgdHJ1ZS4KK1BBU1M6IHNoYWxsb3dFcXVhbCBvZiBl cXVhbCB0eXBlZC1hcnJheSBhbmQgaXQncyBhcnJheSBjb3VudGVycGFydCBzaG91bGQgYmUgdHJ1 ZS4KK1BBU1M6IHNoYWxsb3dFcXVhbCBvZiBlcXVhbCB0eXBlZC1hcnJheXMgc2hvdWxkIGJlIHRy dWUuCitQQVNTOiBzaGFsbG93RXF1YWwgb2YgZXF1YWwgdHlwZWQtYXJyYXkgYW5kIGl0J3MgYXJy YXkgY291bnRlcnBhcnQgc2hvdWxkIGJlIHRydWUuCitQQVNTOiBzaGFsbG93RXF1YWwgb2YgZXF1 YWwgdHlwZWQtYXJyYXlzIHNob3VsZCBiZSB0cnVlLgorUEFTUzogc2hhbGxvd0VxdWFsIG9mIHVu ZXF1YWwgdHlwZWQtYXJyYXkgYW5kIGl0J3MgYXJyYXkgY291bnRlcnBhcnQgc2hvdWxkIGJlIGZh bHNlLgorUEFTUzogc2hhbGxvd0VxdWFsIG9mIHVuZXF1YWwgdHlwZWQtYXJyYXlzIHNob3VsZCBi ZSBmYWxzZS4KK1BBU1M6IHNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5IGFuZCBp dCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSBmYWxzZS4KK1BBU1M6IHNoYWxsb3dFcXVh bCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5cyBzaG91bGQgYmUgZmFsc2UuCitQQVNTOiBzaGFsbG93 RXF1YWwgb2YgYSB0eXBlZC1hcnJheSBhbmQgbnVsbCBzaG91bGQgYmUgZmFsc2UuCitQQVNTOiBz aGFsbG93RXF1YWwgb2YgYSB0eXBlZC1hcnJheSBhbmQgbm9uLWFycmF5IHNob3VsZCBiZSBmYWxz ZS4KIFBBU1M6IHNoYWxsb3dFcXVhbCBvZiBhIG5vbi1hcnJheSB3aXRoIGl0c2VsZiBzaG91bGQg YmUgZmFsc2UuCiBQQVNTOiBzaGFsbG93RXF1YWwgb2Ygbm9uLWFycmF5cyBzaG91bGQgYmUgZmFs c2UuCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL2FycmF5 LXV0aWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXkt dXRpbGl0aWVzLmh0bWwKaW5kZXggNzJmM2FjOTI2MGE5NDEwODMxMTg1ZTUzYmUwZDlkOWEyMDQ2 MDFmOS4uZmEwNmI4YzNkZTczMWZlMTk2NzVlNzU4MGM5YjNjMGExYThmNzhkZiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVzLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvYXJyYXktdXRpbGl0aWVzLmh0 bWwKQEAgLTg1LDYgKzg1LDI2IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB9CiAgICAgfSk7 CiAKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJBcnJheS5pc1R5cGVk QXJyYXkiLAorICAgICAgICB0ZXN0KCkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RGYWxzZShBcnJheS5pc1R5cGVkQXJyYXkobnVsbCksICJpc1R5cGVkQXJyYXkgb2Ygbm9uLWFy cmF5LiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5pc1R5 cGVkQXJyYXkoW10pLCAiaXNUeXBlZEFycmF5IG9mIG5vbi10eXBlZC1hcnJheSBzaG91bGQgYmUg ZmFsc2UuIik7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChBcnJheS5p c1R5cGVkQXJyYXkobmV3IEludDhBcnJheSksICJpc1R5cGVkQXJyYXkgb2YgSW50OEFycmF5IHNo b3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFy cmF5LmlzVHlwZWRBcnJheShuZXcgSW50MTZBcnJheSksICJpc1R5cGVkQXJyYXkgb2YgSW50MTZB cnJheSBzaG91bGQgYmUgdHJ1ZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VGhhdChBcnJheS5pc1R5cGVkQXJyYXkobmV3IEludDMyQXJyYXkpLCAiaXNUeXBlZEFycmF5IG9m IEludDMyQXJyYXkgc2hvdWxkIGJlIHRydWUuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdFRoYXQoQXJyYXkuaXNUeXBlZEFycmF5KG5ldyBVaW50OEFycmF5KSwgImlzVHlwZWRB cnJheSBvZiBVaW50OEFycmF5IHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LmlzVHlwZWRBcnJheShuZXcgVWludDhDbGFtcGVkQXJy YXkpLCAiaXNUeXBlZEFycmF5IG9mIFVpbnQ4Q2xhbXBlZEFycmF5IHNob3VsZCBiZSB0cnVlLiIp OworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LmlzVHlwZWRBcnJh eShuZXcgVWludDE2QXJyYXkpLCAiaXNUeXBlZEFycmF5IG9mIFVpbnQxNkFycmF5IHNob3VsZCBi ZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5Lmlz VHlwZWRBcnJheShuZXcgVWludDMyQXJyYXkpLCAiaXNUeXBlZEFycmF5IG9mIFVpbnQzMkFycmF5 IHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0 KEFycmF5LmlzVHlwZWRBcnJheShuZXcgRmxvYXQzMkFycmF5KSwgImlzVHlwZWRBcnJheSBvZiBG bG9hdDMyQXJyYXkgc2hvdWxkIGJlIHRydWUuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdFRoYXQoQXJyYXkuaXNUeXBlZEFycmF5KG5ldyBGbG9hdDY0QXJyYXkpLCAiaXNUeXBl ZEFycmF5IG9mIEZsb2F0NjRBcnJheSBzaG91bGQgYmUgdHJ1ZS4iKTsKKworICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICB9KTsKKwogICAgIHN1aXRlLmFkZFRlc3RDYXNl KHsKICAgICAgICAgbmFtZTogIkFycmF5LnNoYWxsb3dFcXVhbCIsCiAgICAgICAgIHRlc3QoKSB7 CkBAIC0xMDQsNiArMTI0LDI1IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5zaGFsbG93RXF1YWwoW10sIG51bGwpLCAic2hhbGxv d0VxdWFsIG9mIGFuIGFycmF5IGFuZCBudWxsIHNob3VsZCBiZSBmYWxzZS4iKTsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKFtdLCAxLjIz KSwgInNoYWxsb3dFcXVhbCBvZiBhbiBhcnJheSBhbmQgbm9uLWFycmF5IHNob3VsZCBiZSBmYWxz ZS4iKTsKIAorICAgICAgICAgICAgbGV0IHR5cGVkQXJyYXkxID0gSW50OEFycmF5LmZyb20oYXJy MSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJyYXkuc2hhbGxvd0Vx dWFsKHR5cGVkQXJyYXkxLCBhcnIxKSwgInNoYWxsb3dFcXVhbCBvZiBhIHR5cGVkLWFycmF5IGFu ZCBpdCdzIGFycmF5IGNvdW50ZXJwYXJ0IHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFycmF5LnNoYWxsb3dFcXVhbCh0eXBlZEFycmF5MSwg dHlwZWRBcnJheTEpLCAic2hhbGxvd0VxdWFsIG9mIGEgdHlwZWQtYXJyYXkgd2l0aCBpdHNlbGYg c2hvdWxkIGJlIHRydWUuIik7CisKKyAgICAgICAgICAgIGxldCB0eXBlZEFycmF5MiA9IEludDhB cnJheS5mcm9tKGFycjIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KEFy cmF5LnNoYWxsb3dFcXVhbCh0eXBlZEFycmF5MSwgYXJyMiksICJzaGFsbG93RXF1YWwgb2YgZXF1 YWwgdHlwZWQtYXJyYXkgYW5kIGl0J3MgYXJyYXkgY291bnRlcnBhcnQgc2hvdWxkIGJlIHRydWUu Iik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJyYXkuc2hhbGxvd0Vx dWFsKHR5cGVkQXJyYXkxLCB0eXBlZEFycmF5MiksICJzaGFsbG93RXF1YWwgb2YgZXF1YWwgdHlw ZWQtYXJyYXlzIHNob3VsZCBiZSB0cnVlLiIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RUaGF0KEFycmF5LnNoYWxsb3dFcXVhbCh0eXBlZEFycmF5MiwgYXJyMSksICJzaGFsbG93 RXF1YWwgb2YgZXF1YWwgdHlwZWQtYXJyYXkgYW5kIGl0J3MgYXJyYXkgY291bnRlcnBhcnQgc2hv dWxkIGJlIHRydWUuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJy YXkuc2hhbGxvd0VxdWFsKHR5cGVkQXJyYXkyLCB0eXBlZEFycmF5MSksICJzaGFsbG93RXF1YWwg b2YgZXF1YWwgdHlwZWQtYXJyYXlzIHNob3VsZCBiZSB0cnVlLiIpOworCisgICAgICAgICAgICBs ZXQgdHlwZWRBcnJheTMgPSBJbnQ4QXJyYXkuZnJvbShhcnIzKTsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKHR5cGVkQXJyYXkxLCBhcnIz KSwgInNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5IGFuZCBpdCdzIGFycmF5IGNv dW50ZXJwYXJ0IHNob3VsZCBiZSBmYWxzZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKHR5cGVkQXJyYXkxLCB0eXBlZEFycmF5Myks ICJzaGFsbG93RXF1YWwgb2YgdW5lcXVhbCB0eXBlZC1hcnJheXMgc2hvdWxkIGJlIGZhbHNlLiIp OworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5zaGFsbG93RXF1 YWwodHlwZWRBcnJheTMsIGFycjEpLCAic2hhbGxvd0VxdWFsIG9mIHVuZXF1YWwgdHlwZWQtYXJy YXkgYW5kIGl0J3MgYXJyYXkgY291bnRlcnBhcnQgc2hvdWxkIGJlIGZhbHNlLiIpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5zaGFsbG93RXF1YWwodHlwZWRB cnJheTMsIHR5cGVkQXJyYXkxKSwgInNoYWxsb3dFcXVhbCBvZiB1bmVxdWFsIHR5cGVkLWFycmF5 cyBzaG91bGQgYmUgZmFsc2UuIik7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 RmFsc2UoQXJyYXkuc2hhbGxvd0VxdWFsKG5ldyBJbnQ4QXJyYXksIG51bGwpLCAic2hhbGxvd0Vx dWFsIG9mIGEgdHlwZWQtYXJyYXkgYW5kIG51bGwgc2hvdWxkIGJlIGZhbHNlLiIpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5zaGFsbG93RXF1YWwobmV3IElu dDhBcnJheSwgMS4yMyksICJzaGFsbG93RXF1YWwgb2YgYSB0eXBlZC1hcnJheSBhbmQgbm9uLWFy cmF5IHNob3VsZCBiZSBmYWxzZS4iKTsKKwogICAgICAgICAgICAgbGV0IHN0ciA9ICJhYmMiOwog ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShBcnJheS5zaGFsbG93RXF1YWwo c3RyLCBzdHIpLCAic2hhbGxvd0VxdWFsIG9mIGEgbm9uLWFycmF5IHdpdGggaXRzZWxmIHNob3Vs ZCBiZSBmYWxzZS4iKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoQXJy YXkuc2hhbGxvd0VxdWFsKHt9LCB7fSksICJzaGFsbG93RXF1YWwgb2Ygbm9uLWFycmF5cyBzaG91 bGQgYmUgZmFsc2UuIik7Cg==