209272 2020-03-18 21:29:24 -0700 Many tests relying on eventSender.monitorWheelEvents() are no longer flaky 2020-03-19 09:04:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser jacob_uphoff simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1631536 0 simon.fraser 2020-03-18 21:29:24 -0700 Many tests relying on eventSender.monitorWheelEvents() are no longer flaky 1631538 1 393947 simon.fraser 2020-03-18 21:30:26 -0700 Created attachment 393947 Patch 1631539 2 simon.fraser 2020-03-18 21:31:02 -0700 Jacon, if I land this and tests continue to flake, please don't roll out this whole commit; just add tests back to TestExpectations. 1631668 3 ews-feeder 2020-03-19 09:03:09 -0700 Committed r258701: <https://trac.webkit.org/changeset/258701> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393947. 1631669 4 webkit-bug-importer 2020-03-19 09:04:13 -0700 <rdar://problem/60635580> 393947 2020-03-18 21:30:26 -0700 2020-03-19 09:03:09 -0700 Patch bug-209272-20200318213025.patch text/plain 46462 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4Njc5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjVjMGVmM2VkMzMwZmM1ZjhlYjky OTdmZDNhMDYwZWQ4OTQzNjM4Yy4uZTk2MjgzN2MxMjQ2NzNmYjE2MjVjZTk4MWJlZmExZjM0MGRm NWNmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAzLTE4ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1hbnkgdGVzdHMgcmVseWluZyBvbiBl dmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKSBhcmUgbm8gbG9uZ2VyIGZsYWt5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkyNzIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFJlbW92 ZSB0ZXN0cyBmcm9tIFRlc3RFeHBlY3RhdGlvbnMgdGhhdCB3ZXJlIGZsYWtleSBiZWNhdXNlIG9m IGJ1ZyAxOTc4MTkuCisKKyAgICAgICAgRml4IHNvbWUgc2Nyb2xsLXNuYXAgdGVzdHMgd2hpY2gg d2VyZSB3cml0dGVuIGJlZm9yZSBDU1MgT00gVmlldyBjaGFuZ2VzIG1hZGUgZG9jdW1lbnQuYm9k eQorICAgICAgICBub3QgdGhlIHNjcm9sbGluZyBlbGVtZW50LgorCisgICAgICAgICogcGxhdGZv cm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9UZXN0 RXhwZWN0YXRpb25zOgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2Zhc3Qtc2Ny b2xsLWRpdi1sYXRjaGVkLW1haW5mcmFtZS13aXRoLWhhbmRsZXItZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZpeGVkL2ZvdXItYmFycy16b29tZWQtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1lcy9mcmFt ZXNldC1mcmFtZS1zY3JvbGxhYmlsaXR5LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB0aWxlZC1k cmF3aW5nL3Njcm9sbGluZy9mcmFtZXMvZnJhbWVzZXQtbmVzdGVkLWZyYW1lLXNjcm9sbGFiaWxp dHktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9s bC1zbmFwL3Njcm9sbC1zbmFwLWlmcmFtZS5odG1sOgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcv c2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtaG9y aXpvbnRhbC5odG1sOgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1z bmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtc2xvdy1ob3Jpem9udGFsLmh0bWw6 CisgICAgICAgICogdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNu YXAtbWFuZGF0b3J5LW1haW5mcmFtZS1zbG93LXZlcnRpY2FsLmh0bWw6CisgICAgICAgICogdGls ZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1h aW5mcmFtZS12ZXJ0aWNhbC10aGVuLWhvcml6b250YWwuaHRtbDoKKyAgICAgICAgKiB0aWxlZC1k cmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktbWFpbmZy YW1lLXZlcnRpY2FsLmh0bWw6CisgICAgICAgICogdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Ny b2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW92ZXJmbG93Lmh0bWw6CisgICAgICAgICog dGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5 LXBhZGRpbmcuaHRtbDoKKyAgICAgICAgKiB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwt c25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktcm90YXRlZC5odG1sOgorCiAyMDIwLTAzLTE4ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpIGlzIHZlcnkgZnJhZ2lsZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGM1YzkwZDQ1MWRmYTY1NjU1 ZDcwMzk0MGFlOTU1NTI1YjliMzU2YjQuLjZhNGU1Yzk4NjY4NjM2NWI2MjRmMWFmOTNlNGY2ZjI2 YTI1YWM1MDEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4 cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3Rh dGlvbnMKQEAgLTMyMSwxNyArMzIxLDYgQEAgd2Via2l0Lm9yZy9iLzkzOTgwIGh0dHAvdGVzdHMv YXBwY2FjaGUvbG9hZC1mcm9tLWFwcGNhY2hlLWRlZmVyLXJlc3VtZS1jcmFzaC5odG0KIAogd2Vi a2l0Lm9yZy9iLzE3MjU0NCBbIERlYnVnIF0gdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvZmFzdC1z Y3JvbGwtaWZyYW1lLWxhdGNoZWQtbWFpbmZyYW1lLXdpdGgtaGFuZGxlci5odG1sIFsgUGFzcyBG YWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzEzNjU1NCB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9m cmFtZXMvZnJhbWVzZXQtbmVzdGVkLWZyYW1lLXNjcm9sbGFiaWxpdHkuaHRtbCBbIFBhc3MgRmFp bHVyZSBdCi13ZWJraXQub3JnL2IvMTM5OTAxIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1l cy9mcmFtZXNldC1mcmFtZS1zY3JvbGxhYmlsaXR5Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotCi13 ZWJraXQub3JnL2IvMTY3NjYxIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Nj cm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtaG9yaXpvbnRhbC5odG1sIFsgUGFzcyBGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8xNDg0MDcgdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xs LXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1haW5mcmFtZS1zbG93LWhvcml6b250YWwuaHRt bCBbIFBhc3MgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTQ4NDA3IHRpbGVkLWRyYXdpbmcvc2Ny b2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtc2xvdy12 ZXJ0aWNhbC5odG1sIFsgUGFzcyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xNjUxOTYgdGlsZWQt ZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtaWZyYW1lLmh0bWwgWyBQ YXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzE5NjExNSB0aWxlZC1kcmF3aW5nL3Njcm9sbGlu Zy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1wcm94aW1pdHktbWFpbmZyYW1lLmh0bWwgWyBTa2lw IF0KLQotd2Via2l0Lm9yZy9iLzE0ODQwOCB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9yb290LW92 ZXJmbG93LXdpdGgtbW91c2V3aGVlbC5odG1sIFsgUGFzcyBGYWlsdXJlIFRpbWVvdXQgXQotCiB3 ZWJraXQub3JnL2IvMTM5ODIwIGZhc3QvZnJhbWVzL2xvdHMtb2Ytb2JqZWN0cy5odG1sIFsgUGFz cyBUaW1lb3V0IF0KIHdlYmtpdC5vcmcvYi8xMzk4MjAgZmFzdC9mcmFtZXMvbG90cy1vZi1pZnJh bWVzLmh0bWwgWyBQYXNzIFRpbWVvdXQgXQogCkBAIC01OTEsMTAgKzU4MCw2IEBAIHdlYmtpdC5v cmcvYi8xNjE2MzMgWyBEZWJ1ZyBdIHN0b3JhZ2UvaW5kZXhlZGRiL29iamVjdHN0b3JlLWN1cnNv ci5odG1sIFsgUGFzcyBUCiAKIHdlYmtpdC5vcmcvYi8xNjE3NDIgWyBEZWJ1ZyBdIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvSW5kZXhlZERCL2tleW9yZGVyLmh0bSBbIFBhc3MgRmFp bHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8xNjE1NDcgWyBEZWJ1ZyBdIHRpbGVkLWRyYXdpbmcvc2Ny b2xsaW5nL2ZpeGVkL2ZvdXItYmFycy16b29tZWQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMTg4MDk2IFsgUmVsZWFzZSBdIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZpeGVk L2ZvdXItYmFycy16b29tZWQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCi0KLQogd2Via2l0Lm9yZy9i LzE2MjA4MSBlZGl0aW5nL2luc2VydGluZy90eXBpbmctc3BhY2UtdG8tdHJpZ2dlci1zbWFydC1s aW5rLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNjIwODEgZWRpdGluZy9pbnNlcnRp bmcvc21hcnQtcXVvdGUtd2l0aC1hbGwtY29uZmlndXJhdGlvbnMuaHRtbCBbIEZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzE2MjA4MSBmYXN0L2V2ZW50cy9pbnB1dC1ldmVudC1pbnNlcnQtbGluay5o dG1sIFsgRmFpbHVyZSBdCkBAIC03NjMsOCArNzQ4LDYgQEAgbWVkaWEvZGVhY3RpdmF0ZS1hdWRp by1zZXNzaW9uLmh0bWwgWyBQYXNzIF0KICMgTGluayBwcmVjb25uZWN0IGlzIGRpc2FibGVkIG9u IHByZS1IaWdoIFNpZXJyYSBiZWNhdXNlIHRoZSBDRk5ldHdvcmsgU1BJIGlzIG1pc3NpbmcuCiBb IFNpZXJyYSBdIGh0dHAvdGVzdHMvcHJlY29ubmVjdCBbIFNraXAgXQogCi13ZWJraXQub3JnL2Iv MTcxODM5IHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1h bmRhdG9yeS1tYWluZnJhbWUtdmVydGljYWwtdGhlbi1ob3Jpem9udGFsLmh0bWwgWyBQYXNzIEZh aWx1cmUgXQotCiB3ZWJraXQub3JnL2IvMTc3Njg3IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdv cmsvcmVzb3VyY2Utc2l6ZXMtbWVtb3J5LWNhY2hlLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogCiB3 ZWJraXQub3JnL2IvMTc4NDcyIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9wcmV2 YWxlbnQtcmVzb3VyY2UtaGFuZGxlZC1rZXlkb3duLmh0bWwgWyBTa2lwIF0KQEAgLTkwNiwxNiAr ODg5LDEyIEBAIHdlYmtpdC5vcmcvYi8xOTgxOTUgWyBSZWxlYXNlIF0gZmFzdC9jc3Mvc3RpY2t5 L3N0aWNreS1sZWZ0LXBlcmNlbnRhZ2UuaHRtbCBbIFBhCiAKIHdlYmtpdC5vcmcvYi8xODc4Mjgg WyBSZWxlYXNlIF0gZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZmxleC1jb250ZW50LXNpemVkLWNvbHVt bnMtcmVzaXplLmh0bWwgWyBQYXNzIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2Iv MTk4NjYxIHNjcm9sbGluZ2Nvb3JkaW5hdG9yL21hYy9uZXN0ZWQtc3RpY2t5Lmh0bWwgWyBQYXNz IEltYWdlT25seUZhaWx1cmUgVGltZW91dCBdCi0KIHdlYmtpdC5vcmcvYi8xOTg2NjMgaHR0cC90 ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRl LXNhbWUtc2l0ZS1zaG91bGQtaGF2ZS1hY2Nlc3MuaHRtbCBbIFBhc3MgVGltZW91dCBdCiAKIHdl YmtpdC5vcmcvYi8xNzYwMzAgWyBEZWJ1ZyBdIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5 Ymkvc2VuZC1vYmplY3QtdG9zdHJpbmctY2hlY2suaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiAKIHdl YmtpdC5vcmcvYi8xOTg5MjEgWyBNb2phdmUrIF0gd2ViZ3B1L2JsZW5kLWNvbG9yLXRyaWFuZ2xl LXN0cmlwLmh0bWwgWyBQYXNzIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMTk1 NjM1IHNjcm9sbGluZ2Nvb3JkaW5hdG9yL21hYy9tdWx0aXBsZS1maXhlZC5odG1sIFsgUGFzcyBU aW1lb3V0IF0KLQogd2Via2l0Lm9yZy9iLzE5OTY1MSBbIE1vamF2ZSBEZWJ1ZyBdIHdlYmdwdS93 aGxzbC9idWlsdGluLXZlY3RvcnMtMi5odG1sIFsgU2xvdyBdCiAKIHdlYmtpdC5vcmcvYi8xOTkw ODkgWyBNb2phdmUrIERlYnVnIF0gcGx1Z2lucy93aW5kb3ctb3Blbi5odG1sIFsgU2tpcCBdCkBA IC05MzUsOCArOTE0LDYgQEAgd2Via2l0Lm9yZy9iLzIwNjY5NiBbIFJlbGVhc2UgXSBlZGl0aW5n L3NlbGVjdGlvbi9jYXJldC1hdC1iaWRpLWJvdW5kYXJ5Lmh0bWwgWwogCiB3ZWJraXQub3JnL2Iv MjA2NzA4IGZhc3QvYW5pbWF0aW9uL3JlcXVlc3QtYW5pbWF0aW9uLWZyYW1lLWlmcmFtZS5odG1s IFsgUGFzcyBGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIwNjk0MCBbIE1vamF2ZSsgXSB0aWxl ZC1kcmF3aW5nL3Njcm9sbGluZy9mYXN0LXNjcm9sbC1zZWxlY3QtbGF0Y2hlZC1tYWluZnJhbWUt d2l0aC1oYW5kbGVyLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotCiB3ZWJraXQub3JnL2IvMjA2OTYx IFsgTW9qYXZlIF0gbWVkaWEvbWVkaWEtZnJhZ21lbnRzL1RDMDAzNS5odG1sIFsgUGFzcyBGYWls dXJlIF0KIAogd2Via2l0Lm9yZy9iLzIwNzAwMyB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3Jv bGwtc25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktb3ZlcmZsb3cuaHRtbCBbIFBhc3MgRmFpbHVy ZSBdCkBAIC05NDksOCArOTI2LDYgQEAgd2Via2l0Lm9yZy9iLzIwNzA3OCB3ZWJncHUvd2hsc2wv dGV4dHVyZXMtc2FtcGxlLWxldmVsLmh0bWwgWyBQYXNzIEltYWdlT25seUZhaWwKIAogd2Via2l0 Lm9yZy9iLzIwNzExNyB3ZWJncHUvd2hsc2wvbmVzdGVkLWxvb3AuaHRtbCBbIFBhc3MgSW1hZ2VP bmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMDcxMjAgdGlsZWQtZHJhd2luZy9zY3JvbGxp bmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LXRoZW4tcHJveGltaXR5Lmh0bWwg WyBQYXNzIEZhaWx1cmUgXQotCiB3ZWJraXQub3JnL2IvMjA3MTI3IHdlYmdwdS93aGxzbC9idWZm ZXItdmVydGV4Lmh0bWwgWyBQYXNzIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2Iv MjA2OTAzIGluc3BlY3Rvci9oZWFwL2dldFJlbW90ZU9iamVjdC5odG1sIFsgUGFzcyBDcmFzaCBd CkBAIC0xMDM3LDE4ICsxMDEyLDEwIEBAIHdlYmtpdC5vcmcvYi8yMDc4Mzkgd2ViZ3B1L3dobHNs L2xvb3BzLWJyZWFrLmh0bWwgWyBQYXNzIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3Jn L2IvMjA3ODQ0IHN0b3JhZ2UvaW5kZXhlZGRiL2RldGFjaGVkLWlmcmFtZS5odG1sIFsgUGFzcyBG YWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIwNzg0OCBbIFJlbGVhc2UgXSBmYXN0L3Njcm9sbGlu Zy9sYXRjaGluZy9zY3JvbGwtaWZyYW1lLWZyYWdtZW50Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQot Ci13ZWJraXQub3JnL2IvMjA3ODYxIFsgUmVsZWFzZSBdIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5n L3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1yb3RhdGVkLmh0bWwgWyBQYXNzIEZh aWx1cmUgXQotCi13ZWJraXQub3JnL2IvMTQ4NDA1IFsgUmVsZWFzZSBdIHRpbGVkLWRyYXdpbmcv c2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS0yZC1vdmVyZmxvdy5o dG1sIFsgUGFzcyBGYWlsdXJlIF0KLQogd2Via2l0Lm9yZy9iLzIwNzg2NCB3ZWJncHUvd2hsc2wv ZG8td2hpbGUtbG9vcC1jb250aW51ZS5odG1sIFsgUGFzcyBJbWFnZU9ubHlGYWlsdXJlIF0KIAog d2Via2l0Lm9yZy9iLzIwNzkzOCBodHRwL3dwdC9jcnlwdG8vZGVyaXZlLWhtYWMta2V5LWNyYXNo LmFueS5odG1sIFsgUGFzcyBDcmFzaCBdCiAKLXdlYmtpdC5vcmcvYi8yMDc5NTMgWyBSZWxlYXNl IF0gZmFzdC9zY3JvbGxpbmcvbGF0Y2hpbmcvc2Nyb2xsLWlmcmFtZS1pbi1vdmVyZmxvdy5odG1s IFsgUGFzcyBGYWlsdXJlIF0KLQogd2Via2l0Lm9yZy9iLzIwNzk1NCBodHRwL3Rlc3RzL2luc3Bl Y3Rvci9uZXR3b3JrL2hhci9oYXItcGFnZS5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAogd2Via2l0 Lm9yZy9iLzIwNzk2MiBhY2Nlc3NpYmlsaXR5L21hYy9hcmlhLW1lbnUtaXRlbS1zZWxlY3RlZC1u b3RpZmljYXRpb24uaHRtbCBbIFNsb3cgXQpAQCAtMTA4MSw4ICsxMDQ4LDYgQEAgd2Via2l0Lm9y Zy9iLzIwODg4OSBmYXN0L2ltYWdlcy9kZWNvZGUtcmVuZGVyLWFuaW1hdGVkLWltYWdlLmh0bWwg WyBQYXNzIEltYWdlT24KIAogd2Via2l0Lm9yZy9iLzIwOTAwNiBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL3NjcmlwdGluZy0xL3RoZS1zY3JpcHQtZWxlbWVu dC9leGVjdXRpb24tdGltaW5nLzA4NS5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAotd2Via2l0Lm9y Zy9iLzIwOTAxMyBmYXN0L3Njcm9sbGluZy9tb21lbnR1bS1zY3JvbGwtd2l0aC1ib3JkZXJzLmh0 bWwgWyBQYXNzIFRpbWVvdXQgXQotCiB3ZWJraXQub3JnL2IvMjA5MDE4IFsgQ2F0YWxpbmEgXSB3 ZWJydGMvdmlkZW8tYXV0b3BsYXkxLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogCiB3ZWJraXQub3Jn L2IvMjA5MDI0IFsgRGVidWcgXSB3ZWJncHUvd2hsc2wvdmVjdG9yLWNvbXBhcmUuaHRtbCBbIFBh c3MgQ3Jhc2ggXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBl Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCA0NzAzNWUwZWQ5YTQ5Yjc3YzY4NDUzMTZmZjNiMGU1NjlmNTM4NjhiLi4zOWFkYmM2ZjUyNTYw MDk1MDAyOWZkZWQ1ZmY4YmYzNTljYzk1ODdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv VGVzdEV4cGVjdGF0aW9ucwpAQCAtMTc1Nyw4ICsxNzU3LDYgQEAgd2Via2l0Lm9yZy9iLzE5OTAx MyBbIERlYnVnIE1vamF2ZSsgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnNv Y2tldHMKIAogd2Via2l0Lm9yZy9iLzE5MDg4MiBbIE1vamF2ZSsgXSBhbmltYXRpb25zL2NoYW5n ZS1vbmUtYW5pbS5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzE5NTYzNSBz Y3JvbGxpbmdjb29yZGluYXRvci9tYWMvbXVsdGlwbGUtZml4ZWQuaHRtbCBbIFBhc3MgVGltZW91 dCBdCi0KICMgPHJkYXI6Ly9wcm9ibGVtLzQ4NzgxMDk4PgogWyBDYXRhbGluYSsgXSBmYXN0L2lt YWdlcy9hbmltYXRlZC1oZWljcy1kcmF3Lmh0bWwgWyBQYXNzIF0KIFsgQ2F0YWxpbmErIF0gZmFz dC9pbWFnZXMvYW5pbWF0ZWQtaGVpY3MtdmVyaWZ5Lmh0bWwgWyBQYXNzIF0KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2Zhc3Qtc2Nyb2xsLWRpdi1sYXRj aGVkLW1haW5mcmFtZS13aXRoLWhhbmRsZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvdGls ZWQtZHJhd2luZy9zY3JvbGxpbmcvZmFzdC1zY3JvbGwtZGl2LWxhdGNoZWQtbWFpbmZyYW1lLXdp dGgtaGFuZGxlci1leHBlY3RlZC50eHQKaW5kZXggMDljMTExNmVhZDg3ZTRmZGNlZjIzODMzYjM2 NmY5NDA4MjdlM2ViYy4uYjYwZDRlZDIyNzhiODY4ZTVhOWNjYmRlNDIyNDc1MWM1MDBlNTRjYyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvZmFzdC1zY3Jv bGwtZGl2LWxhdGNoZWQtbWFpbmZyYW1lLXdpdGgtaGFuZGxlci1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvZmFzdC1zY3JvbGwtZGl2LWxhdGNo ZWQtbWFpbmZyYW1lLXdpdGgtaGFuZGxlci1leHBlY3RlZC50eHQKQEAgLTEsNjkgKzEsMjcgQEAK IFB1dCBtb3VzZSBoZXJlIGFuZCBmbGljayBkb3dud2FyZHMKIFNjcm9sbGFibGUgUmVnaW9uCiAK LUNvdW50CURBVEEJUmV2IENvdW50Ci1UT1AgVE9QIFRPUCBUT1AgVE9QCVRPUCBUT1AgVE9QIFRP UCBUT1AJVE9QIFRPUCBUT1AgVE9QIFRPUAotMQkwLjExMDAJNDAKLTIJMC4xMTU1CTM5Ci0zCTAu MjIwMAkzOAotNAkwLjIyNTUJMzcKLTUJMC4zMzAwCTM2Ci02CTAuMzM1NQkzNQotNwkwLjQ0MDAJ MzQKLTgJMC40NDU1CTMzCi05CTAuNTUwMAkzMgotMTAJMC41NTU1CTMxCi0xMQkwLjY2MDAJMzAK LTEyCTAuNjY1NQkyOQotMTMJMC43NzAwCTI4Ci0xNAkwLjc3NTUJMjcKLTE1CTAuODgwMAkyNgot MTYJMC44ODU1CTI1Ci0xNwkwLjk5MDAJMjQKLTE4CTAuOTk1NQkyMwotMTkJMC45OTk5CTIyCi0y MAkxLjAwMDAJMjEKLTIxCTEuMDAwMAkyMAotMjIJMC45OTk5CTE5Ci0yMwkwLjk5NTUJMTgKLTI0 CTAuOTkwMAkxNwotMjUJMC44ODU1CTE2Ci0yNgkwLjg4MDAJMTUKLTI3CTAuNzc1NQkxNAotMjgJ MC43NzAwCTEzCi0yOQkwLjY2NTUJMTIKLTMwCTAuNjYwMAkxMQotMzEJMC41NTU1CTEwCi0zMgkw LjU1MDAJOQotMzMJMC40NDU1CTgKLTM0CTAuNDQwMAk3Ci0zNQkwLjMzNTUJNgotMzYJMC4zMzAw CTUKLTM3CTAuMjI1NQk0Ci0zOAkwLjIyMDAJMwotMzkJMC4xMTU1CTIKLTQwCTAuMTEwMAkxCi1F TkQgRU5EIEVORCBFTkQgRU5ECUVORCBFTkQgRU5EIEVORCBFTkQJRU5EIEVORCBFTkQgRU5EIEVO RAorU2Nyb2xsZWQgY29udGVudAogVGVzdHMgdGhhdCBhIHNjcm9sbGFibGUgZGl2IGRvZXNuJ3Qg Y29uc3VtZSB3aGVlbCBldmVudHMgd2hlbiBzY3JvbGwgaXMgbGF0Y2hlZCB0byBtYWluIGZyYW1l LgogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2Vz LCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAorTW91c2UgbW92ZWQgdG8gKDI4LCAx MjUpCitQQVNTIFNjcm9sbGFibGUgZGl2IGRpZCBub3QgcmVjZWl2ZSB3aGVlbCBldmVudHMuCiBQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKLU1vdXNlIG1v dmVkIHRvICgyOCwgMTI1KQotUEFTUyBTY3JvbGxhYmxlIGRpdiBkaWQgbm90IHJlY2VpdmUgd2hl ZWwgZXZlbnRzLgogKEdyYXBoaWNzTGF5ZXIKICAgKGFuY2hvciAwLjAwIDAuMDApCi0gIChib3Vu ZHMgMjAwOC4wMCAyMjgxLjAwKQorICAoYm91bmRzIDIwMDguMDAgMjIzNi4wMCkKICAgKHZpc2li bGUgcmVjdCAwLjAwLCA3MC4wMCA3ODUuMDAgeCA1ODUuMDApCiAgIChjb3ZlcmFnZSByZWN0IDAu MDAsIDcwLjAwIDc4NS4wMCB4IDU4NS4wMCkKICAgKGludGVyc2VjdHMgY292ZXJhZ2UgcmVjdCAx KQogICAoY29udGVudHNTY2FsZSAxLjAwKQogICAoY2hpbGRyZW4gMQogICAgIChHcmFwaGljc0xh eWVyCi0gICAgICAoYm91bmRzIDIwMDguMDAgMjI4MS4wMCkKKyAgICAgIChib3VuZHMgMjAwOC4w MCAyMjM2LjAwKQogICAgICAgKGNvbnRlbnRzT3BhcXVlIDEpCiAgICAgICAodmlzaWJsZSByZWN0 IDAuMDAsIDcwLjAwIDc4NS4wMCB4IDU4NS4wMCkKICAgICAgIChjb3ZlcmFnZSByZWN0IDAuMDAs IDAuMDAgMTU3MC4wMCB4IDE3NTUuMDApCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1k cmF3aW5nL3Njcm9sbGluZy9maXhlZC9mb3VyLWJhcnMtem9vbWVkLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZpeGVkL2ZvdXItYmFycy16b29tZWQt ZXhwZWN0ZWQudHh0CmluZGV4IDVhNDBjMWE5YjEyZmU2MDRhMzA0MDc2MDczMGI4OThhOGI4ZTJk M2MuLmI3OTE0ZDU0NDJmY2I3YjlmYTkyNTk0N2I0NjE5YmQwZjQ5ZThlMDggMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZpeGVkL2ZvdXItYmFycy16b29t ZWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5n L2ZpeGVkL2ZvdXItYmFycy16b29tZWQtZXhwZWN0ZWQudHh0CkBAIC0xNCw2ICsxNCw3IEBACiAg IChtaW4gbGF5b3V0IHZpZXdwb3J0IG9yaWdpbiAoMCwwKSkKICAgKG1heCBsYXlvdXQgdmlld3Bv cnQgb3JpZ2luICgwLDE2MzYpKQogICAoYmVoYXZpb3IgZm9yIGZpeGVkIDApCisgICh2aXN1YWwg dmlld3BvcnQgc21hbGxlciB0aGFuIGxheW91dCB2aWV3cG9ydCAxKQogICAoY2hpbGRyZW4gNAog ICAgIChGaXhlZCBub2RlCiAgICAgICAoYW5jaG9yIGVkZ2VzOiBBbmNob3JFZGdlTGVmdCBBbmNo b3JFZGdlVG9wKQpAQCAtODcsNyArODgsNyBAQAogICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkK ICAgICAgICAgICAodmlzaWJsZSByZWN0IDAuMDAsIDAuMDAgMC4wMCB4IDAuMDApCiAgICAgICAg ICAgKGNvdmVyYWdlIHJlY3QgLTU5Ny4wMCwgLTE5Ni4wMCAzNDEuMzAgeCAyNTQuMzUpCi0gICAg ICAgICAgKGludGVyc2VjdHMgY292ZXJhZ2UgcmVjdCAxKQorICAgICAgICAgIChpbnRlcnNlY3Rz IGNvdmVyYWdlIHJlY3QgMCkKICAgICAgICAgICAoY29udGVudHNTY2FsZSAyLjMwKQogICAgICAg ICApCiAgICAgICAgIChHcmFwaGljc0xheWVyCkBAIC05Nyw3ICs5OCw3IEBACiAgICAgICAgICAg KGRyYXdzQ29udGVudCAxKQogICAgICAgICAgICh2aXNpYmxlIHJlY3QgMC4wMCwgMC4wMCAwLjAw IHggMC4wMCkKICAgICAgICAgICAoY292ZXJhZ2UgcmVjdCA0LjAwLCAtNDk3LjAwIDM0MS4zMCB4 IDI1NC4zNSkKLSAgICAgICAgICAoaW50ZXJzZWN0cyBjb3ZlcmFnZSByZWN0IDEpCisgICAgICAg ICAgKGludGVyc2VjdHMgY292ZXJhZ2UgcmVjdCAwKQogICAgICAgICAgIChjb250ZW50c1NjYWxl IDIuMzApCiAgICAgICAgICkKICAgICAgICkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVk LWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1lcy9mcmFtZXNldC1mcmFtZS1zY3JvbGxhYmlsaXR5LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1lcy9m cmFtZXNldC1mcmFtZS1zY3JvbGxhYmlsaXR5LWV4cGVjdGVkLnR4dAppbmRleCA5NTk5ZTM1MDA0 ZWQwMGIyYjMyMGU2YjFlYjRkNGNlOTFmOWNkZmU1Li44YWE1N2JkZmQwYzA1NzRlOGM0ZmJjNTM5 MWE5ZTY5YmI1M2U2ZDRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Nj cm9sbGluZy9mcmFtZXMvZnJhbWVzZXQtZnJhbWUtc2Nyb2xsYWJpbGl0eS1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvZnJhbWVzL2ZyYW1lc2V0 LWZyYW1lLXNjcm9sbGFiaWxpdHktZXhwZWN0ZWQudHh0CkBAIC0xLDEwICsxLDE2IEBACiAoRnJh bWUgc2Nyb2xsaW5nIG5vZGUKICAgKHNjcm9sbGFibGUgYXJlYSBzaXplIDgwMCA2MDApCiAgIChj b250ZW50cyBzaXplIDgwMCA2MDApCisgIChzY3JvbGxhYmxlIGFyZWEgcGFyYW1ldGVycyAKKyAg ICAoaG9yaXpvbnRhbCBzY3JvbGwgZWxhc3RpY2l0eSAyKQorICAgICh2ZXJ0aWNhbCBzY3JvbGwg ZWxhc3RpY2l0eSAyKQorICAgIChob3Jpem9udGFsIHNjcm9sbGJhciBtb2RlIDEpCisgICAgKHZl cnRpY2FsIHNjcm9sbGJhciBtb2RlIDEpKQogICAobGF5b3V0IHZpZXdwb3J0IGF0ICgwLDApIHNp emUgODAweDYwMCkKICAgKG1pbiBsYXlvdXQgdmlld3BvcnQgb3JpZ2luICgwLDApKQogICAobWF4 IGxheW91dCB2aWV3cG9ydCBvcmlnaW4gKDAsMCkpCiAgIChzeW5jaHJvbm91cyBldmVudCBkaXNw YXRjaCByZWdpb24gZm9yIGV2ZW50IHdoZWVsCiAgICAgYXQgKDAsMCkgc2l6ZSA4MDB4NTk0KQor ICAoYmVoYXZpb3IgZm9yIGZpeGVkIDApCiApCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Rp bGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1lcy9mcmFtZXNldC1uZXN0ZWQtZnJhbWUtc2Nyb2xs YWJpbGl0eS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGlu Zy9mcmFtZXMvZnJhbWVzZXQtbmVzdGVkLWZyYW1lLXNjcm9sbGFiaWxpdHktZXhwZWN0ZWQudHh0 CmluZGV4IDAzZmRjY2VlZjk1YWE2NTVlNTNmNzc0NjM4MjE0ZDhjMTlmZGE2N2YuLjFkZmYyOTYw ZjJkOTVlZTczMDI1MTMwNGZhNmViZjkzZGZiN2FkODYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2ZyYW1lcy9mcmFtZXNldC1uZXN0ZWQtZnJhbWUtc2Ny b2xsYWJpbGl0eS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9z Y3JvbGxpbmcvZnJhbWVzL2ZyYW1lc2V0LW5lc3RlZC1mcmFtZS1zY3JvbGxhYmlsaXR5LWV4cGVj dGVkLnR4dApAQCAtMSwxMCArMSwxNiBAQAogKEZyYW1lIHNjcm9sbGluZyBub2RlCiAgIChzY3Jv bGxhYmxlIGFyZWEgc2l6ZSA4MDAgNjAwKQogICAoY29udGVudHMgc2l6ZSA4MDAgNjAwKQorICAo c2Nyb2xsYWJsZSBhcmVhIHBhcmFtZXRlcnMgCisgICAgKGhvcml6b250YWwgc2Nyb2xsIGVsYXN0 aWNpdHkgMikKKyAgICAodmVydGljYWwgc2Nyb2xsIGVsYXN0aWNpdHkgMikKKyAgICAoaG9yaXpv bnRhbCBzY3JvbGxiYXIgbW9kZSAxKQorICAgICh2ZXJ0aWNhbCBzY3JvbGxiYXIgbW9kZSAxKSkK ICAgKGxheW91dCB2aWV3cG9ydCBhdCAoMCwwKSBzaXplIDgwMHg2MDApCiAgIChtaW4gbGF5b3V0 IHZpZXdwb3J0IG9yaWdpbiAoMCwwKSkKICAgKG1heCBsYXlvdXQgdmlld3BvcnQgb3JpZ2luICgw LDApKQogICAoc3luY2hyb25vdXMgZXZlbnQgZGlzcGF0Y2ggcmVnaW9uIGZvciBldmVudCB3aGVl bAogICAgIGF0ICgwLDE2Nikgc2l6ZSAyODB4NDM0KQorICAoYmVoYXZpb3IgZm9yIGZpeGVkIDAp CiApCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Nj cm9sbC1zbmFwL3Njcm9sbC1zbmFwLWlmcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJh d2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtaWZyYW1lLmh0bWwKaW5kZXgg ZGYyZTFmZmU0OWZjODJkYWIyNTQyM2M4ZDUxNDFlNWE3ODhhZTFlMi4uZWU3YTMwNzkwNjY2MDZi MGQ1MThlNWJmZjgyYjRkYzNlNjI3ODYwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQt ZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtaWZyYW1lLmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xs LXNuYXAtaWZyYW1lLmh0bWwKQEAgLTE4LDcgKzE4LDcgQEAKICAgICAgICAgICAgICAgICBtYXJn aW46IDJweDsKICAgICAgICAgICAgIH0KICAgICAgICAgPC9zdHlsZT4KLSAgICAgICAgPHNjcmlw dCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+ CiAgICAgICAgIDxzY3JpcHQ+CiAgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK IApAQCAtNTgsNyArNTgsNyBAQAogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoImRpdiBob25v cmVkIHNuYXAgcG9pbnRzLiIpOwogCiAgICAgICAgICAgICBpZiAodGFyZ2V0TGFiZWwgPT0gJ2hv cml6b250YWxUYXJnZXQnKQotICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7 IHNjcm9sbEdsaWRlVGVzdCgndmVydGljYWxUYXJnZXQnKSB9LCAwKTsKKyAgICAgICAgICAgICAg ICBzZXRUaW1lb3V0KCgpID0+IHsgc2Nyb2xsR2xpZGVUZXN0KCd2ZXJ0aWNhbFRhcmdldCcpIH0s IDApOwogICAgICAgICAgICAgZWxzZSAgIAogICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgp OwogICAgICAgICB9CkBAIC04MiwyMyArODIsMjQgQEAKIAogICAgICAgICAgICAgdmFyIHN0YXJ0 UG9zWCA9IHdpbmRvd1Bvc2l0aW9uLnggKyAwLjUgKiBpZnJhbWVUYXJnZXQuY2xpZW50V2lkdGg7 CiAgICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0gd2luZG93UG9zaXRpb24ueSArIDAuNSAqIGlm cmFtZVRhcmdldC5jbGllbnRIZWlnaHQ7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9y V2hlZWxFdmVudHMoKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0 UG9zWCwgc3RhcnRQb3NZKTsgLy8gTWFrZSBzdXJlIHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlG cmFtZQogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKGR4LCBkeSwgJ2JlZ2FuJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcyhkeCwgZHksICdj aGFuZ2VkJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlX aXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcyhkeCwgZHksICdjaGFuZ2VkJywgJ25vbmUnKTsKICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBo YXNlcygwLCAwLCAnZW5kZWQnLCAnbm9uZScpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2Fs bEFmdGVyU2Nyb2xsaW5nQ29tcGxldGVzKGZ1bmN0aW9uKCkgeyByZXR1cm4gY2hlY2tGb3JTY3Jv bGxTbmFwKHRhcmdldExhYmVsKTsgfSk7CisgICAgICAgICAgICBldmVudFNlbmRlci5jYWxsQWZ0 ZXJTY3JvbGxpbmdDb21wbGV0ZXMoKCkgPT4geyByZXR1cm4gY2hlY2tGb3JTY3JvbGxTbmFwKHRh cmdldExhYmVsKTsgfSk7CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBjaGVja0ZvclNj cm9sbEdsaWRlKHRhcmdldExhYmVsKQogICAgICAgICB7CiAgICAgICAgICAgICB2YXIgaWZyYW1l VGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQodGFyZ2V0TGFiZWwpOwotICAgICAgICAg ICAgdmFyIGlmcmFtZUJvZHkgPSB3aW5kb3cuZnJhbWVzW3RhcmdldExhYmVsXS5kb2N1bWVudC5i b2R5OworICAgICAgICAgICAgdmFyIGlmcmFtZVNjcm9sbGluZ0VsZW1lbnQgPSB3aW5kb3cuZnJh bWVzW3RhcmdldExhYmVsXS5jb250ZW50RG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudDsKIAotICAg ICAgICAgICAgdmFyIGFjdHVhbFBvc2l0aW9uID0gaWZyYW1lQm9keS5zY3JvbGxUb3A7CisgICAg ICAgICAgICB2YXIgYWN0dWFsUG9zaXRpb24gPSBpZnJhbWVTY3JvbGxpbmdFbGVtZW50LnNjcm9s bFRvcDsKICAgICAgICAgICAgIHZhciBleHBlY3RlZFBvc2l0aW9uID0gaWZyYW1lVGFyZ2V0LmNs aWVudEhlaWdodDsKICAgICAgICAgICAgIGlmICh0YXJnZXRMYWJlbCA9PSAnaG9yaXpvbnRhbFRh cmdldCcpIHsKLSAgICAgICAgICAgICAgICBhY3R1YWxQb3NpdGlvbiA9IGlmcmFtZUJvZHkuc2Ny b2xsTGVmdDsKKyAgICAgICAgICAgICAgICBhY3R1YWxQb3NpdGlvbiA9IGlmcmFtZVNjcm9sbGlu Z0VsZW1lbnQuc2Nyb2xsTGVmdDsKICAgICAgICAgICAgICAgICBleHBlY3RlZFBvc2l0aW9uID0g aWZyYW1lVGFyZ2V0LmNsaWVudFdpZHRoOwogICAgICAgICAgICAgfQogCkBAIC0xMDgsMjIgKzEw OSwyMiBAQAogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoImRp diBkaWQgbm90IGhvbm9yIHNuYXAgcG9pbnRzLiBFeHBlY3RlZCAiICsgZXhwZWN0ZWRQb3NpdGlv biArICIsIGJ1dCBnb3QgIiArIGFjdHVhbFBvc2l0aW9uKTsKIAotICAgICAgICAgICAgc2V0VGlt ZW91dChmdW5jdGlvbigpIHsgc2Nyb2xsU25hcFRlc3QodGFyZ2V0TGFiZWwpIH0sIDApOworICAg ICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7IHNjcm9sbFNuYXBUZXN0KHRhcmdldExhYmVsKSB9 LCAwKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHNjcm9sbEdsaWRlVGVzdCh0YXJn ZXRMYWJlbCkKICAgICAgICAgewogICAgICAgICAgICAgZGVidWcoIlRlc3Rpbmcgc2Nyb2xsLXNu YXAgZ2xpZGUgZm9yICIgKyB0YXJnZXRMYWJlbCArICI6Iik7CiAgICAgICAgICAgICB2YXIgaWZy YW1lVGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQodGFyZ2V0TGFiZWwpOwotICAgICAg ICAgICAgdmFyIGlmcmFtZUJvZHkgPSB3aW5kb3cuZnJhbWVzW3RhcmdldExhYmVsXS5kb2N1bWVu dC5ib2R5OworICAgICAgICAgICAgdmFyIGlmcmFtZVNjcm9sbGluZ0VsZW1lbnQgPSB3aW5kb3cu ZnJhbWVzW3RhcmdldExhYmVsXS5jb250ZW50RG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudDsKICAK ICAgICAgICAgICAgIHZhciBkeCA9IDA7CiAgICAgICAgICAgICB2YXIgZHkgPSAwOwogICAgICAg ICAgICAgaWYgKHRhcmdldExhYmVsID09ICdob3Jpem9udGFsVGFyZ2V0JykgewotICAgICAgICAg ICAgICAgIGlmcmFtZVNjcm9sbFBvc2l0aW9uQmVmb3JlR2xpZGUgPSBpZnJhbWVCb2R5LnNjcm9s bExlZnQ7CisgICAgICAgICAgICAgICAgaWZyYW1lU2Nyb2xsUG9zaXRpb25CZWZvcmVHbGlkZSA9 IGlmcmFtZVNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsTGVmdDsKICAgICAgICAgICAgICAgICBkeCA9 IC0xOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpZnJhbWVTY3JvbGxQ b3NpdGlvbkJlZm9yZUdsaWRlID0gaWZyYW1lQm9keS5zY3JvbGxUb3A7CisgICAgICAgICAgICAg ICAgaWZyYW1lU2Nyb2xsUG9zaXRpb25CZWZvcmVHbGlkZSA9IGlmcmFtZVNjcm9sbGluZ0VsZW1l bnQuc2Nyb2xsVG9wOwogICAgICAgICAgICAgICAgIGR5ID0gLTE7CiAgICAgICAgICAgICB9CiAK QEAgLTEzMSw2ICsxMzIsNyBAQAogCiAgICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gd2luZG93 UG9zaXRpb24ueCArIDAuNSAqIGlmcmFtZVRhcmdldC5jbGllbnRXaWR0aDsKICAgICAgICAgICAg IHZhciBzdGFydFBvc1kgPSB3aW5kb3dQb3NpdGlvbi55ICsgMC41ICogaWZyYW1lVGFyZ2V0LmNs aWVudEhlaWdodDsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygp OwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oc3RhcnRQb3NYLCBzdGFydFBv c1kpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKGR4LCBkeSwgJ2JlZ2FuJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcyhkeCwgZHksICdj aGFuZ2VkJywgJ25vbmUnKTsKQEAgLTE0MCwxMyArMTQyLDEyIEBACiAgICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoZHgsIGR5LCAn bm9uZScsICdiZWdpbicpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdp dGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4LCBkeSwgJ25vbmUnLCAnY29udGludWUnKTsKICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBo YXNlcygwLCAwLCAnbm9uZScsICdlbmQnKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxB ZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhmdW5jdGlvbigpIHsgcmV0dXJuIGNoZWNrRm9yU2Nyb2xs R2xpZGUodGFyZ2V0TGFiZWwpOyB9KTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRl clNjcm9sbGluZ0NvbXBsZXRlcygoKSA9PiB7IHJldHVybiBjaGVja0ZvclNjcm9sbEdsaWRlKHRh cmdldExhYmVsKSB9KTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgpCiAg ICAgICAgIHsKICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKLSAgICAgICAg ICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAgICAgICAgICAg ICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1Nb21lbnR1bVNjcm9sbGluZ1ByZWRpY3Rpb25FbmFibGVk KGZhbHNlKTsKICAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBzY3JvbGxH bGlkZVRlc3QoJ2hvcml6b250YWxUYXJnZXQnKSB9LCAwKTsKICAgICAgICAgICAgIH0KQEAgLTE2 MCw1ICsxNjEsNiBAQAogICAgICAgICAgICAgPGlmcmFtZSBpZD0idmVydGljYWxUYXJnZXQiIGNs YXNzPSJ2ZXJ0aWNhbEdhbGxlcnkiIHNyYz0icmVzb3VyY2VzL3ZlcnRpY2FsLW1haW5mcmFtZS5o dG1sIiAgc3R5bGU9ImhlaWdodDogMzAwcHg7IHdpZHRoOiAzMDBweCI+PC9pZnJhbWU+CiAgICAg ICAgICAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KICAgICAgICAgPC9kaXY+CisgICAgPHNj cmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgog ICAgIDwvYm9keT4KLTwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwt c25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktbWFpbmZyYW1lLWhvcml6b250YWwuaHRtbCBiL0xh eW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFw LW1hbmRhdG9yeS1tYWluZnJhbWUtaG9yaXpvbnRhbC5odG1sCmluZGV4IDdmZDY0ODg0YWVjOGFm OGI3MGQxNWM0NGE5ZmIyMTQ4OWM1MzMxMTkuLjNkNDBhZmY4MGYwZDQ5NDIzMGZkZTAxNGQwM2Fm MjJhMjc4NTU5MDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xs aW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtaG9yaXpvbnRh bC5odG1sCisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1z bmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtaG9yaXpvbnRhbC5odG1sCkBAIC0y NiwzMCArMjYsMjggQEAKICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgd2luZG93LmpzVGVzdElz QXN5bmMgPSB0cnVlOwogCi0gICAgICAgIHZhciBkaXZUYXJnZXQ7Ci0gICAgICAgIHZhciBkaXZT Y3JvbGxQb3NpdGlvbkJlZm9yZUdsaWRlOwotICAgICAgICB2YXIgZGl2U2Nyb2xsUG9zaXRpb25C ZWZvcmVTbmFwOworICAgICAgICB2YXIgdGFyZ2V0U2Nyb2xsZXI7CisgICAgICAgIHZhciBzY3Jv bGxQb3NpdGlvbkJlZm9yZUdsaWRlOworICAgICAgICB2YXIgc2Nyb2xsUG9zaXRpb25CZWZvcmVT bmFwOwogCi0gICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsU25hcCgpIHsKKyAgICAgICAg ZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGxTbmFwKCkKKyAgICAgICAgewogICAgICAgICAgICAgLy8g VGhlIGRpdiBzaG91bGQgaGF2ZSBzbmFwcGVkIGJhY2sgdG8gdGhlIHByZXZpb3VzIHBvc2l0aW9u Ci0gICAgICAgICAgICBpZiAoZGl2VGFyZ2V0LnNjcm9sbExlZnQgIT0gZGl2U2Nyb2xsUG9zaXRp b25CZWZvcmVTbmFwKQotICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoImRpdiBkaWQgbm90IHNu YXAgYmFjayB0byBwcm9wZXIgbG9jYXRpb24uIEV4cGVjdGVkICIgKyBkaXZTY3JvbGxQb3NpdGlv bkJlZm9yZVNuYXAgKyAiLCBidXQgZ290ICIgKyBkaXZUYXJnZXQuc2Nyb2xsTGVmdCk7CisgICAg ICAgICAgICBpZiAodGFyZ2V0U2Nyb2xsZXIuc2Nyb2xsTGVmdCAhPSBzY3JvbGxQb3NpdGlvbkJl Zm9yZVNuYXApCisgICAgICAgICAgICAgICAgdGVzdEZhaWxlZCgiZGl2IGRpZCBub3Qgc25hcCBi YWNrIHRvIHByb3BlciBsb2NhdGlvbi4gRXhwZWN0ZWQgIiArIHNjcm9sbFBvc2l0aW9uQmVmb3Jl U25hcCArICIsIGJ1dCBnb3QgIiArIHRhcmdldFNjcm9sbGVyLnNjcm9sbExlZnQpOwogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoImRpdiBob25vcmVkIHNuYXAg cG9pbnRzLiIpOwogCiAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKICAgICAgICAgfQogCi0g ICAgICAgIGZ1bmN0aW9uIHNjcm9sbFNuYXBUZXN0KCkgewotICAgICAgICAgICAgLy8gU2VlIHdo ZXJlIG91ciBkaXYgbGl2ZXM6Ci0gICAgICAgICAgICBwYWdlU2Nyb2xsUG9zaXRpb25CZWZvcmUg PSBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbExlZnQ7CisgICAgICAgIGZ1bmN0aW9u IHNjcm9sbFNuYXBUZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgc2Nyb2xsUG9zaXRpb25C ZWZvcmVTbmFwID0gdGFyZ2V0U2Nyb2xsZXIuc2Nyb2xsTGVmdDsKIAotICAgICAgICAgICAgZGl2 VGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpOwotIAotICAgICAgICAg ICAgZGl2U2Nyb2xsUG9zaXRpb25CZWZvcmVTbmFwID0gZGl2VGFyZ2V0LnNjcm9sbExlZnQ7Ci0K LSAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSBkaXZUYXJnZXQub2Zmc2V0TGVmdCArIDIwOwot ICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IGRpdlRhcmdldC5vZmZzZXRUb3AgKyAyMDsKKyAg ICAgICAgICAgIHZhciBzdGFydFBvc1ggPSB0YXJnZXRTY3JvbGxlci5vZmZzZXRMZWZ0ICsgMjA7 CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0gdGFyZ2V0U2Nyb2xsZXIub2Zmc2V0VG9wICsg MjA7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9zWCwgc3RhcnRQb3NZKTsgLy8g TWFrZSBzdXJlIHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlGcmFtZQogICAgICAgICAgICAgZXZl bnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAn YmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdp dGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnY2hhbmdlZCcsICdub25lJyk7CkBAIC01 OCwyMyArNTYsMjQgQEAKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGlu Z0NvbXBsZXRlcyhjaGVja0ZvclNjcm9sbFNuYXApOwogICAgICAgICB9CiAKLSAgICAgICAgZnVu Y3Rpb24gY2hlY2tGb3JTY3JvbGxHbGlkZSgpIHsKKyAgICAgICAgZnVuY3Rpb24gY2hlY2tGb3JT Y3JvbGxHbGlkZSgpCisgICAgICAgIHsKICAgICAgICAgICAgIC8vIFRoZSBkaXYgc2hvdWxkIGhh dmUgc2Nyb2xsZWQgKGdsaWRlZCkgdG8gdGhlIG5leHQgc25hcCBwb2ludC4KLSAgICAgICAgICAg IGlmIChkaXZUYXJnZXQuc2Nyb2xsTGVmdCA9PSB3aW5kb3cuaW5uZXJXaWR0aCkKKyAgICAgICAg ICAgIGlmICh0YXJnZXRTY3JvbGxlci5zY3JvbGxMZWZ0ID09IHdpbmRvdy5pbm5lcldpZHRoKQog ICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoImRpdiBzY3JvbGxlZCB0byBuZXh0IHdpbmRvdy4i KTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCJkaXYgZGlk IG5vdCBob25vciBzbmFwIHBvaW50cy4gRXhwZWN0ZWQgIiArIHdpbmRvdy5pbm5lcldpZHRoICsg IiwgYnV0IGdvdCAiICsgZGl2VGFyZ2V0LnNjcm9sbExlZnQpOworICAgICAgICAgICAgICAgIHRl c3RGYWlsZWQoImRpdiBkaWQgbm90IGhvbm9yIHNuYXAgcG9pbnRzLiBFeHBlY3RlZCAiICsgd2lu ZG93LmlubmVyV2lkdGggKyAiLCBidXQgZ290ICIgKyB0YXJnZXRTY3JvbGxlci5zY3JvbGxMZWZ0 KTsKIAogICAgICAgICAgICAgc2V0VGltZW91dChzY3JvbGxTbmFwVGVzdCwgMCk7CiAgICAgICAg IH0KIAotICAgICAgICBmdW5jdGlvbiBzY3JvbGxHbGlkZVRlc3QoKSB7Ci0gICAgICAgICAgICBk aXZUYXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGFyZ2V0Jyk7Ci0gCi0gICAgICAg ICAgICBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZUdsaWRlID0gZGl2VGFyZ2V0LnNjcm9sbExlZnQ7 CisgICAgICAgIGZ1bmN0aW9uIHNjcm9sbEdsaWRlVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAg ICAgIHNjcm9sbFBvc2l0aW9uQmVmb3JlR2xpZGUgPSB0YXJnZXRTY3JvbGxlci5zY3JvbGxMZWZ0 OwogCi0gICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gZGl2VGFyZ2V0Lm9mZnNldExlZnQgKyAy MDsKLSAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSBkaXZUYXJnZXQub2Zmc2V0VG9wICsgMjA7 CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gdGFyZ2V0U2Nyb2xsZXIub2Zmc2V0TGVmdCAr IDIwOworICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IHRhcmdldFNjcm9sbGVyLm9mZnNldFRv cCArIDIwOworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7 IC8vIE1ha2Ugc3VyZSB3ZSBhcmUganVzdCBvdXRzaWRlIHRoZSBpRnJhbWUKICAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwg MCwgJ2JlZ2FuJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xs QnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2NoYW5nZWQnLCAnbm9uZScpOwpA QCAtODcsMTAgKzg2LDEwIEBACiAgICAgICAgICAgICBldmVudFNlbmRlci5jYWxsQWZ0ZXJTY3Jv bGxpbmdDb21wbGV0ZXMoY2hlY2tGb3JTY3JvbGxHbGlkZSk7CiAgICAgICAgIH0KIAotICAgICAg ICBmdW5jdGlvbiBvbkxvYWQoKSB7Ci0KKyAgICAgICAgZnVuY3Rpb24gb25Mb2FkKCkKKyAgICAg ICAgeworICAgICAgICAgICAgdGFyZ2V0U2Nyb2xsZXIgPSBkb2N1bWVudC5zY3JvbGxpbmdFbGVt ZW50OwogICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewotICAgICAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICAgICAgICAgIGlu dGVybmFscy5zZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xsaW5nUHJlZGljdGlvbkVuYWJsZWQoZmFs c2UpOwogICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoc2Nyb2xsR2xpZGVUZXN0LCAwKTsKICAg ICAgICAgICAgIH0gZWxzZSB7CkBAIC0xMDksNyArMTA4LDcgQEAKICAgICAgICAgfQogICAgICAg ICA8L3NjcmlwdD4KICAgICA8L2hlYWQ+Ci0gICAgPGJvZHkgb25sb2FkPSJvbkxvYWQoKTsiIGNs YXNzPSJob3Jpem9udGFsR2FsbGVyeSIgaWQ9InRhcmdldCI+CisgICAgPGJvZHkgb25sb2FkPSJv bkxvYWQoKTsiIGNsYXNzPSJob3Jpem9udGFsR2FsbGVyeSI+CiAgICAgICAgIDxkaXYgaWQ9Iml0 ZW0wIiBjbGFzcz0iY29sb3JCb3giPjxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PjwvZGl2PgogICAg ICAgICA8ZGl2IGlkPSJpdGVtMSIgY2xhc3M9ImNvbG9yQm94Ij48L2Rpdj4KICAgICAgICAgPGRp diBpZD0iaXRlbTIiIGNsYXNzPSJjb2xvckJveCI+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tYW5k YXRvcnktbWFpbmZyYW1lLXNsb3ctaG9yaXpvbnRhbC5odG1sIGIvTGF5b3V0VGVzdHMvdGlsZWQt ZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1haW5m cmFtZS1zbG93LWhvcml6b250YWwuaHRtbAppbmRleCBlNmE3NmZkZWU4ZDRiNDRiZGQzOTRkZjY5 YmYxMzFlNzJlZGViYmFmLi5lODFhNzlhZDI1ZjVmNzlkNjI4Nzc5YTdlNjU1MTQ0NTBjYTIwMjll IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwt c25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktbWFpbmZyYW1lLXNsb3ctaG9yaXpvbnRhbC5odG1s CisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Nj cm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtc2xvdy1ob3Jpem9udGFsLmh0bWwKQEAgLTI2 LDMwICsyNiwyNyBAQAogICAgICAgICA8c2NyaXB0PgogICAgICAgICB3aW5kb3cuanNUZXN0SXNB c3luYyA9IHRydWU7CiAKLSAgICAgICAgdmFyIGRpdlRhcmdldDsKLSAgICAgICAgdmFyIGRpdlNj cm9sbFBvc2l0aW9uQmVmb3JlR2xpZGU7Ci0gICAgICAgIHZhciBkaXZTY3JvbGxQb3NpdGlvbkJl Zm9yZVNuYXA7CisgICAgICAgIHZhciBzY3JvbGxpbmdUYXJnZXQ7CisgICAgICAgIHZhciBzY3Jv bGxQb3NpdGlvbkJlZm9yZUdsaWRlOworICAgICAgICB2YXIgc2Nyb2xsUG9zaXRpb25CZWZvcmVT bmFwOwogCiAgICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsU25hcCgpIHsKICAgICAgICAg ICAgIC8vIFRoZSBkaXYgc2hvdWxkIGhhdmUgc25hcHBlZCBiYWNrIHRvIHRoZSBwcmV2aW91cyBw b3NpdGlvbgotICAgICAgICAgICAgaWYgKGRpdlRhcmdldC5zY3JvbGxMZWZ0ICE9IGRpdlNjcm9s bFBvc2l0aW9uQmVmb3JlU25hcCkKLSAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKGBkaXYgZGlk IG5vdCBzbmFwIGJhY2sgdG8gcHJvcGVyIGxvY2F0aW9uLiAke2RpdlRhcmdldC5zY3JvbGxMZWZ0 fSB2cy4gJHtkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXB9YCk7CisgICAgICAgICAgICBpZiAo c2Nyb2xsaW5nVGFyZ2V0LnNjcm9sbExlZnQgIT0gc2Nyb2xsUG9zaXRpb25CZWZvcmVTbmFwKQor ICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoYGRpdiBkaWQgbm90IHNuYXAgYmFjayB0byBwcm9w ZXIgbG9jYXRpb24uICR7c2Nyb2xsaW5nVGFyZ2V0LnNjcm9sbExlZnR9IHZzLiAke3Njcm9sbFBv c2l0aW9uQmVmb3JlU25hcH1gKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICB0 ZXN0UGFzc2VkKCJkaXYgaG9ub3JlZCBzbmFwIHBvaW50cy4iKTsKIAogICAgICAgICAgICAgZmlu aXNoSlNUZXN0KCk7CiAgICAgICAgIH0KIAotICAgICAgICBmdW5jdGlvbiBzY3JvbGxTbmFwVGVz dCgpIHsKLSAgICAgICAgICAgIC8vIFNlZSB3aGVyZSBvdXIgZGl2IGxpdmVzOgotICAgICAgICAg ICAgcGFnZVNjcm9sbFBvc2l0aW9uQmVmb3JlID0gZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5z Y3JvbGxMZWZ0OworICAgICAgICBmdW5jdGlvbiBzY3JvbGxTbmFwVGVzdCgpCisgICAgICAgIHsK KyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uQmVmb3JlU25hcCA9IHNjcm9sbGluZ1RhcmdldC5z Y3JvbGxMZWZ0OwogCi0gICAgICAgICAgICBkaXZUYXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgndGFyZ2V0Jyk7Ci0gCi0gICAgICAgICAgICBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNu YXAgPSBkaXZUYXJnZXQuc2Nyb2xsTGVmdDsKLQotICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWCA9 IGRpdlRhcmdldC5vZmZzZXRMZWZ0ICsgMjA7Ci0gICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0g ZGl2VGFyZ2V0Lm9mZnNldFRvcCArIDIwOworICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWCA9IHNj cm9sbGluZ1RhcmdldC5vZmZzZXRMZWZ0ICsgMjA7CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NZ ID0gc2Nyb2xsaW5nVGFyZ2V0Lm9mZnNldFRvcCArIDIwOworICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7IC8vIE1ha2Ugc3VyZSB3ZSBhcmUganVzdCBvdXRz aWRlIHRoZSBpRnJhbWUKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRo V2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2JlZ2FuJywgJ25vbmUnKTsKICAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygt MSwgMCwgJ2NoYW5nZWQnLCAnbm9uZScpOwpAQCAtNTgsMjMgKzU1LDI0IEBACiAgICAgICAgICAg ICBldmVudFNlbmRlci5jYWxsQWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoY2hlY2tGb3JTY3JvbGxT bmFwKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsR2xpZGUo KSB7CisgICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsR2xpZGUoKQorICAgICAgICB7CiAg ICAgICAgICAgICAvLyBUaGUgZGl2IHNob3VsZCBoYXZlIHNjcm9sbGVkIChnbGlkZWQpIHRvIHRo ZSBuZXh0IHNuYXAgcG9pbnQuCi0gICAgICAgICAgICBpZiAoZGl2VGFyZ2V0LnNjcm9sbExlZnQg PT0gd2luZG93LmlubmVyV2lkdGgpCisgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nVGFyZ2V0LnNj cm9sbExlZnQgPT0gd2luZG93LmlubmVyV2lkdGgpCiAgICAgICAgICAgICAgICAgdGVzdFBhc3Nl ZCgiZGl2IHNjcm9sbGVkIHRvIG5leHQgd2luZG93LiIpOwogICAgICAgICAgICAgZWxzZQotICAg ICAgICAgICAgICAgIHRlc3RGYWlsZWQoYGRpdiBkaWQgbm90IGhvbm9yIHNuYXAgcG9pbnRzLiAk e2RpdlRhcmdldC5zY3JvbGxMZWZ0fSB2cy4gJHt3aW5kb3cuaW5uZXJXaWR0aH1gKTsKKyAgICAg ICAgICAgICAgICB0ZXN0RmFpbGVkKGBkaXYgZGlkIG5vdCBob25vciBzbmFwIHBvaW50cy4gJHtz Y3JvbGxpbmdUYXJnZXQuc2Nyb2xsTGVmdH0gdnMuICR7d2luZG93LmlubmVyV2lkdGh9YCk7CiAK ICAgICAgICAgICAgIHNldFRpbWVvdXQoc2Nyb2xsU25hcFRlc3QsIDApOwogICAgICAgICB9CiAK LSAgICAgICAgZnVuY3Rpb24gc2Nyb2xsR2xpZGVUZXN0KCkgewotICAgICAgICAgICAgZGl2VGFy Z2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpOwotIAotICAgICAgICAgICAg ZGl2U2Nyb2xsUG9zaXRpb25CZWZvcmVHbGlkZSA9IGRpdlRhcmdldC5zY3JvbGxMZWZ0OworICAg ICAgICBmdW5jdGlvbiBzY3JvbGxHbGlkZVRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBz Y3JvbGxQb3NpdGlvbkJlZm9yZUdsaWRlID0gc2Nyb2xsaW5nVGFyZ2V0LnNjcm9sbExlZnQ7CiAK LSAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSBkaXZUYXJnZXQub2Zmc2V0TGVmdCArIDIwOwot ICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IGRpdlRhcmdldC5vZmZzZXRUb3AgKyAyMDsKKyAg ICAgICAgICAgIHZhciBzdGFydFBvc1ggPSBzY3JvbGxpbmdUYXJnZXQub2Zmc2V0TGVmdCArIDIw OworICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IHNjcm9sbGluZ1RhcmdldC5vZmZzZXRUb3Ag KyAyMDsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAg ICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oc3RhcnRQb3NYLCBzdGFydFBvc1kpOyAv LyBNYWtlIHN1cmUgd2UgYXJlIGp1c3Qgb3V0c2lkZSB0aGUgaUZyYW1lCiAgICAgICAgICAgICBl dmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAs ICdiZWdhbicsICdub25lJyk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5 V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdjaGFuZ2VkJywgJ25vbmUnKTsKQEAg LTg3LDEwICs4NSwxMCBAQAogICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVyU2Nyb2xs aW5nQ29tcGxldGVzKGNoZWNrRm9yU2Nyb2xsR2xpZGUpOwogICAgICAgICB9CiAKLSAgICAgICAg ZnVuY3Rpb24gb25Mb2FkKCkgewotCisgICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgpCisgICAgICAg IHsKKyAgICAgICAgICAgIHNjcm9sbGluZ1RhcmdldCA9IGRvY3VtZW50LnNjcm9sbGluZ0VsZW1l bnQ7CiAgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAg ICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICAgICAgaW50 ZXJuYWxzLnNldFBsYXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxlZChmYWxz ZSk7CiAgICAgICAgICAgICAgICAgc2V0VGltZW91dChzY3JvbGxHbGlkZVRlc3QsIDApOwogICAg ICAgICAgICAgfSBlbHNlIHsKQEAgLTEwOSw3ICsxMDcsNyBAQAogICAgICAgICB9CiAgICAgICAg IDwvc2NyaXB0PgogICAgIDwvaGVhZD4KLSAgICA8Ym9keSBvbmxvYWQ9Im9uTG9hZCgpOyIgY2xh c3M9Imhvcml6b250YWxHYWxsZXJ5IiBpZD0idGFyZ2V0Ij4KKyAgICA8Ym9keSBvbmxvYWQ9Im9u TG9hZCgpOyIgY2xhc3M9Imhvcml6b250YWxHYWxsZXJ5Ij4KICAgICAgICAgPGRpdiBpZD0iaXRl bTAiIGNsYXNzPSJjb2xvckJveCI+PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+PC9kaXY+CiAgICAg ICAgIDxkaXYgaWQ9Iml0ZW0xIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICA8ZGl2 IGlkPSJpdGVtMiIgY2xhc3M9ImNvbG9yQm94Ij48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRh dG9yeS1tYWluZnJhbWUtc2xvdy12ZXJ0aWNhbC5odG1sIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJh d2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1haW5mcmFt ZS1zbG93LXZlcnRpY2FsLmh0bWwKaW5kZXggZTBiZTEzMmQ2OWZjMWM3MzhjZWMxYWM3ZTgwZTUx NDQ5MzUzMDNkNy4uNGEzNjUxN2EyZmJjNzM3MTgyZGQ3NTVmOTM4YTYxMjA1M2ExN2FkMiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAv c2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1haW5mcmFtZS1zbG93LXZlcnRpY2FsLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNu YXAtbWFuZGF0b3J5LW1haW5mcmFtZS1zbG93LXZlcnRpY2FsLmh0bWwKQEAgLTI2LDMwICsyNiwy OSBAQAogICAgICAgICA8c2NyaXB0PgogICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRy dWU7CiAKLSAgICAgICAgdmFyIGRpdlRhcmdldDsKLSAgICAgICAgdmFyIGRpdlNjcm9sbFBvc2l0 aW9uQmVmb3JlR2xpZGU7Ci0gICAgICAgIHZhciBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXA7 CisgICAgICAgIHZhciB0YXJnZXRTY3JvbGxlcjsKKyAgICAgICAgdmFyIHNjcm9sbFBvc2l0aW9u QmVmb3JlR2xpZGU7CisgICAgICAgIHZhciBzY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXA7CiAKLSAg ICAgICAgZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGxTbmFwKCkgeworICAgICAgICBmdW5jdGlvbiBj aGVja0ZvclNjcm9sbFNuYXAoKQorICAgICAgICB7CiAgICAgICAgICAgICAvLyBUaGUgZGl2IHNo b3VsZCBoYXZlIHNuYXBwZWQgYmFjayB0byB0aGUgcHJldmlvdXMgcG9zaXRpb24KLSAgICAgICAg ICAgIGlmIChkaXZUYXJnZXQuc2Nyb2xsVG9wICE9IGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlU25h cCkKLSAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKGBkaXYgZGlkIG5vdCBzbmFwIGJhY2sgdG8g cHJvcGVyIGxvY2F0aW9uLiAoJHtkaXZUYXJnZXQuc2Nyb2xsVG9wfSB2cy4gJHtkaXZTY3JvbGxQ b3NpdGlvbkJlZm9yZVNuYXB9KWApOworICAgICAgICAgICAgaWYgKHRhcmdldFNjcm9sbGVyLnNj cm9sbFRvcCAhPSBzY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXApCisgICAgICAgICAgICAgICAgdGVz dEZhaWxlZChgZGl2IGRpZCBub3Qgc25hcCBiYWNrIHRvIHByb3BlciBsb2NhdGlvbi4gKCR7dGFy Z2V0U2Nyb2xsZXIuc2Nyb2xsVG9wfSB2cy4gJHtzY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXB9KWAp OwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoImRpdiBob25v cmVkIHNuYXAgcG9pbnRzLiIpOwogCiAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKICAgICAg ICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHNjcm9sbFNuYXBUZXN0KCkgeworICAgICAgICBmdW5j dGlvbiBzY3JvbGxTbmFwVGVzdCgpCisgICAgICAgIHsKICAgICAgICAgICAgIC8vIFNlZSB3aGVy ZSBvdXIgZGl2IGxpdmVzOgotICAgICAgICAgICAgcGFnZVNjcm9sbFBvc2l0aW9uQmVmb3JlID0g ZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3A7CisgICAgICAgICAgICBzY3JvbGxQ b3NpdGlvbkJlZm9yZVNuYXAgPSB0YXJnZXRTY3JvbGxlci5zY3JvbGxUb3A7CiAKLSAgICAgICAg ICAgIGRpdlRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0YXJnZXQnKTsKLSAKLSAg ICAgICAgICAgIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlU25hcCA9IGRpdlRhcmdldC5zY3JvbGxU b3A7Ci0KLSAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSBkaXZUYXJnZXQub2Zmc2V0TGVmdCAr IDIwOwotICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IGRpdlRhcmdldC5vZmZzZXRUb3AgKyAy MDsKKyAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSB0YXJnZXRTY3JvbGxlci5vZmZzZXRMZWZ0 ICsgMjA7CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0gdGFyZ2V0U2Nyb2xsZXIub2Zmc2V0 VG9wICsgMjA7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsK ICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9zWCwgc3RhcnRQb3NZ KTsgLy8gTWFrZSBzdXJlIHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlGcmFtZQogICAgICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAs IC0xLCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3Jv bGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0xLCAnY2hhbmdlZCcsICdub25lJyk7 CkBAIC01OCwyMyArNTcsMjQgQEAKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNj cm9sbGluZ0NvbXBsZXRlcyhjaGVja0ZvclNjcm9sbFNuYXApOwogICAgICAgICB9CiAKLSAgICAg ICAgZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGxHbGlkZSgpIHsKKyAgICAgICAgZnVuY3Rpb24gY2hl Y2tGb3JTY3JvbGxHbGlkZSgpCisgICAgICAgIHsKICAgICAgICAgICAgIC8vIFRoZSBkaXYgc2hv dWxkIGhhdmUgc2Nyb2xsZWQgKGdsaWRlZCkgdG8gdGhlIG5leHQgc25hcCBwb2ludC4KLSAgICAg ICAgICAgIGlmIChkaXZUYXJnZXQuc2Nyb2xsVG9wID09IHdpbmRvdy5pbm5lckhlaWdodCkKKyAg ICAgICAgICAgIGlmICh0YXJnZXRTY3JvbGxlci5zY3JvbGxUb3AgPT0gd2luZG93LmlubmVySGVp Z2h0KQogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoImRpdiBzY3JvbGxlZCB0byBuZXh0IHdp bmRvdy4iKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKGBk aXYgZGlkIG5vdCBob25vciBzbmFwIHBvaW50cy4gKCR7ZGl2VGFyZ2V0LnNjcm9sbFRvcH0gdnMu ICR7d2luZG93LmlubmVySGVpZ2h0fSlgKTsKKyAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKGBk aXYgZGlkIG5vdCBob25vciBzbmFwIHBvaW50cy4gKCR7dGFyZ2V0U2Nyb2xsZXIuc2Nyb2xsVG9w fSB2cy4gJHt3aW5kb3cuaW5uZXJIZWlnaHR9KWApOwogCiAgICAgICAgICAgICBzZXRUaW1lb3V0 KHNjcm9sbFNuYXBUZXN0LCAwKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHNjcm9s bEdsaWRlVGVzdCgpIHsKLSAgICAgICAgICAgIGRpdlRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCd0YXJnZXQnKTsKLSAKLSAgICAgICAgICAgIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3Jl R2xpZGUgPSBkaXZUYXJnZXQuc2Nyb2xsVG9wOworICAgICAgICBmdW5jdGlvbiBzY3JvbGxHbGlk ZVRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBzY3JvbGxQb3NpdGlvbkJlZm9yZUdsaWRl ID0gdGFyZ2V0U2Nyb2xsZXIuc2Nyb2xsVG9wOwogCi0gICAgICAgICAgICB2YXIgc3RhcnRQb3NY ID0gZGl2VGFyZ2V0Lm9mZnNldExlZnQgKyAyMDsKLSAgICAgICAgICAgIHZhciBzdGFydFBvc1kg PSBkaXZUYXJnZXQub2Zmc2V0VG9wICsgMjA7CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0g dGFyZ2V0U2Nyb2xsZXIub2Zmc2V0TGVmdCArIDIwOworICAgICAgICAgICAgdmFyIHN0YXJ0UG9z WSA9IHRhcmdldFNjcm9sbGVyLm9mZnNldFRvcCArIDIwOworICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7IC8vIE1ha2Ugc3VyZSB3ZSBhcmUganVzdCBvdXRz aWRlIHRoZSBpRnJhbWUKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRo V2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAtMSwgJ2JlZ2FuJywgJ25vbmUnKTsKICAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygw LCAtMSwgJ2NoYW5nZWQnLCAnbm9uZScpOwpAQCAtODcsOSArODcsMTAgQEAKICAgICAgICAgICAg IGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhjaGVja0ZvclNjcm9sbEds aWRlKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgpIHsKKyAgICAgICAg ZnVuY3Rpb24gb25Mb2FkKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGFyZ2V0U2Nyb2xsZXIg PSBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50OwogICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVu dFNlbmRlcikgewotICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50 cygpOwogICAgICAgICAgICAgICAgIGludGVybmFscy5zZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xs aW5nUHJlZGljdGlvbkVuYWJsZWQoZmFsc2UpOwogICAgICAgICAgICAgICAgIHNldFRpbWVvdXQo c2Nyb2xsR2xpZGVUZXN0LCAwKTsKICAgICAgICAgICAgIH0gZWxzZSB7CkBAIC0xMDgsNyArMTA5 LDcgQEAKICAgICAgICAgfQogICAgICAgICA8L3NjcmlwdD4KICAgICA8L2hlYWQ+Ci0gICAgPGJv ZHkgb25sb2FkPSJvbkxvYWQoKTsiIGNsYXNzPSJ2ZXJ0aWNhbEdhbGxlcnkiIGlkPSJ0YXJnZXQi PgorICAgIDxib2R5IG9ubG9hZD0ib25Mb2FkKCk7IiBjbGFzcz0idmVydGljYWxHYWxsZXJ5Ij4K ICAgICAgICAgPGRpdiBpZD0iaXRlbTAiIGNsYXNzPSJjb2xvckJveCI+PGRpdiBpZD0iY29uc29s ZSI+PC9kaXY+PC9kaXY+CiAgICAgICAgIDxkaXYgaWQ9Iml0ZW0xIiBjbGFzcz0iY29sb3JCb3gi PjwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJpdGVtMiIgY2xhc3M9ImNvbG9yQm94Ij48L2Rpdj4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1z bmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtdmVydGljYWwtdGhlbi1ob3Jpem9u dGFsLmh0bWwgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25h cC9zY3JvbGwtc25hcC1tYW5kYXRvcnktbWFpbmZyYW1lLXZlcnRpY2FsLXRoZW4taG9yaXpvbnRh bC5odG1sCmluZGV4IDFkNDA4NDRkYWRkM2NkMzBjMWQwZGYxZTdhYmVjNmE3YTIxZWFjNzkuLjE5 ZTBjYzA5MWVkMGZkZWYwMTgxYzFhYWIzZDVlODg3NWE1NDQxOTYgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1h bmRhdG9yeS1tYWluZnJhbWUtdmVydGljYWwtdGhlbi1ob3Jpem9udGFsLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAt bWFuZGF0b3J5LW1haW5mcmFtZS12ZXJ0aWNhbC10aGVuLWhvcml6b250YWwuaHRtbApAQCAtMjYs OSArMjYsMTEgQEAKICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgd2luZG93LmpzVGVzdElzQXN5 bmMgPSB0cnVlOwogCi0gICAgICAgIGZ1bmN0aW9uIHNjcm9sbFNuYXBUZXN0KCkgeworICAgICAg ICBmdW5jdGlvbiBzY3JvbGxTbmFwVGVzdCgpCisgICAgICAgIHsKICAgICAgICAgICAgIHZhciBz dGFydFBvc1ggPSBkb2N1bWVudC5ib2R5Lm9mZnNldExlZnQgKyAyMDsKICAgICAgICAgICAgIHZh ciBzdGFydFBvc1kgPSBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcCArIDIwOworICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICBldmVudFNlbmRl ci5tb3VzZU1vdmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7CiAgICAgICAgICAgICBldmVudFNl bmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgLTEsICdiZWdh bicsICdub25lJyk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdo ZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgLTEsICdjaGFuZ2VkJywgJ25vbmUnKTsKQEAgLTQ5LDkg KzUxLDkgQEAKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24g b25Mb2FkKCkgeworICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQorICAgICAgICB7CiAgICAgICAg ICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldFBs YXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxlZChmYWxzZSk7CiAgICAgICAg ICAgICAgICAgc2V0VGltZW91dChzY3JvbGxTbmFwVGVzdCwgMCk7CiAgICAgICAgICAgICB9IGVs c2UgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Ny b2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW1haW5mcmFtZS12ZXJ0aWNhbC5odG1sIGIv TGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNu YXAtbWFuZGF0b3J5LW1haW5mcmFtZS12ZXJ0aWNhbC5odG1sCmluZGV4IDJiN2RhN2RkZDc1MmE1 OTEwMmVhMWI3MTYwYjg3NDk3ZDNiMjYzMmQuLmU3OGFhZDRhZTU5NDBiMjdlYmZlYWI5NjU3MzIx NDM5YjAxMDI0NmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xs aW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1tYWluZnJhbWUtdmVydGljYWwu aHRtbAorKysgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25h cC9zY3JvbGwtc25hcC1tYW5kYXRvcnktbWFpbmZyYW1lLXZlcnRpY2FsLmh0bWwKQEAgLTI2LDMw ICsyNiwyOCBAQAogICAgICAgICA8c2NyaXB0PgogICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3lu YyA9IHRydWU7CiAKLSAgICAgICAgdmFyIGRpdlRhcmdldDsKLSAgICAgICAgdmFyIGRpdlNjcm9s bFBvc2l0aW9uQmVmb3JlR2xpZGU7Ci0gICAgICAgIHZhciBkaXZTY3JvbGxQb3NpdGlvbkJlZm9y ZVNuYXA7CisgICAgICAgIHZhciBzY3JvbGxpbmdUYXJnZXQ7CisgICAgICAgIHZhciBzY3JvbGxQ b3NpdGlvbkJlZm9yZUdsaWRlOworICAgICAgICB2YXIgc2Nyb2xsUG9zaXRpb25CZWZvcmVTbmFw OwogCi0gICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsU25hcCgpIHsKKyAgICAgICAgZnVu Y3Rpb24gY2hlY2tGb3JTY3JvbGxTbmFwKCkKKyAgICAgICAgewogICAgICAgICAgICAgLy8gVGhl IGRpdiBzaG91bGQgaGF2ZSBzbmFwcGVkIGJhY2sgdG8gdGhlIHByZXZpb3VzIHBvc2l0aW9uCi0g ICAgICAgICAgICBpZiAoZGl2VGFyZ2V0LnNjcm9sbFRvcCAhPSBkaXZTY3JvbGxQb3NpdGlvbkJl Zm9yZVNuYXApCi0gICAgICAgICAgICAgICAgdGVzdEZhaWxlZChgZGl2IGRpZCBub3Qgc25hcCBi YWNrIHRvIHByb3BlciBsb2NhdGlvbi4gKCR7ZGl2VGFyZ2V0LnNjcm9sbFRvcH0gdnMuICR7ZGl2 U2Nyb2xsUG9zaXRpb25CZWZvcmVTbmFwfSlgKTsKKyAgICAgICAgICAgIGlmIChzY3JvbGxpbmdU YXJnZXQuc2Nyb2xsVG9wICE9IHNjcm9sbFBvc2l0aW9uQmVmb3JlU25hcCkKKyAgICAgICAgICAg ICAgICB0ZXN0RmFpbGVkKGBkaXYgZGlkIG5vdCBzbmFwIGJhY2sgdG8gcHJvcGVyIGxvY2F0aW9u LiAoJHtzY3JvbGxpbmdUYXJnZXQuc2Nyb2xsVG9wfSB2cy4gJHtzY3JvbGxQb3NpdGlvbkJlZm9y ZVNuYXB9KWApOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQo ImRpdiBob25vcmVkIHNuYXAgcG9pbnRzLiIpOwogCiAgICAgICAgICAgICBmaW5pc2hKU1Rlc3Qo KTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHNjcm9sbFNuYXBUZXN0KCkgewotICAg ICAgICAgICAgLy8gU2VlIHdoZXJlIG91ciBkaXYgbGl2ZXM6Ci0gICAgICAgICAgICBwYWdlU2Ny b2xsUG9zaXRpb25CZWZvcmUgPSBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbFRvcDsK KyAgICAgICAgZnVuY3Rpb24gc2Nyb2xsU25hcFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAg ICBzY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXAgPSBzY3JvbGxpbmdUYXJnZXQuc2Nyb2xsVG9wOwog Ci0gICAgICAgICAgICBkaXZUYXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGFyZ2V0 Jyk7Ci0gCi0gICAgICAgICAgICBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXAgPSBkaXZUYXJn ZXQuc2Nyb2xsVG9wOwotCi0gICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gZGl2VGFyZ2V0Lm9m ZnNldExlZnQgKyAyMDsKLSAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSBkaXZUYXJnZXQub2Zm c2V0VG9wICsgMjA7CisgICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gc2Nyb2xsaW5nVGFyZ2V0 Lm9mZnNldExlZnQgKyAyMDsKKyAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSBzY3JvbGxpbmdU YXJnZXQub2Zmc2V0VG9wICsgMjA7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hl ZWxFdmVudHMoKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9z WCwgc3RhcnRQb3NZKTsgLy8gTWFrZSBzdXJlIHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlGcmFt ZQogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVu dHVtUGhhc2VzKDAsIC0xLCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0xLCAnY2hhbmdl ZCcsICdub25lJyk7CkBAIC01OCwyMyArNTYsMjQgQEAKICAgICAgICAgICAgIGV2ZW50U2VuZGVy LmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhjaGVja0ZvclNjcm9sbFNuYXApOwogICAgICAg ICB9CiAKLSAgICAgICAgZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGxHbGlkZSgpIHsKKyAgICAgICAg ZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGxHbGlkZSgpCisgICAgICAgIHsKICAgICAgICAgICAgIC8v IFRoZSBkaXYgc2hvdWxkIGhhdmUgc2Nyb2xsZWQgKGdsaWRlZCkgdG8gdGhlIG5leHQgc25hcCBw b2ludC4KLSAgICAgICAgICAgIGlmIChkaXZUYXJnZXQuc2Nyb2xsVG9wID09IHdpbmRvdy5pbm5l ckhlaWdodCkKKyAgICAgICAgICAgIGlmIChzY3JvbGxpbmdUYXJnZXQuc2Nyb2xsVG9wID09IHdp bmRvdy5pbm5lckhlaWdodCkKICAgICAgICAgICAgICAgICB0ZXN0UGFzc2VkKCJkaXYgc2Nyb2xs ZWQgdG8gbmV4dCB3aW5kb3cuIik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAg dGVzdEZhaWxlZChgZGl2IGRpZCBub3QgaG9ub3Igc25hcCBwb2ludHMuICgke2RpdlRhcmdldC5z Y3JvbGxUb3B9IHZzLiAke3dpbmRvdy5pbm5lckhlaWdodH0pYCk7CisgICAgICAgICAgICAgICAg dGVzdEZhaWxlZChgZGl2IGRpZCBub3QgaG9ub3Igc25hcCBwb2ludHMuICgke3Njcm9sbGluZ1Rh cmdldC5zY3JvbGxUb3B9IHZzLiAke3dpbmRvdy5pbm5lckhlaWdodH0pYCk7CiAKICAgICAgICAg ICAgIHNldFRpbWVvdXQoc2Nyb2xsU25hcFRlc3QsIDApOwogICAgICAgICB9CiAKLSAgICAgICAg ZnVuY3Rpb24gc2Nyb2xsR2xpZGVUZXN0KCkgewotICAgICAgICAgICAgZGl2VGFyZ2V0ID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpOwotIAotICAgICAgICAgICAgZGl2U2Nyb2xs UG9zaXRpb25CZWZvcmVHbGlkZSA9IGRpdlRhcmdldC5zY3JvbGxUb3A7CisgICAgICAgIGZ1bmN0 aW9uIHNjcm9sbEdsaWRlVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0 aW9uQmVmb3JlR2xpZGUgPSBzY3JvbGxpbmdUYXJnZXQuc2Nyb2xsVG9wOwogCi0gICAgICAgICAg ICB2YXIgc3RhcnRQb3NYID0gZGl2VGFyZ2V0Lm9mZnNldExlZnQgKyAyMDsKLSAgICAgICAgICAg IHZhciBzdGFydFBvc1kgPSBkaXZUYXJnZXQub2Zmc2V0VG9wICsgMjA7CisgICAgICAgICAgICB2 YXIgc3RhcnRQb3NYID0gc2Nyb2xsaW5nVGFyZ2V0Lm9mZnNldExlZnQgKyAyMDsKKyAgICAgICAg ICAgIHZhciBzdGFydFBvc1kgPSBzY3JvbGxpbmdUYXJnZXQub2Zmc2V0VG9wICsgMjA7CisgICAg ICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9zWCwgc3RhcnRQb3NZKTsgLy8gTWFrZSBzdXJl IHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlGcmFtZQogICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0xLCAnYmVnYW4nLCAn bm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFu ZE1vbWVudHVtUGhhc2VzKDAsIC0xLCAnY2hhbmdlZCcsICdub25lJyk7CkBAIC04NywxMCArODYs MTAgQEAKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRl cyhjaGVja0ZvclNjcm9sbEdsaWRlKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIG9u TG9hZCgpIHsKLQorICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQorICAgICAgICB7CisgICAgICAg ICAgICBzY3JvbGxpbmdUYXJnZXQgPSBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50OwogICAgICAg ICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewotICAgICAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICAgICAgICAgIGludGVybmFscy5zZXRQ bGF0Zm9ybU1vbWVudHVtU2Nyb2xsaW5nUHJlZGljdGlvbkVuYWJsZWQoZmFsc2UpOwogICAgICAg ICAgICAgICAgIHNldFRpbWVvdXQoc2Nyb2xsR2xpZGVUZXN0LCAwKTsKICAgICAgICAgICAgIH0g ZWxzZSB7CkBAIC0xMDksNyArMTA4LDcgQEAKICAgICAgICAgfQogICAgICAgICA8L3NjcmlwdD4K ICAgICA8L2hlYWQ+Ci0gICAgPGJvZHkgb25sb2FkPSJvbkxvYWQoKTsiIGNsYXNzPSJ2ZXJ0aWNh bEdhbGxlcnkiIGlkPSJ0YXJnZXQiPgorICAgIDxib2R5IG9ubG9hZD0ib25Mb2FkKCk7IiBjbGFz cz0idmVydGljYWxHYWxsZXJ5Ij4KICAgICAgICAgPGRpdiBpZD0iaXRlbTAiIGNsYXNzPSJjb2xv ckJveCI+PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+PC9kaXY+CiAgICAgICAgIDxkaXYgaWQ9Iml0 ZW0xIiBjbGFzcz0iY29sb3JCb3giPjwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJpdGVtMiIgY2xh c3M9ImNvbG9yQm94Ij48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdp bmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1vdmVyZmxvdy5o dG1sIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Ny b2xsLXNuYXAtbWFuZGF0b3J5LW92ZXJmbG93Lmh0bWwKaW5kZXggZjczMmYzYTlkMmU5MjMxODU3 ZWRlZTA5NWY1NzQxZTE0OWI2MzdkMy4uZDkyOWI5NjQwNjAwYzliNjdkYzQyYTRhYmI4M2U2YjI4 M2UzYjZlZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcv c2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LW92ZXJmbG93Lmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAt bWFuZGF0b3J5LW92ZXJmbG93Lmh0bWwKQEAgLTEwNCw2ICsxMDQsNyBAQAogCiAgICAgICAgICAg ICB2YXIgc3RhcnRQb3NYID0gd2luZG93UG9zaXRpb24ueCArIDAuNSAqIGRpdlRhcmdldC5jbGll bnRXaWR0aDsKICAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSB3aW5kb3dQb3NpdGlvbi55ICsg MC41ICogZGl2VGFyZ2V0LmNsaWVudEhlaWdodDsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v bml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8o c3RhcnRQb3NYLCBzdGFydFBvc1kpOyAvLyBNYWtlIHN1cmUgd2UgYXJlIGp1c3Qgb3V0c2lkZSB0 aGUgaUZyYW1lCiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoZHgsIGR5LCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4LCBk eSwgJ2NoYW5nZWQnLCAnbm9uZScpOwpAQCAtMTUxLDYgKzE1Miw3IEBACiAKICAgICAgICAgICAg IHZhciBzdGFydFBvc1ggPSB3aW5kb3dQb3NpdGlvbi54ICsgMC41ICogZGl2VGFyZ2V0LmNsaWVu dFdpZHRoOwogICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IHdpbmRvd1Bvc2l0aW9uLnkgKyAw LjUgKiBkaXZUYXJnZXQuY2xpZW50SGVpZ2h0OworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9u aXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhz dGFydFBvc1gsIHN0YXJ0UG9zWSk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9s bEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoZHgsIGR5LCAnYmVnYW4nLCAnbm9uZScpOwog ICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVt UGhhc2VzKGR4LCBkeSwgJ2NoYW5nZWQnLCAnbm9uZScpOwpAQCAtMTY2LDcgKzE2OCw2IEBACiAg ICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh3aW5k b3cuZXZlbnRTZW5kZXIpIHsKLSAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hl ZWxFdmVudHMoKTsKICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1Nb21lbnR1 bVNjcm9sbGluZ1ByZWRpY3Rpb25FbmFibGVkKGZhbHNlKTsKICAgICAgICAgICAgICAgICBzZXRU aW1lb3V0KGZ1bmN0aW9uKCkgeyBzY3JvbGxHbGlkZVRlc3QoJ2hvcml6b250YWxUYXJnZXQnKSB9 LCAwKTsKICAgICAgICAgICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxl ZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktcGFk ZGluZy5odG1sIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNu YXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5LXBhZGRpbmcuaHRtbAppbmRleCA1ZGJjMWNmMDBhNzE4 NTRmNzJmZWQ5MTVkMWU0OGZjMDE0N2E4NTM2Li5lZTU5NGEyZGVmNGJlZDg1N2I3MWIwYWUzYTgy MzlhN2UyODA4NmU5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9s bGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktcGFkZGluZy5odG1sCisrKyBi L0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1z bmFwLW1hbmRhdG9yeS1wYWRkaW5nLmh0bWwKQEAgLTExMiw2ICsxMTIsNyBAQAogCiAgICAgICAg ICAgICB2YXIgc3RhcnRQb3NYID0gd2luZG93UG9zaXRpb24ueCArIDAuNSAqIGRpdlRhcmdldC5j bGllbnRXaWR0aDsKICAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSB3aW5kb3dQb3NpdGlvbi55 ICsgMC41ICogZGl2VGFyZ2V0LmNsaWVudEhlaWdodDsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVy Lm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8oc3RhcnRQb3NYLCBzdGFydFBvc1kpOyAvLyBNYWtlIHN1cmUgd2UgYXJlIGp1c3Qgb3V0c2lk ZSB0aGUgaUZyYW1lCiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdo ZWVsQW5kTW9tZW50dW1QaGFzZXMoZHgsIGR5LCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4 LCBkeSwgJ2NoYW5nZWQnLCAnbm9uZScpOwpAQCAtMTYxLDYgKzE2Miw3IEBACiAKICAgICAgICAg ICAgIHZhciBzdGFydFBvc1ggPSB3aW5kb3dQb3NpdGlvbi54ICsgZGl2VGFyZ2V0LmNsaWVudFdp ZHRoIC0gMTA7CiAgICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0gd2luZG93UG9zaXRpb24ueSAr IDUwOworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAg ICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7CiAg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1Q aGFzZXMoZHgsIGR5LCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4LCBkeSwgJ2NoYW5nZWQn LCAnbm9uZScpOwpAQCAtMTc2LDcgKzE3OCw2IEBACiAgICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgp CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKLSAgICAg ICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAgICAgICAg ICAgICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1Nb21lbnR1bVNjcm9sbGluZ1ByZWRpY3Rpb25FbmFi bGVkKGZhbHNlKTsKICAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBzY3Jv bGxHbGlkZVRlc3QoJ2hvcml6b250YWxUYXJnZXQnKSB9LCAwKTsKICAgICAgICAgICAgIH0gZWxz ZSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3Jv bGwtc25hcC9zY3JvbGwtc25hcC1tYW5kYXRvcnktcm90YXRlZC5odG1sIGIvTGF5b3V0VGVzdHMv dGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbWFuZGF0b3J5 LXJvdGF0ZWQuaHRtbAppbmRleCBjNGVlOTQ3MzhhODAyYWNmZGYzMmIxZjgyNDc3N2U1M2U3Mjdm N2FjLi42ZDQ3NDJjYmE5Njg5YjU1NDMxMzAyYzhlMDNhZmZhNGRkZTI0NDEzIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwt c25hcC1tYW5kYXRvcnktcm90YXRlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdp bmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1hbmRhdG9yeS1yb3RhdGVkLmh0 bWwKQEAgLTEwNiw2ICsxMDYsNyBAQAogCiAgICAgICAgICAgICB2YXIgc3RhcnRQb3NYID0gd2lu ZG93UG9zaXRpb24ueCArIDAuNSAqIGRpdlRhcmdldC5jbGllbnRXaWR0aDsKICAgICAgICAgICAg IHZhciBzdGFydFBvc1kgPSB3aW5kb3dQb3NpdGlvbi55ICsgMC41ICogZGl2VGFyZ2V0LmNsaWVu dEhlaWdodDsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwog ICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oc3RhcnRQb3NYLCBzdGFydFBvc1kp OyAvLyBNYWtlIHN1cmUgd2UgYXJlIGp1c3Qgb3V0c2lkZSB0aGUgaUZyYW1lCiAgICAgICAgICAg ICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoZHgs IGR5LCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3Jv bGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4LCBkeSwgJ2NoYW5nZWQnLCAnbm9uZScp OwpAQCAtMTUzLDYgKzE1NCw3IEBACiAKICAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSB3aW5k b3dQb3NpdGlvbi54ICsgMC41ICogZGl2VGFyZ2V0LmNsaWVudFdpZHRoOwogICAgICAgICAgICAg dmFyIHN0YXJ0UG9zWSA9IHdpbmRvd1Bvc2l0aW9uLnkgKyAwLjUgKiBkaXZUYXJnZXQuY2xpZW50 SGVpZ2h0OworICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhzdGFydFBvc1gsIHN0YXJ0UG9zWSk7 CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50 dW1QaGFzZXMoZHgsIGR5LCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKGR4LCBkeSwgJ2NoYW5n ZWQnLCAnbm9uZScpOwpAQCAtMTY4LDcgKzE3MCw2IEBACiAgICAgICAgIGZ1bmN0aW9uIG9uTG9h ZCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKLSAg ICAgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAgICAg ICAgICAgICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1Nb21lbnR1bVNjcm9sbGluZ1ByZWRpY3Rpb25F bmFibGVkKGZhbHNlKTsKICAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBz Y3JvbGxHbGlkZVRlc3QoJ2hvcml6b250YWxUYXJnZXQnKSB9LCAwKTsKICAgICAgICAgICAgIH0g ZWxzZSB7Cg==