199058 2019-06-19 23:03:24 -0700 `webkit-patch upload -g` uploaded patches to the wrong bug 2019-06-19 23:25:01 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 1 dean_johnson webkit-unassigned ap jbedard oldest_to_newest 1546434 0 372536 dean_johnson 2019-06-19 23:03:24 -0700 Created attachment 372536 Incorrect upload for `webkit upload-patch -g HEAD~2` I had three commits locally I was working on in sequence, and wanted to upload them to separate bugs. I used the commands: ➜ perf.webkit.org git:(summary-page-improvements) webkit-patch upload -g HEAD~2 Total errors found: 0 in 2 files Was that diff correct? [Y/n]: Logging in as dean_johnson@apple.com... Fetching: https://bugs.webkit.org/show_bug.cgi?id=199054&ctype=xml&excludefield=attachmentdata Fetching: https://bugs.webkit.org/show_bug.cgi?id=199054&ctype=xml&excludefield=attachmentdata Assigning bug 199054 to dean_johnson@apple.com Adding patch "Patch" to https://bugs.webkit.org/show_bug.cgi?id=199054 ChangeLog for that commit attached as 'incorrect-upload-HEAD~2.diff`. That should have gone to https://bugs.webkit.org/show_bug.cgi?id=199050. Next, the same thing happened with HEAD~1: ➜ perf.webkit.org git:(summary-page-improvements) webkit-patch upload -g HEAD~1 Total errors found: 0 in 8 files Was that diff correct? [Y/n]: Logging in as dean_johnson@apple.com... Fetching: https://bugs.webkit.org/show_bug.cgi?id=199054&ctype=xml&excludefield=attachmentdata Obsoleting 1 old patch on bug 199054 Obsoleting attachment: 372534 Fetching: https://bugs.webkit.org/show_bug.cgi?id=199054&ctype=xml&excludefield=attachmentdata Adding patch "Patch" to https://bugs.webkit.org/show_bug.cgi?id=199054 ChangeLog for that commit attached as 'incorrect-upload-HEAD~1.diff` That should have gone to https://bugs.webkit.org/show_bug.cgi?id=199051. 1546435 1 372537 dean_johnson 2019-06-19 23:03:52 -0700 Created attachment 372537 Incorrect upload for `webkit upload-patch -g HEAD~1` 1546439 2 dean_johnson 2019-06-19 23:07:58 -0700 Also failing using `webkit-patch upload -g 7df5f9b5a5e730baacf91b9385a321ee3c1b808d` which corresponds to HEAD~2. 372536 2019-06-19 23:03:24 -0700 2019-06-19 23:03:24 -0700 Incorrect upload for `webkit upload-patch -g HEAD~2` incorrect-upload-HEAD~2.diff text/plain 4412 dean_johnson Y29tbWl0IDdkZjVmOWI1YTVlNzMwYmFhY2Y5MWI5Mzg1YTMyMWVlM2MxYjgwOGQKQXV0aG9yOiBE ZWFuIEpvaG5zb24gPGRlYW5fam9obnNvbkBhcHBsZS5jb20+CkRhdGU6ICAgV2VkIEp1biAxOSAy MjozNjo1OSAyMDE5IC0wNzAwCgogICAgW3BlcmYud2Via2l0Lm9yZ10gVXBkYXRlIHN1bW1hcnkg cGFnZSBjYWxjdWxhdGlvbnMgdG8gdXNlIG1lYW4gaW5zdGVhZCBvZiBtZWRpYW4KICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkwNTAKICAgIAogICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICogcHVibGljL3YzL3BhZ2VzL3N1bW1hcnkt cGFnZS5qczoKICAgIChTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cCk6IFVwZGF0ZWQgJ21l ZGlhbicgcmVmZXJlbmNlcyB0byAnbWVhbicuCiAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9u R3JvdXAuc2V0IF9zdGFydEFuZEVuZFBvaW50Rm9yVGltZVJhbmdlKTogRmFjdG9yZWQgb3V0IGxv Z2ljIGZvciBmaW5kaW5nIGRhdGEKICAgIHBvaW50cyBpbiBhIHRpbWVTZXJpZXMsIHdpdGhpbiBh IHNwZWNpZmllZCB0aW1lUmFuZ2UuCiAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAu c2V0IF9tZWFuRm9yVGltZVJhbmdlKTogTmV3LiBTYW1lIGFzIF9tZWRpYW5Gb3JUaW1lUmFhbmdl LCBidXQgdXNlcwogICAgU3RhdGlzdGljcy5tZWFuLgogICAgKFN1bW1hcnlQYWdlQ29uZmlndXJh dGlvbkdyb3VwLnNldCBfbWVkaWFuRm9yVGltZVJhbmdlKToKCmRpZmYgLS1naXQgYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0No YW5nZUxvZwppbmRleCA4NWVmNDExNDJlZS4uYTA4YzBjY2E5ZWYgMTAwNjQ0Ci0tLSBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTE5ICBEZWFuIEpvaG5zb24g IDxkZWFuX2pvaG5zb25AYXBwbGUuY29tPgorCisgICAgICAgIFtwZXJmLndlYmtpdC5vcmddIFVw ZGF0ZSBzdW1tYXJ5IHBhZ2UgY2FsY3VsYXRpb25zIHRvIHVzZSBtZWFuIGluc3RlYWQgb2YgbWVk aWFuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkw NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1 YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanM6CisgICAgICAgIChTdW1tYXJ5UGFnZUNvbmZp Z3VyYXRpb25Hcm91cCk6IFVwZGF0ZWQgJ21lZGlhbicgcmVmZXJlbmNlcyB0byAnbWVhbicuCisg ICAgICAgIChTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5zZXQgX3N0YXJ0QW5kRW5kUG9p bnRGb3JUaW1lUmFuZ2UpOiBGYWN0b3JlZCBvdXQgbG9naWMgZm9yIGZpbmRpbmcgZGF0YQorICAg ICAgICBwb2ludHMgaW4gYSB0aW1lU2VyaWVzLCB3aXRoaW4gYSBzcGVjaWZpZWQgdGltZVJhbmdl LgorICAgICAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuc2V0IF9tZWFuRm9yVGlt ZVJhbmdlKTogTmV3LiBTYW1lIGFzIF9tZWRpYW5Gb3JUaW1lUmFhbmdlLCBidXQgdXNlcworICAg ICAgICBTdGF0aXN0aWNzLm1lYW4uCisgICAgICAgIChTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25H cm91cC5zZXQgX21lZGlhbkZvclRpbWVSYW5nZSk6CisKIDIwMTktMDYtMTcgIERld2VpIFpodSAg PGRld2VpX3podUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3VzdG9taXphYmxlIHRlc3QgZ3JvdXAg Zm9ybSBzaG91bGQgYWxsb3cgdXNlciB0byBzdXBwbHkgYSByZXZpc2lvbiBwcmVmaXggb2YgYSBj b21taXQgYW5kIHJldmlzaW9uIHN0YXJ0cyB3aXRoICdyJy4KZGlmZiAtLWdpdCBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMKaW5kZXgg MDVjNjAxMzE0ZTEuLjA4OWVkOTgyZDdiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcworKysgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcwpAQCAtMzQ2LDIxICsz NDYsMjEgQEAgY2xhc3MgU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAgewogICAgICAgICAg ICAgdmFyIGJhc2VsaW5lVGltZVNlcmllcyA9IHNldC5mZXRjaGVkVGltZVNlcmllcygnYmFzZWxp bmUnLCBmYWxzZSwgZmFsc2UpOwogICAgICAgICAgICAgdmFyIGN1cnJlbnRUaW1lU2VyaWVzID0g c2V0LmZldGNoZWRUaW1lU2VyaWVzKCdjdXJyZW50JywgZmFsc2UsIGZhbHNlKTsKIAotICAgICAg ICAgICAgdmFyIGJhc2VsaW5lTWVkaWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAu X21lZGlhbkZvclRpbWVSYW5nZShiYXNlbGluZVRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7Ci0gICAg ICAgICAgICB2YXIgY3VycmVudE1lZGlhbiA9IFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3Vw Ll9tZWRpYW5Gb3JUaW1lUmFuZ2UoY3VycmVudFRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CisgICAg ICAgICAgICB2YXIgYmFzZWxpbmVNZWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAu X21lYW5Gb3JUaW1lUmFuZ2UoYmFzZWxpbmVUaW1lU2VyaWVzLCB0aW1lUmFuZ2UpOworICAgICAg ICAgICAgdmFyIGN1cnJlbnRNZWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX21l YW5Gb3JUaW1lUmFuZ2UoY3VycmVudFRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CiAgICAgICAgICAg ICB2YXIgcGxhdGZvcm0gPSBQbGF0Zm9ybS5maW5kQnlJZChzZXQucGxhdGZvcm1JZCgpKTsKLSAg ICAgICAgICAgIGlmICghY3VycmVudE1lZGlhbikKKyAgICAgICAgICAgIGlmICghY3VycmVudE1l YW4pCiAgICAgICAgICAgICAgICAgc2VsZi5fbWlzc2luZ1BsYXRmb3Jtcy5hZGQocGxhdGZvcm0p OwotICAgICAgICAgICAgZWxzZSBpZiAoIWJhc2VsaW5lTWVkaWFuKQorICAgICAgICAgICAgZWxz ZSBpZiAoIWJhc2VsaW5lTWVhbikKICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybXNXaXRo b3V0QmFzZWxpbmUuYWRkKHBsYXRmb3JtKTsKIAotICAgICAgICAgICAgc2V0VG9SYXRpby5zZXQo c2V0LCBjdXJyZW50TWVkaWFuIC8gYmFzZWxpbmVNZWRpYW4pOworICAgICAgICAgICAgc2V0VG9S YXRpby5zZXQoc2V0LCBjdXJyZW50TWVhbiAvIGJhc2VsaW5lTWVhbik7CiAgICAgICAgIH0pLmNh dGNoKGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIHNldFRvUmF0aW8uc2V0KHNldCwgTmFOKTsK ICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgc3RhdGljIF9tZWRpYW5Gb3JUaW1lUmFuZ2UodGlt ZVNlcmllcywgdGltZVJhbmdlKQorICAgIHN0YXRpYyBfc3RhcnRBbmRFbmRQb2ludEZvclRpbWVS YW5nZSh0aW1lU2VyaWVzLCB0aW1lUmFuZ2UpCiAgICAgewogICAgICAgICBpZiAoIXRpbWVTZXJp ZXMuZmlyc3RQb2ludCgpKQogICAgICAgICAgICAgcmV0dXJuIE5hTjsKQEAgLTM3MSw2ICszNzEs MTggQEAgY2xhc3MgU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAgewogICAgICAgICBpZiAo IWVuZFBvaW50IHx8IHN0YXJ0UG9pbnQgPT0gYWZ0ZXJFbmRQb2ludCkKICAgICAgICAgICAgIGVu ZFBvaW50ID0gYWZ0ZXJFbmRQb2ludDsKIAorICAgICAgICByZXR1cm4gW3N0YXJ0UG9pbnQsIGVu ZFBvaW50XTsKKyAgICB9CisKKyAgICBzdGF0aWMgX21lZGlhbkZvclRpbWVSYW5nZSh0aW1lU2Vy aWVzLCB0aW1lUmFuZ2UpCisgICAgeworICAgICAgICB2YXIgW3N0YXJ0UG9pbnQsIGVuZFBvaW50 XSA9IFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLl9zdGFydEFuZEVuZFBvaW50Rm9yVGlt ZVJhbmdlKHRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CiAgICAgICAgIHJldHVybiBTdGF0aXN0aWNz Lm1lZGlhbih0aW1lU2VyaWVzLnZpZXdCZXR3ZWVuUG9pbnRzKHN0YXJ0UG9pbnQsIGVuZFBvaW50 KS52YWx1ZXMoKSk7CiAgICAgfQorCisgICAgc3RhdGljIF9tZWFuRm9yVGltZVJhbmdlKHRpbWVT ZXJpZXMsIHRpbWVSYW5nZSkKKyAgICB7CisgICAgICAgIHZhciBbc3RhcnRQb2ludCwgZW5kUG9p bnRdID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX3N0YXJ0QW5kRW5kUG9pbnRGb3JU aW1lUmFuZ2UodGltZVNlcmllcywgdGltZVJhbmdlKTsKKyAgICAgICAgcmV0dXJuIFN0YXRpc3Rp Y3MubWVhbih0aW1lU2VyaWVzLnZpZXdCZXR3ZWVuUG9pbnRzKHN0YXJ0UG9pbnQsIGVuZFBvaW50 KS52YWx1ZXMoKSk7CisgICAgfQogfQo= 372537 2019-06-19 23:03:52 -0700 2019-06-19 23:03:52 -0700 Incorrect upload for `webkit upload-patch -g HEAD~1` incorrect-upload-HEAD~1.diff text/plain 28743 dean_johnson Y29tbWl0IGQ2YTIxNGE3ODQ1NjQ1MmY3NTI1YjdhYzA2NWQ2ODk3ZThmZWZhZmIKQXV0aG9yOiBE ZWFuIEpvaG5zb24gPGRlYW5fam9obnNvbkBhcHBsZS5jb20+CkRhdGU6ICAgV2VkIEp1biAxOSAy Mjo0NDoxMCAyMDE5IC0wNzAwCgogICAgW3BlcmYud2Via2l0Lm9yZ10gQWRkICdiYWNrIGluIHRp bWUnIGZlYXR1cmUgZm9yIFN1bW1hcnkgcGFnZXMKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTkwNTEKICAgIAogICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCiAgICAKICAgIFRoaXMgYWRkcyBhICJCYWNrIGluIHRpbWUiIGZlYXR1cmUgZm9yIGFsbCBT dW1tYXJ5IHBhZ2VzIG9uIHRoZSBXZWJLaXQgUGVyZiBkYXNoYm9hcmQuIFRoZXJlIGlzIGEgbmV3 CiAgICBzbGlkZXIgaW4gdGhlIHRvcCByaWdodCBjb3JuZXIgd2hpY2ggY2FuIGJlIGRyYWdnZWQg dG8gdmlldyB0aGUgc3VtbWFyeSBwYWdlICdOIGRheXMgYWdvJy4gVGhlIGRlZmF1bHQgdmlldwog ICAgaXMgdGhlIHNhbWUgYXMgYmVmb3JlLgogICAgCiAgICAqIHB1YmxpYy92My9pbmRleC5odG1s OiBBZGQgbmV3IHJlc291cmNlczogc2xpZGVyLXRvb2xiYXIuanMsIHN1bW1hcnktdG9vbGJhci5q cy4KICAgICogcHVibGljL3YzL21haW4uanM6IEFkZCBuZXcgc3VtbWFyeVRvb2xiYXIsIGFuZCBp bml0aWFsaXplIHN1bW1hcnkgcGFnZXMgd2l0aCBpdC4KICAgIChtYWluKToKICAgICogcHVibGlj L3YzL3BhZ2VzL2NoYXJ0cy10b29sYmFyLmpzOiBBYnN0cmFjdCB0aGUgc2xpZGVyIHRvb2xiYXIg aW50byBhIG5ldyBjbGFzcywgYW5kIGluaGVyaXQgZnJvbSBpdC4KICAgIChDaGFydHNUb29sYmFy KTogTm93LCBDaGFydHNUb29sYmFyIGlzIGEgbW9zdGx5IHRoaW4gd3JhcHBlciByb3VuZCBTbGlk ZXJUb29sYmFyIGFuZCBpbXBsZW1lbnRzIHRoZSAnQWRkIFBhbmUnCiAgICBidXR0b24gKyBmdW5j dGlvbmFsaXR5LgogICAgKENoYXJ0c1Rvb2xiYXIucHJvdG90eXBlLnJlbmRlcik6CiAgICAoQ2hh cnRzVG9vbGJhci5jc3NUZW1wbGF0ZSk6CiAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5cGUuc2V0 TnVtYmVyT2ZEYXlzQ2FsbGJhY2spOiBEZWxldGVkLgogICAgKENoYXJ0c1Rvb2xiYXIucHJvdG90 eXBlLnNldFN0YXJ0VGltZSk6IERlbGV0ZWQuCiAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5cGUu X3NldElucHV0RWxlbWVudFZhbHVlKTogRGVsZXRlZC4KICAgIChDaGFydHNUb29sYmFyLnByb3Rv dHlwZS5fZW50ZXJUZXh0TW9kZSk6IERlbGV0ZWQuCiAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5 cGUuX2V4aXRUZXh0TW9kZSk6IERlbGV0ZWQuCiAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5cGUu X3NsaWRlclZhbHVlTWF5SGF2ZUNoYW5nZWQpOiBEZWxldGVkLgogICAgKENoYXJ0c1Rvb2xiYXIu cHJvdG90eXBlLl9lZGl0b3JWYWx1ZU1heUhhdmVDaGFuZ2VkKTogRGVsZXRlZC4KICAgIChDaGFy dHNUb29sYmFyLnByb3RvdHlwZS5fY2FsbE51bWJlck9mRGF5c0NhbGxiYWNrKTogRGVsZXRlZC4K ICAgIChDaGFydHNUb29sYmFyLmh0bWxUZW1wbGF0ZSk6IFdyYXAgU2lsZGVyVG9vbGJhcidzIGh0 bWxUZW1wbGF0ZSB3aXRoIGEgbmF2IGFuZCBlbWJlZCB0aGUgJ0FkZCBQYW5lJyBidXR0b24uCiAg ICAqIHB1YmxpYy92My9wYWdlcy9kb21haW4tY29udHJvbC10b29sYmFyLmpzOgogICAgKERvbWFp bkNvbnRyb2xUb29sYmFyLnByb3RvdHlwZS5zZXRTdGFydFRpbWUpOiBVcGRhdGVkIHRvIHN1cHBv cnQgYSB2YWx1ZSBvZiAwIGZvciBudW1iZXJPZkRheXMuCiAgICAoRG9tYWluQ29udHJvbFRvb2xi YXIucHJvdG90eXBlLnNldE51bWJlck9mRGF5cyk6IERpdHRvLgogICAgKERvbWFpbkNvbnRyb2xU b29sYmFyKToKICAgICogcHVibGljL3YzL3BhZ2VzL3NsaWRlci10b29sYmFyLmpzOiBDb3BpZWQg ZnJvbSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2NoYXJ0cy10b29s YmFyLmpzLgogICAgKFNsaWRlclRvb2xiYXIpOiBDb3BpZWQgZnJvbSBjaGFydHMtdG9vbGJhci5q czsgQWRkZWQgX2RlZmF1bHROdW1iZXJPZkRheXMgd2hlbiBpbnZva2luZyBjb25zdHJ1Y3RvciBh bmQKICAgIHJlbW92ZWQgJ0FkZCBQYW5lJyBsb2dpYy4KICAgIChTbGlkZXJUb29sYmFyLnByb3Rv dHlwZS5yZW5kZXIpOiBNb3ZlZCBmcm9tIGNoYXJ0cy10b29sYmFyLmpzLgogICAgKFNsaWRlclRv b2xiYXIucHJvdG90eXBlLnNldE51bWJlck9mRGF5c0NhbGxiYWNrKTogRGl0dG8uCiAgICAoU2xp ZGVyVG9vbGJhci5wcm90b3R5cGUuc2V0U3RhcnRUaW1lKTogRGl0dG8sIGJ1dCB1cGRhdGVkIHRv IHVzZSBfZGVmYXVsdE51bWJlck9mRGF5cy4KICAgIChTbGlkZXJUb29sYmFyLnByb3RvdHlwZS5f c2V0SW5wdXRFbGVtZW50VmFsdWUpOiBEaXR0by4KICAgIChTbGlkZXJUb29sYmFyLnByb3RvdHlw ZS5fZW50ZXJUZXh0TW9kZSk6IERpdHRvLgogICAgKFNsaWRlclRvb2xiYXIucHJvdG90eXBlLl9l eGl0VGV4dE1vZGUpOiBEaXR0by4KICAgIChTbGlkZXJUb29sYmFyLnByb3RvdHlwZS5fc2xpZGVy VmFsdWVNYXlIYXZlQ2hhbmdlZCk6IERpdHRvLgogICAgKFNsaWRlclRvb2xiYXIucHJvdG90eXBl Ll9lZGl0b3JWYWx1ZU1heUhhdmVDaGFuZ2VkKTogRGl0dG8uCiAgICAoU2xpZGVyVG9vbGJhci5w cm90b3R5cGUuX2NhbGxOdW1iZXJPZkRheXNDYWxsYmFjayk6IERpdHRvLgogICAgKFNsaWRlclRv b2xiYXIuZGF5c0NvdW50TGFiZWxUZXh0KTogUmV0dXJuIGEgY3VzdG9tIGVsZW1lbnQgZm9yIG1v ZGlmeWluZyB0aGUgdGV4dCAvIHN0eWxpbmcgdXNlZCBmb3IgJ2RheXMgYWdvJy4KICAgIChTbGlk ZXJUb29sYmFyLmh0bWxUZW1wbGF0ZSk6IFJlbW92ZWQgdW5uZWNlc3NhcnkgbmF2IGFuZCByZXN0 cnVjdHVyZSB0byB1c2Ugc3RhdGljIHZhbHVlcyBmb3IgZGF5c0NvdW50TGFiZWxUZXh0LgogICAg KFNsaWRlclRvb2xiYXIuY3NzVGVtcGxhdGUpOiBNb3ZlZCBmcm9tIGNoYXJ0cy10b29sYmFyLmpz LCB3aXRob3V0IHRoZSAnQWRkIFBhbmUnIHN0eWxpbmcuCiAgICAqIHB1YmxpYy92My9wYWdlcy9z dW1tYXJ5LXBhZ2UuanM6CiAgICAoU3VtbWFyeVBhZ2UpOiBDaGFuZ2UgY29uc3RydWN0b3IgdG8g YWNjZXB0IGEgdG9vbGJhciBhcmd1bWVudC4KICAgIChTdW1tYXJ5UGFnZS5wcm90b3R5cGUub3Bl bik6IFJlZmFjdG9yZWQgc3VtbWFyeSByZW5kZXJpbmcgaW50byB1cGRhdGVBbmRSZW5kZXJGb3JS YW5nZSwgc28gaXQgY2FuIGJlIGNhbGxlZAogICAgd2hlbiB0aGUgbmV3IHNsaWRlciBpcyBtb3Zl ZC4KICAgIChTdW1tYXJ5UGFnZS5wcm90b3R5cGUudXBkYXRlQW5kUmVuZGVyRm9yUmFuZ2UpOiBV cGRhdGVzIHN1bW1hcnkgcGFnZSB0byBzaG93IHJlc3VsdHMgZm9yIE4gZGF5cyBhZ28uCiAgICAo U3VtbWFyeVBhZ2UucHJvdG90eXBlLnNldE51bWJlck9mRGF5c0Zyb21Ub29sYmFyKTogQ2FsbGJh Y2sgZm9yIHJlLXJlbmRlcmluZyBzdW1tYXJ5IHBhZ2Ugd2l0aCBuZXcgcmVzdWx0cyBhcwogICAg dGhlIHZhbHVlIG9uIHRoZSBzbGlkZXIgY2hhbmdlcy4KICAgICogcHVibGljL3YzL3BhZ2VzL3N1 bW1hcnktdG9vbGJhci5qczogQWRkZWQuCiAgICAoU3VtbWFyeVRvb2xiYXIpOiBCYXNlZCBvbiBT bGlkZXJUb29sYmFyLiBQcmltYXJ5IGNoYW5nZXMgYXJlIHRvIGFsbG93ICIwIGRheXMgYWdvIiB0 byBpbnN0ZWFkIHNob3cgIkN1cnJlbnQiCiAgICB3aGVuIGNoYW5naW5nIHZhbHVlcyBvbiB0aGUg c2xpZGVyIGFuZCBub3QgaW4gVGV4dE1vZGUuCiAgICAoU3VtbWFyeVRvb2xiYXIucHJvdG90eXBl Ll9hZGRTbGlkZXJUZXh0Rm9ybWF0dGluZ0Zvclplcm9EYXlzKTogQWRkcyBmb3JtYXR0aW5nIHRv IHVzZSAiQ3VycmVudCIgaW5zdGVhZCBvZgogICAgIjAgZGF5cyBhZ28iIGFuZCBub3Qgc2hpZnQg dGhlIHNsaWRlciB0b29sYmFyLgogICAgKFN1bW1hcnlUb29sYmFyLnByb3RvdHlwZS5fcmVtb3Zl U2xpZGVyVGV4dEZvcm1hdHRpbmdGb3JaZXJvRGF5cyk6IFJlbW92ZXMgZm9ybXR0aW5nIHRvIHJl dmVydCB0byBhIGRlZmF1bHQuCiAgICAoU3VtbWFyeVRvb2xiYXIucHJvdG90eXBlLnJlbmRlcik6 IFNldCB0aGUgc3BlY2lhbCBmb3JtYXR0aW5nIHdoZW4gbnVtYmVyT2ZEYXlzID09IDAsIG90aGVy d2lzZSB1c2UgdGhlIGRlZmF1bHQuCiAgICAoU3VtbWFyeVRvb2xiYXIucHJvdG90eXBlLl9lbnRl clRleHRNb2RlKTogUmVtb3ZlIGFsbCBzcGVjaWFsIGZvcm1hdHRpbmcgc2luY2UgJzAgZGF5cyBh Z28nIHJlYWRzIGJldHRlciB0aGFuCiAgICAnMCBDdXJyZW50Jy4gQWxzbyBzZXQgYSBuZXcgYm9v bGVhbiAodGhpcy5faW5UZXh0TW9kZSkgdGhhdCBjYW4gYmUgdXNlZCB3aGVuIHJlbmRlcmluZyB0 byBrZWVwIGZyb20gcmV2ZXJ0aW5nCiAgICBmcm9tICcwIGRheXMgYWdvJyB0byAnMCBDdXJyZW50 Jy4KICAgIChTdW1tYXJ5VG9vbGJhci5wcm90b3R5cGUuX2V4aXRUZXh0TW9kZSk6IFNldHMgdGhl IHRleHQgbW9kZSBiYWNrIHRvIEN1cnJlbnQgaWYgbnVtYmVyT2ZEYXlzID09IDAuCgpkaWZmIC0t Z2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9DaGFuZ2VMb2cKaW5kZXggYTA4YzBjY2E5ZWYuLjFhNDJhYjE5OWEwIDEwMDY0 NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKQEAgLTEsMyArMSw2OSBAQAorMjAxOS0wNi0xOSAg RGVhbiBKb2huc29uICA8ZGVhbl9qb2huc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbcGVyZi53 ZWJraXQub3JnXSBBZGQgJ2JhY2sgaW4gdGltZScgZmVhdHVyZSBmb3IgU3VtbWFyeSBwYWdlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDUxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBhZGRz IGEgIkJhY2sgaW4gdGltZSIgZmVhdHVyZSBmb3IgYWxsIFN1bW1hcnkgcGFnZXMgb24gdGhlIFdl YktpdCBQZXJmIGRhc2hib2FyZC4gVGhlcmUgaXMgYSBuZXcKKyAgICAgICAgc2xpZGVyIGluIHRo ZSB0b3AgcmlnaHQgY29ybmVyIHdoaWNoIGNhbiBiZSBkcmFnZ2VkIHRvIHZpZXcgdGhlIHN1bW1h cnkgcGFnZSAnTiBkYXlzIGFnbycuIFRoZSBkZWZhdWx0IHZpZXcKKyAgICAgICAgaXMgdGhlIHNh bWUgYXMgYmVmb3JlLgorCisgICAgICAgICogcHVibGljL3YzL2luZGV4Lmh0bWw6IEFkZCBuZXcg cmVzb3VyY2VzOiBzbGlkZXItdG9vbGJhci5qcywgc3VtbWFyeS10b29sYmFyLmpzLgorICAgICAg ICAqIHB1YmxpYy92My9tYWluLmpzOiBBZGQgbmV3IHN1bW1hcnlUb29sYmFyLCBhbmQgaW5pdGlh bGl6ZSBzdW1tYXJ5IHBhZ2VzIHdpdGggaXQuCisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBw dWJsaWMvdjMvcGFnZXMvY2hhcnRzLXRvb2xiYXIuanM6IEFic3RyYWN0IHRoZSBzbGlkZXIgdG9v bGJhciBpbnRvIGEgbmV3IGNsYXNzLCBhbmQgaW5oZXJpdCBmcm9tIGl0LgorICAgICAgICAoQ2hh cnRzVG9vbGJhcik6IE5vdywgQ2hhcnRzVG9vbGJhciBpcyBhIG1vc3RseSB0aGluIHdyYXBwZXIg cm91bmQgU2xpZGVyVG9vbGJhciBhbmQgaW1wbGVtZW50cyB0aGUgJ0FkZCBQYW5lJworICAgICAg ICBidXR0b24gKyBmdW5jdGlvbmFsaXR5LgorICAgICAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5 cGUucmVuZGVyKToKKyAgICAgICAgKENoYXJ0c1Rvb2xiYXIuY3NzVGVtcGxhdGUpOgorICAgICAg ICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5cGUuc2V0TnVtYmVyT2ZEYXlzQ2FsbGJhY2spOiBEZWxl dGVkLgorICAgICAgICAoQ2hhcnRzVG9vbGJhci5wcm90b3R5cGUuc2V0U3RhcnRUaW1lKTogRGVs ZXRlZC4KKyAgICAgICAgKENoYXJ0c1Rvb2xiYXIucHJvdG90eXBlLl9zZXRJbnB1dEVsZW1lbnRW YWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChDaGFydHNUb29sYmFyLnByb3RvdHlwZS5fZW50ZXJU ZXh0TW9kZSk6IERlbGV0ZWQuCisgICAgICAgIChDaGFydHNUb29sYmFyLnByb3RvdHlwZS5fZXhp dFRleHRNb2RlKTogRGVsZXRlZC4KKyAgICAgICAgKENoYXJ0c1Rvb2xiYXIucHJvdG90eXBlLl9z bGlkZXJWYWx1ZU1heUhhdmVDaGFuZ2VkKTogRGVsZXRlZC4KKyAgICAgICAgKENoYXJ0c1Rvb2xi YXIucHJvdG90eXBlLl9lZGl0b3JWYWx1ZU1heUhhdmVDaGFuZ2VkKTogRGVsZXRlZC4KKyAgICAg ICAgKENoYXJ0c1Rvb2xiYXIucHJvdG90eXBlLl9jYWxsTnVtYmVyT2ZEYXlzQ2FsbGJhY2spOiBE ZWxldGVkLgorICAgICAgICAoQ2hhcnRzVG9vbGJhci5odG1sVGVtcGxhdGUpOiBXcmFwIFNpbGRl clRvb2xiYXIncyBodG1sVGVtcGxhdGUgd2l0aCBhIG5hdiBhbmQgZW1iZWQgdGhlICdBZGQgUGFu ZScgYnV0dG9uLgorICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9kb21haW4tY29udHJvbC10b29s YmFyLmpzOgorICAgICAgICAoRG9tYWluQ29udHJvbFRvb2xiYXIucHJvdG90eXBlLnNldFN0YXJ0 VGltZSk6IFVwZGF0ZWQgdG8gc3VwcG9ydCBhIHZhbHVlIG9mIDAgZm9yIG51bWJlck9mRGF5cy4K KyAgICAgICAgKERvbWFpbkNvbnRyb2xUb29sYmFyLnByb3RvdHlwZS5zZXROdW1iZXJPZkRheXMp OiBEaXR0by4KKyAgICAgICAgKERvbWFpbkNvbnRyb2xUb29sYmFyKToKKyAgICAgICAgKiBwdWJs aWMvdjMvcGFnZXMvc2xpZGVyLXRvb2xiYXIuanM6IENvcGllZCBmcm9tIFdlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnRzLXRvb2xiYXIuanMuCisgICAgICAgIChT bGlkZXJUb29sYmFyKTogQ29waWVkIGZyb20gY2hhcnRzLXRvb2xiYXIuanM7IEFkZGVkIF9kZWZh dWx0TnVtYmVyT2ZEYXlzIHdoZW4gaW52b2tpbmcgY29uc3RydWN0b3IgYW5kCisgICAgICAgIHJl bW92ZWQgJ0FkZCBQYW5lJyBsb2dpYy4KKyAgICAgICAgKFNsaWRlclRvb2xiYXIucHJvdG90eXBl LnJlbmRlcik6IE1vdmVkIGZyb20gY2hhcnRzLXRvb2xiYXIuanMuCisgICAgICAgIChTbGlkZXJU b29sYmFyLnByb3RvdHlwZS5zZXROdW1iZXJPZkRheXNDYWxsYmFjayk6IERpdHRvLgorICAgICAg ICAoU2xpZGVyVG9vbGJhci5wcm90b3R5cGUuc2V0U3RhcnRUaW1lKTogRGl0dG8sIGJ1dCB1cGRh dGVkIHRvIHVzZSBfZGVmYXVsdE51bWJlck9mRGF5cy4KKyAgICAgICAgKFNsaWRlclRvb2xiYXIu cHJvdG90eXBlLl9zZXRJbnB1dEVsZW1lbnRWYWx1ZSk6IERpdHRvLgorICAgICAgICAoU2xpZGVy VG9vbGJhci5wcm90b3R5cGUuX2VudGVyVGV4dE1vZGUpOiBEaXR0by4KKyAgICAgICAgKFNsaWRl clRvb2xiYXIucHJvdG90eXBlLl9leGl0VGV4dE1vZGUpOiBEaXR0by4KKyAgICAgICAgKFNsaWRl clRvb2xiYXIucHJvdG90eXBlLl9zbGlkZXJWYWx1ZU1heUhhdmVDaGFuZ2VkKTogRGl0dG8uCisg ICAgICAgIChTbGlkZXJUb29sYmFyLnByb3RvdHlwZS5fZWRpdG9yVmFsdWVNYXlIYXZlQ2hhbmdl ZCk6IERpdHRvLgorICAgICAgICAoU2xpZGVyVG9vbGJhci5wcm90b3R5cGUuX2NhbGxOdW1iZXJP ZkRheXNDYWxsYmFjayk6IERpdHRvLgorICAgICAgICAoU2xpZGVyVG9vbGJhci5kYXlzQ291bnRM YWJlbFRleHQpOiBSZXR1cm4gYSBjdXN0b20gZWxlbWVudCBmb3IgbW9kaWZ5aW5nIHRoZSB0ZXh0 IC8gc3R5bGluZyB1c2VkIGZvciAnZGF5cyBhZ28nLgorICAgICAgICAoU2xpZGVyVG9vbGJhci5o dG1sVGVtcGxhdGUpOiBSZW1vdmVkIHVubmVjZXNzYXJ5IG5hdiBhbmQgcmVzdHJ1Y3R1cmUgdG8g dXNlIHN0YXRpYyB2YWx1ZXMgZm9yIGRheXNDb3VudExhYmVsVGV4dC4KKyAgICAgICAgKFNsaWRl clRvb2xiYXIuY3NzVGVtcGxhdGUpOiBNb3ZlZCBmcm9tIGNoYXJ0cy10b29sYmFyLmpzLCB3aXRo b3V0IHRoZSAnQWRkIFBhbmUnIHN0eWxpbmcuCisgICAgICAgICogcHVibGljL3YzL3BhZ2VzL3N1 bW1hcnktcGFnZS5qczoKKyAgICAgICAgKFN1bW1hcnlQYWdlKTogQ2hhbmdlIGNvbnN0cnVjdG9y IHRvIGFjY2VwdCBhIHRvb2xiYXIgYXJndW1lbnQuCisgICAgICAgIChTdW1tYXJ5UGFnZS5wcm90 b3R5cGUub3Blbik6IFJlZmFjdG9yZWQgc3VtbWFyeSByZW5kZXJpbmcgaW50byB1cGRhdGVBbmRS ZW5kZXJGb3JSYW5nZSwgc28gaXQgY2FuIGJlIGNhbGxlZAorICAgICAgICB3aGVuIHRoZSBuZXcg c2xpZGVyIGlzIG1vdmVkLgorICAgICAgICAoU3VtbWFyeVBhZ2UucHJvdG90eXBlLnVwZGF0ZUFu ZFJlbmRlckZvclJhbmdlKTogVXBkYXRlcyBzdW1tYXJ5IHBhZ2UgdG8gc2hvdyByZXN1bHRzIGZv ciBOIGRheXMgYWdvLgorICAgICAgICAoU3VtbWFyeVBhZ2UucHJvdG90eXBlLnNldE51bWJlck9m RGF5c0Zyb21Ub29sYmFyKTogQ2FsbGJhY2sgZm9yIHJlLXJlbmRlcmluZyBzdW1tYXJ5IHBhZ2Ug d2l0aCBuZXcgcmVzdWx0cyBhcworICAgICAgICB0aGUgdmFsdWUgb24gdGhlIHNsaWRlciBjaGFu Z2VzLgorICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXRvb2xiYXIuanM6IEFkZGVk LgorICAgICAgICAoU3VtbWFyeVRvb2xiYXIpOiBCYXNlZCBvbiBTbGlkZXJUb29sYmFyLiBQcmlt YXJ5IGNoYW5nZXMgYXJlIHRvIGFsbG93ICIwIGRheXMgYWdvIiB0byBpbnN0ZWFkIHNob3cgIkN1 cnJlbnQiCisgICAgICAgIHdoZW4gY2hhbmdpbmcgdmFsdWVzIG9uIHRoZSBzbGlkZXIgYW5kIG5v dCBpbiBUZXh0TW9kZS4KKyAgICAgICAgKFN1bW1hcnlUb29sYmFyLnByb3RvdHlwZS5fYWRkU2xp ZGVyVGV4dEZvcm1hdHRpbmdGb3JaZXJvRGF5cyk6IEFkZHMgZm9ybWF0dGluZyB0byB1c2UgIkN1 cnJlbnQiIGluc3RlYWQgb2YKKyAgICAgICAgIjAgZGF5cyBhZ28iIGFuZCBub3Qgc2hpZnQgdGhl IHNsaWRlciB0b29sYmFyLgorICAgICAgICAoU3VtbWFyeVRvb2xiYXIucHJvdG90eXBlLl9yZW1v dmVTbGlkZXJUZXh0Rm9ybWF0dGluZ0Zvclplcm9EYXlzKTogUmVtb3ZlcyBmb3JtdHRpbmcgdG8g cmV2ZXJ0IHRvIGEgZGVmYXVsdC4KKyAgICAgICAgKFN1bW1hcnlUb29sYmFyLnByb3RvdHlwZS5y ZW5kZXIpOiBTZXQgdGhlIHNwZWNpYWwgZm9ybWF0dGluZyB3aGVuIG51bWJlck9mRGF5cyA9PSAw LCBvdGhlcndpc2UgdXNlIHRoZSBkZWZhdWx0LgorICAgICAgICAoU3VtbWFyeVRvb2xiYXIucHJv dG90eXBlLl9lbnRlclRleHRNb2RlKTogUmVtb3ZlIGFsbCBzcGVjaWFsIGZvcm1hdHRpbmcgc2lu Y2UgJzAgZGF5cyBhZ28nIHJlYWRzIGJldHRlciB0aGFuCisgICAgICAgICcwIEN1cnJlbnQnLiBB bHNvIHNldCBhIG5ldyBib29sZWFuICh0aGlzLl9pblRleHRNb2RlKSB0aGF0IGNhbiBiZSB1c2Vk IHdoZW4gcmVuZGVyaW5nIHRvIGtlZXAgZnJvbSByZXZlcnRpbmcKKyAgICAgICAgZnJvbSAnMCBk YXlzIGFnbycgdG8gJzAgQ3VycmVudCcuCisgICAgICAgIChTdW1tYXJ5VG9vbGJhci5wcm90b3R5 cGUuX2V4aXRUZXh0TW9kZSk6IFNldHMgdGhlIHRleHQgbW9kZSBiYWNrIHRvIEN1cnJlbnQgaWYg bnVtYmVyT2ZEYXlzID09IDAuCisKIDIwMTktMDYtMTkgIERlYW4gSm9obnNvbiAgPGRlYW5fam9o bnNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW3BlcmYud2Via2l0Lm9yZ10gVXBkYXRlIHN1bW1h cnkgcGFnZSBjYWxjdWxhdGlvbnMgdG8gdXNlIG1lYW4gaW5zdGVhZCBvZiBtZWRpYW4KZGlmZiAt LWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvaW5kZXguaHRtbCBiL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvaW5kZXguaHRtbAppbmRleCBlNzMxMDc3 ZjZlYi4uY2JjOGVlMTZiYWIgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvdjMvaW5kZXguaHRtbAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL2luZGV4Lmh0bWwKQEAgLTExMyw2ICsxMTMsNyBAQCBSdW4gdG9vbHMvYnVuZGxlLXYzLXNj cmlwdHMgdG8gc3BlZWQgdXAgdGhlIGxvYWQgdGltZSBmb3IgcHJvZHVjdGlvbi5gKTsKICAgICAg ICAgPHNjcmlwdCBzcmM9InBhZ2VzL2RvbWFpbi1jb250cm9sLXRvb2xiYXIuanMiPjwvc2NyaXB0 PgogICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvZGFzaGJvYXJkLXRvb2xiYXIuanMiPjwvc2Ny aXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvZGFzaGJvYXJkLXBhZ2UuanMiPjwvc2Ny aXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvc2xpZGVyLXRvb2xiYXIuanMiPjwvc2Ny aXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvY2hhcnQtcGFuZS1zdGF0dXMtdmlldy5q cyI+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQgc3JjPSJwYWdlcy9jaGFydC1wYW5lLmpzIj48 L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9InBhZ2VzL2NoYXJ0cy10b29sYmFyLmpzIj48 L3NjcmlwdD4KQEAgLTEyMyw2ICsxMjQsNyBAQCBSdW4gdG9vbHMvYnVuZGxlLXYzLXNjcmlwdHMg dG8gc3BlZWQgdXAgdGhlIGxvYWQgdGltZSBmb3IgcHJvZHVjdGlvbi5gKTsKICAgICAgICAgPHNj cmlwdCBzcmM9InBhZ2VzL2NyZWF0ZS1hbmFseXNpcy10YXNrLXBhZ2UuanMiPjwvc2NyaXB0Pgog ICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvYnVpbGQtcmVxdWVzdC1xdWV1ZS1wYWdlLmpzIj48 L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9InBhZ2VzL3N1bW1hcnktcGFnZS5qcyI+PC9z Y3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJwYWdlcy9zdW1tYXJ5LXRvb2xiYXIuanMiPjwv c2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0icGFnZXMvdGVzdC1mcmVzaG5lc3MtcGFnZS5q cyI+PC9zY3JpcHQ+CiAKICAgICAgICAgPHNjcmlwdCBzcmM9Im1haW4uanMiPjwvc2NyaXB0Pgpk aWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tYWluLmpzIGIv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tYWluLmpzCmluZGV4IDBlYmMyZjAx YzdiLi42MjE3YjNjZmJhYyAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9tYWluLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMv bWFpbi5qcwpAQCAtMjYsMTEgKzI2LDEyIEBAIGZ1bmN0aW9uIG1haW4oKSB7CiAgICAgICAgICAg ICAgICAgZGFzaGJvYXJkUGFnZXMucHVzaChuZXcgRGFzaGJvYXJkUGFnZShuYW1lLCBtYW5pZmVz dC5kYXNoYm9hcmRzW25hbWVdLCBkYXNoYm9hcmRUb29sYmFyKSk7CiAgICAgICAgIH0KIAorICAg ICAgICBjb25zdCBzdW1tYXJ5VG9vbGJhciA9IG5ldyBTdW1tYXJ5VG9vbGJhcjsKICAgICAgICAg Y29uc3Qgc3VtbWFyeVBhZ2VzID0gW107CiAgICAgICAgIGxldCB0ZXN0RnJlc2huZXNzUGFnZSA9 IG51bGw7CiAgICAgICAgIGlmIChtYW5pZmVzdC5zdW1tYXJ5UGFnZXMpIHsKICAgICAgICAgICAg IGZvciAoY29uc3Qgc3VtbWFyeVBhZ2Ugb2YgbWFuaWZlc3Quc3VtbWFyeVBhZ2VzKQotICAgICAg ICAgICAgICAgIHN1bW1hcnlQYWdlcy5wdXNoKG5ldyBTdW1tYXJ5UGFnZShzdW1tYXJ5UGFnZSkp OworICAgICAgICAgICAgICAgIHN1bW1hcnlQYWdlcy5wdXNoKG5ldyBTdW1tYXJ5UGFnZShzdW1t YXJ5UGFnZSwgc3VtbWFyeVRvb2xiYXIpKTsKICAgICAgICAgICAgIHRlc3RGcmVzaG5lc3NQYWdl ID0gbmV3IFRlc3RGcmVzaG5lc3NQYWdlKG1hbmlmZXN0LnN1bW1hcnlQYWdlcywgbWFuaWZlc3Qu dGVzdEFnZVRvbGVyYW5jZUluSG91cnMpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnRzLXRvb2xiYXIuanMgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2NoYXJ0cy10b29sYmFyLmpz CmluZGV4IGEwOTdlMzQ4ZTg3Li4yOGVjOWIzNTJjMyAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9jaGFydHMtdG9vbGJhci5qcworKysgYi9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2NoYXJ0cy10b29sYmFyLmpzCkBA IC0xLDI0ICsxLDggQEAKIAotY2xhc3MgQ2hhcnRzVG9vbGJhciBleHRlbmRzIERvbWFpbkNvbnRy b2xUb29sYmFyIHsKK2NsYXNzIENoYXJ0c1Rvb2xiYXIgZXh0ZW5kcyBTbGlkZXJUb29sYmFyIHsK ICAgICBjb25zdHJ1Y3RvcigpCiAgICAgewotICAgICAgICBzdXBlcignY2hhcnMtdG9vbGJhcics IDcpOwotCi0gICAgICAgIHRoaXMuX21pbkRheUNvdW50ID0gMTsKLSAgICAgICAgdGhpcy5fbWF4 RGF5Q291bnQgPSAzNjY7Ci0KLSAgICAgICAgdGhpcy5fbnVtYmVyT2ZEYXlzQ2FsbGJhY2sgPSBu dWxsOwotICAgICAgICB0aGlzLl9zbGlkZXIgPSB0aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9y KCcuc2xpZGVyJyk7Ci0gICAgICAgIHRoaXMuX3NsaWRlci5hZGRFdmVudExpc3RlbmVyKCdjaGFu Z2UnLCB0aGlzLl9zbGlkZXJWYWx1ZU1heUhhdmVDaGFuZ2VkLmJpbmQodGhpcykpOwotICAgICAg ICB0aGlzLl9zbGlkZXIuYWRkRXZlbnRMaXN0ZW5lcignbW91c2Vtb3ZlJywgdGhpcy5fc2xpZGVy VmFsdWVNYXlIYXZlQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLQotICAgICAgICB0aGlzLl9lZGl0b3Ig PSB0aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuZWRpdG9yJyk7Ci0gICAgICAgIHRoaXMu X2VkaXRvci5hZGRFdmVudExpc3RlbmVyKCdmb2N1cycsIHRoaXMuX2VudGVyVGV4dE1vZGUuYmlu ZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMuX2VkaXRvci5hZGRFdmVudExpc3RlbmVyKCdibHVyJywg dGhpcy5fZXhpdFRleHRNb2RlLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9lZGl0b3IuYWRk RXZlbnRMaXN0ZW5lcignaW5wdXQnLCB0aGlzLl9lZGl0b3JWYWx1ZU1heUhhdmVDaGFuZ2VkLmJp bmQodGhpcykpOwotICAgICAgICB0aGlzLl9lZGl0b3IuYWRkRXZlbnRMaXN0ZW5lcignY2hhbmdl JywgdGhpcy5fZWRpdG9yVmFsdWVNYXlIYXZlQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLQotICAgICAg ICB0aGlzLl9sYWJlbFNwYW4gPSB0aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuZGF5LWNv dW50Jyk7CisgICAgICAgIHN1cGVyKCdjaGFydHMtdG9vbGJhcicsIDcpOwogCiAgICAgICAgIHRo aXMuX2FkZFBhbmVDYWxsYmFjayA9IG51bGw7CiAgICAgICAgIHRoaXMuX3BhbmVTZWxlY3RvciA9 IHRoaXMuY29udGVudCgpLnF1ZXJ5U2VsZWN0b3IoJ3BhbmUtc2VsZWN0b3InKS5jb21wb25lbnQo KTsKQEAgLTM1LDE0ICsxOSw2IEBAIGNsYXNzIENoYXJ0c1Rvb2xiYXIgZXh0ZW5kcyBEb21haW5D b250cm9sVG9vbGJhciB7CiAgICAgewogICAgICAgICBzdXBlci5yZW5kZXIoKTsKICAgICAgICAg dGhpcy5fcGFuZVNlbGVjdG9yLmVucXVldWVUb1JlbmRlcigpOwotICAgICAgICB0aGlzLl9sYWJl bFNwYW4udGV4dENvbnRlbnQgPSB0aGlzLl9udW1iZXJPZkRheXM7Ci0gICAgICAgIHRoaXMuX3Nl dElucHV0RWxlbWVudFZhbHVlKHRoaXMuX251bWJlck9mRGF5cyk7Ci0gICAgfQotCi0gICAgc2V0 TnVtYmVyT2ZEYXlzQ2FsbGJhY2soY2FsbGJhY2spCi0gICAgewotICAgICAgICBjb25zb2xlLmFz c2VydCghY2FsbGJhY2sgfHwgY2FsbGJhY2sgaW5zdGFuY2VvZiBGdW5jdGlvbik7Ci0gICAgICAg IHRoaXMuX251bWJlck9mRGF5c0NhbGxiYWNrID0gY2FsbGJhY2s7CiAgICAgfQogCiAgICAgc2V0 QWRkUGFuZUNhbGxiYWNrKGNhbGxiYWNrKQpAQCAtNTEsNjUgKzI3LDYgQEAgY2xhc3MgQ2hhcnRz VG9vbGJhciBleHRlbmRzIERvbWFpbkNvbnRyb2xUb29sYmFyIHsKICAgICAgICAgdGhpcy5fYWRk UGFuZUNhbGxiYWNrID0gY2FsbGJhY2s7CiAgICAgfQogCi0gICAgc2V0U3RhcnRUaW1lKHN0YXJ0 VGltZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2V4aXRUZXh0TW9kZSgpOwotICAgICAgICBpZiAo c3RhcnRUaW1lKQotICAgICAgICAgICAgc3VwZXIuc2V0U3RhcnRUaW1lKHN0YXJ0VGltZSk7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHN1cGVyLnNldE51bWJlck9mRGF5cyg3KTsKLSAgICB9 Ci0KLSAgICBfc2V0SW5wdXRFbGVtZW50VmFsdWUodmFsdWUpCi0gICAgewotICAgICAgICB0aGlz Ll9zbGlkZXIudmFsdWUgPSBNYXRoLnBvdyh2YWx1ZSwgMS8zKTsKLSAgICAgICAgdGhpcy5fc2xp ZGVyLm1pbiA9IE1hdGgucG93KHRoaXMuX21pbkRheUNvdW50LCAxLzMpOwotICAgICAgICB0aGlz Ll9zbGlkZXIubWF4ID0gTWF0aC5wb3codGhpcy5fbWF4RGF5Q291bnQsIDEvMyk7Ci0gICAgICAg IHRoaXMuX3NsaWRlci5zdGVwID0gJ2FueSc7Ci0gICAgICAgIHRoaXMuX2VkaXRvci52YWx1ZSA9 IHZhbHVlOwotICAgIH0KLQotICAgIF9lbnRlclRleHRNb2RlKGV2ZW50KQotICAgIHsKLSAgICAg ICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKLSAgICAgICAgdGhpcy5fZWRpdG9yLnN0eWxlLm9w YWNpdHkgPSAxOwotICAgICAgICB0aGlzLl9lZGl0b3Iuc3R5bGUubWFyZ2luTGVmdCA9ICctMi41 cmVtJzsKLSAgICAgICAgdGhpcy5fbGFiZWxTcGFuLnN0eWxlLm9wYWNpdHkgPSAwOwotICAgICAg ICB0aGlzLl9zbGlkZXIuc3R5bGUub3BhY2l0eSA9IDA7Ci0gICAgfQotCi0gICAgX2V4aXRUZXh0 TW9kZShldmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChldmVudCkKLSAgICAgICAgICAgIGV2ZW50 LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgICAgIHRoaXMuX2VkaXRvci5zdHlsZS5vcGFjaXR5ID0g MDsKLSAgICAgICAgdGhpcy5fZWRpdG9yLnN0eWxlLm1hcmdpbkxlZnQgPSBudWxsOwotICAgICAg ICB0aGlzLl9sYWJlbFNwYW4uc3R5bGUub3BhY2l0eSA9IDE7Ci0gICAgICAgIHRoaXMuX3NsaWRl ci5zdHlsZS5vcGFjaXR5ID0gMTsKLSAgICB9Ci0KLSAgICBfc2xpZGVyVmFsdWVNYXlIYXZlQ2hh bmdlZChldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciBudW1iZXJPZkRheXMgPSBNYXRoLnJvdW5k KE1hdGgucG93KHBhcnNlRmxvYXQodGhpcy5fc2xpZGVyLnZhbHVlKSwgMykpOwotICAgICAgICB0 aGlzLl9jYWxsTnVtYmVyT2ZEYXlzQ2FsbGJhY2soZXZlbnQsIG51bWJlck9mRGF5cyk7Ci0gICAg fQotCi0gICAgX2VkaXRvclZhbHVlTWF5SGF2ZUNoYW5nZWQoZXZlbnQpCi0gICAgewotICAgICAg ICB2YXIgcmF3TnVtYmVyID0gTWF0aC5yb3VuZChwYXJzZUZsb2F0KHRoaXMuX2VkaXRvci52YWx1 ZSkpOwotICAgICAgICB2YXIgbnVtYmVyT2ZEYXlzID0gTWF0aC5tYXgodGhpcy5fbWluRGF5Q291 bnQsIE1hdGgubWluKHRoaXMuX21heERheUNvdW50LCByYXdOdW1iZXIpKTsKLSAgICAgICAgaWYg KHRoaXMuX2VkaXRvci52YWx1ZSAhPSBudW1iZXJPZkRheXMpCi0gICAgICAgICAgICB0aGlzLl9l ZGl0b3IudmFsdWUgPSBudW1iZXJPZkRheXM7Ci0gICAgICAgIHRoaXMuX2NhbGxOdW1iZXJPZkRh eXNDYWxsYmFjayhldmVudCwgbnVtYmVyT2ZEYXlzKTsKLSAgICB9Ci0KLSAgICBfY2FsbE51bWJl ck9mRGF5c0NhbGxiYWNrKGV2ZW50LCBudW1iZXJPZkRheXMpCi0gICAgewotICAgICAgICB2YXIg c2hvdWxkVXBkYXRlU3RhdGUgPSBldmVudC50eXBlID09ICdjaGFuZ2UnOwotICAgICAgICBpZiAo KHRoaXMubnVtYmVyT2ZEYXlzKCkgIT0gbnVtYmVyT2ZEYXlzIHx8IHNob3VsZFVwZGF0ZVN0YXRl KSAmJiB0aGlzLl9udW1iZXJPZkRheXNDYWxsYmFjaykKLSAgICAgICAgICAgIHRoaXMuX251bWJl ck9mRGF5c0NhbGxiYWNrKG51bWJlck9mRGF5cywgc2hvdWxkVXBkYXRlU3RhdGUpOwotICAgIH0K LQogICAgIF90b2dnbGVQYW5lU2VsZWN0b3IoZXZlbnQpCiAgICAgewogICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOwpAQCAtMTQ1LDM0ICs2MiwyNSBAQCBjbGFzcyBDaGFydHNUb29sYmFy IGV4dGVuZHMgRG9tYWluQ29udHJvbFRvb2xiYXIgewogICAgICAgICAgICAgdGhpcy5fYWRkUGFu ZUNhbGxiYWNrKHBsYXRmb3JtLCBtZXRyaWMpOwogICAgIH0KIAotCiAgICAgc3RhdGljIGh0bWxU ZW1wbGF0ZSgpCiAgICAgewogICAgICAgICByZXR1cm4gYAotICAgICAgICAgICAgPG5hdiBjbGFz cz0iY2hhcnRzLXRvb2xiYXIiPgorICAgICAgICAgICAgPG5hdj4KICAgICAgICAgICAgICAgICA8 dWwgY2xhc3M9ImJ1dHRvbmVkLXRvb2xiYXIiPgogICAgICAgICAgICAgICAgICAgICA8bGk+PGEg aHJlZj0iIyIgY2xhc3M9InBhbmUtc2VsZWN0b3Itb3BlbmVyIj5BZGQgcGFuZTwvYT48L2xpPgog ICAgICAgICAgICAgICAgIDwvdWw+Ci0gICAgICAgICAgICAgICAgPHVsIGNsYXNzPSJidXR0b25l ZC10b29sYmFyIj4KLSAgICAgICAgICAgICAgICAgICAgPGxpIGNsYXNzPSJzdGFydC10aW1lLXNs aWRlciI+Ci0gICAgICAgICAgICAgICAgICAgICAgICA8bGFiZWw+Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGlucHV0IGNsYXNzPSJzbGlkZXIiIHR5cGU9InJhbmdlIj4KLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8aW5wdXQgY2xhc3M9ImVkaXRvciIgdHlwZT0ibnVtYmVyIj4K LSAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0ibGFiZWwiPjxzcGFuIGNs YXNzPSJkYXktY291bnQiIHRhYmluZGV4PSIwIj4/PC9zcGFuPiBkYXlzPC9zcGFuPgotICAgICAg ICAgICAgICAgICAgICAgICAgPC9sYWJlbD4KLSAgICAgICAgICAgICAgICAgICAgPC9saT4KLSAg ICAgICAgICAgICAgICA8L3VsPgogICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InBhbmUtc2Vs ZWN0b3ItY29udGFpbmVyIj4KICAgICAgICAgICAgICAgICAgICAgPHBhbmUtc2VsZWN0b3I+PC9w YW5lLXNlbGVjdG9yPgogICAgICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgPC9uYXY+ YDsKKyAgICAgICAgICAgICAgICAkeyBzdXBlci5odG1sVGVtcGxhdGUoKSB9CisgICAgICAgICAg ICA8L25hdj4KKyAgICAgICAgYDsKICAgICB9CiAKICAgICBzdGF0aWMgY3NzVGVtcGxhdGUoKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIFRvb2xiYXIuY3NzVGVtcGxhdGUoKSArIGAKLQotICAgICAg ICAgICAgLmNoYXJ0cy10b29sYmFyID4gLmJ1dHRvbmVkLXRvb2xiYXI6Zmlyc3QtY2hpbGQgewor ICAgICAgICByZXR1cm4gc3VwZXIuY3NzVGVtcGxhdGUoKSArIGAKKyAgICAgICAgICAgIG5hdiA+ IC5idXR0b25lZC10b29sYmFyOmZpcnN0LWNoaWxkIHsKICAgICAgICAgICAgICAgICBtYXJnaW4t cmlnaHQ6IDAuNXJlbTsKICAgICAgICAgICAgIH0KIApAQCAtMTgwLDcgKzg4LDcgQEAgY2xhc3Mg Q2hhcnRzVG9vbGJhciBleHRlbmRzIERvbWFpbkNvbnRyb2xUb29sYmFyIHsKICAgICAgICAgICAg ICAgICBiYWNrZ3JvdW5kOiByZ2JhKDIwNCwgMTUzLCA1MSwgMC4xKTsKICAgICAgICAgICAgIH0K IAotICAgICAgICAgICAgLmNoYXJ0cy10b29sYmFyID4gLnBhbmUtc2VsZWN0b3ItY29udGFpbmVy IHsKKyAgICAgICAgICAgIG5hdiA+IC5wYW5lLXNlbGVjdG9yLWNvbnRhaW5lciB7CiAgICAgICAg ICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgICAgICAgICAgICAgIHJpZ2h0OiAxcmVt OwogICAgICAgICAgICAgICAgIG1hcmdpbjogMDsKQEAgLTE5MiwzOSArMTAwLDggQEAgY2xhc3Mg Q2hhcnRzVG9vbGJhciBleHRlbmRzIERvbWFpbkNvbnRyb2xUb29sYmFyIHsKICAgICAgICAgICAg ICAgICBiYWNrZ3JvdW5kOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuOCk7CiAgICAgICAgICAgICAg ICAgLXdlYmtpdC1iYWNrZHJvcC1maWx0ZXI6IGJsdXIoMC41cmVtKTsKICAgICAgICAgICAgIH0K LQotICAgICAgICAgICAgLmJ1dHRvbmVkLXRvb2xiYXIgLnN0YXJ0LXRpbWUtc2xpZGVyIHsKLSAg ICAgICAgICAgICAgICBtYXJnaW4tbGVmdDogMnJlbTsKLSAgICAgICAgICAgICAgICBsaW5lLWhl aWdodDogMWVtOwotICAgICAgICAgICAgICAgIGZvbnQtc2l6ZTogMC45cmVtOwotICAgICAgICAg ICAgfQotCi0gICAgICAgICAgICAuc3RhcnQtdGltZS1zbGlkZXIgbGFiZWwgewotICAgICAgICAg ICAgICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAg ICAgLnN0YXJ0LXRpbWUtc2xpZGVyIC5zbGlkZXIgewotICAgICAgICAgICAgICAgIGhlaWdodDog MC44cmVtOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAuc3RhcnQtdGltZS1zbGlkZXIg LmVkaXRvciB7Ci0gICAgICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgICAgICAg ICAgICAgIG9wYWNpdHk6IDA7Ci0gICAgICAgICAgICAgICAgd2lkdGg6IDRyZW07Ci0gICAgICAg ICAgICAgICAgZm9udC13ZWlnaHQ6IGluaGVyaXQ7Ci0gICAgICAgICAgICAgICAgZm9udC1zaXpl OiAwLjhyZW07Ci0gICAgICAgICAgICAgICAgaGVpZ2h0OiAwLjlyZW07Ci0gICAgICAgICAgICAg ICAgb3V0bGluZTogbm9uZTsKLSAgICAgICAgICAgICAgICBib3JkZXI6IHNvbGlkIDFweCAjY2Nj OwotICAgICAgICAgICAgICAgIHotaW5kZXg6IDU7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAg ICAgIC5zdGFydC10aW1lLXNsaWRlciAuZGF5LWNvdW50IHsKLSAgICAgICAgICAgICAgICBkaXNw bGF5OiBpbmxpbmUtYmxvY2s7Ci0gICAgICAgICAgICAgICAgdGV4dC1hbGlnbjogcmlnaHQ7Ci0g ICAgICAgICAgICAgICAgd2lkdGg6IDJyZW07Ci0gICAgICAgICAgICB9CiAgICAgICAgIGA7CiAg ICAgfQotCiB9CisKK0NvbXBvbmVudEJhc2UuZGVmaW5lRWxlbWVudCgnY2hhcnRzLXRvb2xiYXIn LCBDaGFydHNUb29sYmFyKTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvdjMvcGFnZXMvZG9tYWluLWNvbnRyb2wtdG9vbGJhci5qcyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvZG9tYWluLWNvbnRyb2wtdG9vbGJhci5qcwppbmRl eCBjNmJmNjE0ZTM2MC4uNzBlYjc3MDQwNWUgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvZG9tYWluLWNvbnRyb2wtdG9vbGJhci5qcworKysgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2RvbWFpbi1jb250cm9sLXRv b2xiYXIuanMKQEAgLTE3LDcgKzE3LDcgQEAgY2xhc3MgRG9tYWluQ29udHJvbFRvb2xiYXIgZXh0 ZW5kcyBUb29sYmFyIHsKIAogICAgIHNldFN0YXJ0VGltZShzdGFydFRpbWUpCiAgICAgewotICAg ICAgICB0aGlzLnNldE51bWJlck9mRGF5cyhNYXRoLm1heCgxLCBNYXRoLnJvdW5kKCh0aGlzLl9w cmVzZW50IC0gc3RhcnRUaW1lKSAvIHRoaXMuX21pbGxpc2Vjb25kc1BlckRheSkpKTsKKyAgICAg ICAgdGhpcy5zZXROdW1iZXJPZkRheXMoTWF0aC5tYXgoMCwgTWF0aC5yb3VuZCgodGhpcy5fcHJl c2VudCAtIHN0YXJ0VGltZSkgLyB0aGlzLl9taWxsaXNlY29uZHNQZXJEYXkpKSk7CiAgICAgICAg IHRoaXMuX3N0YXJ0VGltZSA9IHN0YXJ0VGltZTsKICAgICB9CiAKQEAgLTI4LDcgKzI4LDcgQEAg Y2xhc3MgRG9tYWluQ29udHJvbFRvb2xiYXIgZXh0ZW5kcyBUb29sYmFyIHsKIAogICAgIHNldE51 bWJlck9mRGF5cyhudW1iZXJPZkRheXMsIHNldEJ5VXNlcikKICAgICB7Ci0gICAgICAgIGlmICgh bnVtYmVyT2ZEYXlzKQorICAgICAgICBpZiAoIW51bWJlck9mRGF5cyAmJiBudW1iZXJPZkRheXMg IT09IDApCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0g bnVsbDsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFn ZXMvc2xpZGVyLXRvb2xiYXIuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yz L3BhZ2VzL3NsaWRlci10b29sYmFyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwLi5kNGNiOGQwYzczMQotLS0gL2Rldi9udWxsCisrKyBiL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc2xpZGVyLXRvb2xiYXIuanMKQEAgLTAsMCArMSwxNTQg QEAKKworY2xhc3MgU2xpZGVyVG9vbGJhciBleHRlbmRzIERvbWFpbkNvbnRyb2xUb29sYmFyIHsK KyAgICBjb25zdHJ1Y3RvcihuYW1lLCBkZWZhdWx0TnVtYmVyT2ZEYXlzKQorICAgIHsKKyAgICAg ICAgc3VwZXIobmFtZSwgZGVmYXVsdE51bWJlck9mRGF5cyk7CisKKyAgICAgICAgdGhpcy5fbWlu RGF5Q291bnQgPSAxOworICAgICAgICB0aGlzLl9tYXhEYXlDb3VudCA9IDM2NjsKKyAgICAgICAg dGhpcy5fZGVmYXVsdE51bWJlck9mRGF5cyA9IGRlZmF1bHROdW1iZXJPZkRheXM7CisKKyAgICAg ICAgdGhpcy5fbnVtYmVyT2ZEYXlzQ2FsbGJhY2sgPSBudWxsOworICAgICAgICB0aGlzLl9zbGlk ZXIgPSB0aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuc2xpZGVyJyk7CisgICAgICAgIHRo aXMuX3NsaWRlci5hZGRFdmVudExpc3RlbmVyKCdjaGFuZ2UnLCB0aGlzLl9zbGlkZXJWYWx1ZU1h eUhhdmVDaGFuZ2VkLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9zbGlkZXIuYWRkRXZlbnRM aXN0ZW5lcignbW91c2Vtb3ZlJywgdGhpcy5fc2xpZGVyVmFsdWVNYXlIYXZlQ2hhbmdlZC5iaW5k KHRoaXMpKTsKKworICAgICAgICB0aGlzLl9lZGl0b3IgPSB0aGlzLmNvbnRlbnQoKS5xdWVyeVNl bGVjdG9yKCcuZWRpdG9yJyk7CisgICAgICAgIHRoaXMuX2VkaXRvci5hZGRFdmVudExpc3RlbmVy KCdmb2N1cycsIHRoaXMuX2VudGVyVGV4dE1vZGUuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMu X2VkaXRvci5hZGRFdmVudExpc3RlbmVyKCdibHVyJywgdGhpcy5fZXhpdFRleHRNb2RlLmJpbmQo dGhpcykpOworICAgICAgICB0aGlzLl9lZGl0b3IuYWRkRXZlbnRMaXN0ZW5lcignaW5wdXQnLCB0 aGlzLl9lZGl0b3JWYWx1ZU1heUhhdmVDaGFuZ2VkLmJpbmQodGhpcykpOworICAgICAgICB0aGlz Ll9lZGl0b3IuYWRkRXZlbnRMaXN0ZW5lcignY2hhbmdlJywgdGhpcy5fZWRpdG9yVmFsdWVNYXlI YXZlQ2hhbmdlZC5iaW5kKHRoaXMpKTsKKworICAgICAgICB0aGlzLl9sYWJlbFNwYW4gPSB0aGlz LmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuZGF5LWNvdW50Jyk7CisgICAgfQorCisgICAgcmVu ZGVyKCkKKyAgICB7CisgICAgICAgIHN1cGVyLnJlbmRlcigpOworICAgICAgICB0aGlzLl9sYWJl bFNwYW4udGV4dENvbnRlbnQgPSB0aGlzLl9udW1iZXJPZkRheXM7CisgICAgICAgIHRoaXMuX3Nl dElucHV0RWxlbWVudFZhbHVlKHRoaXMuX251bWJlck9mRGF5cyk7CisgICAgfQorCisgICAgc2V0 TnVtYmVyT2ZEYXlzQ2FsbGJhY2soY2FsbGJhY2spCisgICAgeworICAgICAgICBjb25zb2xlLmFz c2VydCghY2FsbGJhY2sgfHwgY2FsbGJhY2sgaW5zdGFuY2VvZiBGdW5jdGlvbik7CisgICAgICAg IHRoaXMuX251bWJlck9mRGF5c0NhbGxiYWNrID0gY2FsbGJhY2s7CisgICAgfQorCisgICAgc2V0 U3RhcnRUaW1lKHN0YXJ0VGltZSkKKyAgICB7CisgICAgICAgIHRoaXMuX2V4aXRUZXh0TW9kZSgp OworICAgICAgICBpZiAoc3RhcnRUaW1lKQorICAgICAgICAgICAgc3VwZXIuc2V0U3RhcnRUaW1l KHN0YXJ0VGltZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHN1cGVyLnNldE51bWJlck9m RGF5cyh0aGlzLl9kZWZhdWx0TnVtYmVyT2ZEYXlzKTsKKyAgICB9CisKKyAgICBfc2V0SW5wdXRF bGVtZW50VmFsdWUodmFsdWUpCisgICAgeworICAgICAgICB0aGlzLl9zbGlkZXIudmFsdWUgPSBN YXRoLnBvdyh2YWx1ZSwgMS8zKTsKKyAgICAgICAgdGhpcy5fc2xpZGVyLm1pbiA9IE1hdGgucG93 KHRoaXMuX21pbkRheUNvdW50LCAxLzMpOworICAgICAgICB0aGlzLl9zbGlkZXIubWF4ID0gTWF0 aC5wb3codGhpcy5fbWF4RGF5Q291bnQsIDEvMyk7CisgICAgICAgIHRoaXMuX3NsaWRlci5zdGVw ID0gJ2FueSc7CisgICAgICAgIHRoaXMuX2VkaXRvci52YWx1ZSA9IHZhbHVlOworICAgIH0KKwor ICAgIF9lbnRlclRleHRNb2RlKGV2ZW50KQorICAgIHsKKyAgICAgICAgZXZlbnQucHJldmVudERl ZmF1bHQoKTsKKyAgICAgICAgdGhpcy5fZWRpdG9yLnN0eWxlLm9wYWNpdHkgPSAxOworICAgICAg ICB0aGlzLl9lZGl0b3Iuc3R5bGUubWFyZ2luTGVmdCA9ICctMi41cmVtJzsKKyAgICAgICAgdGhp cy5fbGFiZWxTcGFuLnN0eWxlLm9wYWNpdHkgPSAwOworICAgICAgICB0aGlzLl9zbGlkZXIuc3R5 bGUub3BhY2l0eSA9IDA7CisgICAgfQorCisgICAgX2V4aXRUZXh0TW9kZShldmVudCkKKyAgICB7 CisgICAgICAgIGlmIChldmVudCkKKyAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7 CisgICAgICAgIHRoaXMuX2VkaXRvci5zdHlsZS5vcGFjaXR5ID0gMDsKKyAgICAgICAgdGhpcy5f ZWRpdG9yLnN0eWxlLm1hcmdpbkxlZnQgPSBudWxsOworICAgICAgICB0aGlzLl9sYWJlbFNwYW4u c3R5bGUub3BhY2l0eSA9IDE7CisgICAgICAgIHRoaXMuX3NsaWRlci5zdHlsZS5vcGFjaXR5ID0g MTsKKyAgICB9CisKKyAgICBfc2xpZGVyVmFsdWVNYXlIYXZlQ2hhbmdlZChldmVudCkKKyAgICB7 CisgICAgICAgIHZhciBudW1iZXJPZkRheXMgPSBNYXRoLnJvdW5kKE1hdGgucG93KHBhcnNlRmxv YXQodGhpcy5fc2xpZGVyLnZhbHVlKSwgMykpOworICAgICAgICB0aGlzLl9jYWxsTnVtYmVyT2ZE YXlzQ2FsbGJhY2soZXZlbnQsIG51bWJlck9mRGF5cyk7CisgICAgfQorCisgICAgX2VkaXRvclZh bHVlTWF5SGF2ZUNoYW5nZWQoZXZlbnQpCisgICAgeworICAgICAgICB2YXIgcmF3TnVtYmVyID0g TWF0aC5yb3VuZChwYXJzZUZsb2F0KHRoaXMuX2VkaXRvci52YWx1ZSkpOworICAgICAgICB2YXIg bnVtYmVyT2ZEYXlzID0gTWF0aC5tYXgodGhpcy5fbWluRGF5Q291bnQsIE1hdGgubWluKHRoaXMu X21heERheUNvdW50LCByYXdOdW1iZXIpKTsKKyAgICAgICAgaWYgKHRoaXMuX2VkaXRvci52YWx1 ZSAhPSBudW1iZXJPZkRheXMpCisgICAgICAgICAgICB0aGlzLl9lZGl0b3IudmFsdWUgPSBudW1i ZXJPZkRheXM7CisgICAgICAgIHRoaXMuX2NhbGxOdW1iZXJPZkRheXNDYWxsYmFjayhldmVudCwg bnVtYmVyT2ZEYXlzKTsKKyAgICB9CisKKyAgICBfY2FsbE51bWJlck9mRGF5c0NhbGxiYWNrKGV2 ZW50LCBudW1iZXJPZkRheXMpCisgICAgeworICAgICAgICB2YXIgc2hvdWxkVXBkYXRlU3RhdGUg PSBldmVudC50eXBlID09ICdjaGFuZ2UnOworICAgICAgICBpZiAoKHRoaXMubnVtYmVyT2ZEYXlz KCkgIT0gbnVtYmVyT2ZEYXlzIHx8IHNob3VsZFVwZGF0ZVN0YXRlKSAmJiB0aGlzLl9udW1iZXJP ZkRheXNDYWxsYmFjaykKKyAgICAgICAgICAgIHRoaXMuX251bWJlck9mRGF5c0NhbGxiYWNrKG51 bWJlck9mRGF5cywgc2hvdWxkVXBkYXRlU3RhdGUpOworICAgIH0KKworICAgIHN0YXRpYyBkYXlz Q291bnRMYWJlbFRleHQoKSB7IHJldHVybiBgIGRheXNgOyB9CisKKyAgICBzdGF0aWMgaHRtbFRl bXBsYXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiBgCisgICAgICAgICAgICAgICAgPHVsIGNs YXNzPSJidXR0b25lZC10b29sYmFyIj4KKyAgICAgICAgICAgICAgICAgICAgPGxpIGNsYXNzPSJz dGFydC10aW1lLXNsaWRlciI+CisgICAgICAgICAgICAgICAgICAgICAgICA8bGFiZWw+CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPGlucHV0IGNsYXNzPSJzbGlkZXIiIHR5cGU9InJhbmdl Ij4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8aW5wdXQgY2xhc3M9ImVkaXRvciIgdHlw ZT0ibnVtYmVyIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0ibGFi ZWwiPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iZGF5LWNv dW50IiB0YWJpbmRleD0iMCI+PC9zcGFuPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAkeyB0aGlzLmRheXNDb3VudExhYmVsVGV4dCgpIH0KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8L3NwYW4+CisgICAgICAgICAgICAgICAgICAgICAgICA8L2xhYmVsPgorICAgICAgICAg ICAgICAgICAgICA8L2xpPgorICAgICAgICAgICAgICAgIDwvdWw+YDsKKyAgICB9CisKKyAgICBz dGF0aWMgY3NzVGVtcGxhdGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFRvb2xiYXIuY3NzVGVt cGxhdGUoKSArIGAKKyAgICAgICAgICAgIC5idXR0b25lZC10b29sYmFyIC5zdGFydC10aW1lLXNs aWRlciB7CisgICAgICAgICAgICAgICAgbWFyZ2luLWxlZnQ6IDJyZW07CisgICAgICAgICAgICAg ICAgbGluZS1oZWlnaHQ6IDFlbTsKKyAgICAgICAgICAgICAgICBmb250LXNpemU6IDAuOXJlbTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLnN0YXJ0LXRpbWUtc2xpZGVyIC5sYWJlbCB7 CisgICAgICAgICAgICAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgICAgICAgICAgfQor CisgICAgICAgICAgICAuc3RhcnQtdGltZS1zbGlkZXIgLnNsaWRlciB7CisgICAgICAgICAgICAg ICAgaGVpZ2h0OiAwLjhyZW07CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIC5zdGFydC10 aW1lLXNsaWRlciAuZWRpdG9yIHsKKyAgICAgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CisgICAgICAgICAgICAgICAgb3BhY2l0eTogMDsKKyAgICAgICAgICAgICAgICB3aWR0aDogNHJl bTsKKyAgICAgICAgICAgICAgICBmb250LXdlaWdodDogaW5oZXJpdDsKKyAgICAgICAgICAgICAg ICBmb250LXNpemU6IDAuOHJlbTsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDAuOXJlbTsKKyAg ICAgICAgICAgICAgICBvdXRsaW5lOiBub25lOworICAgICAgICAgICAgICAgIGJvcmRlcjogc29s aWQgMXB4ICNjY2M7CisgICAgICAgICAgICAgICAgei1pbmRleDogNTsKKyAgICAgICAgICAgIH0K KworICAgICAgICAgICAgLnN0YXJ0LXRpbWUtc2xpZGVyIC5kYXktY291bnQgeworICAgICAgICAg ICAgICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICAgICAgICAgICAgICB0ZXh0LWFsaWdu OiByaWdodDsKKyAgICAgICAgICAgICAgICB3aWR0aDogMnJlbTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgYDsKKyAgICB9Cit9CisKK0NvbXBvbmVudEJhc2UuZGVmaW5lRWxlbWVudCgnc2xpZGVy LXRvb2xiYXInLCBTbGlkZXJUb29sYmFyKTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMKaW5kZXggMDg5ZWQ5ODJk N2IuLjk4M2UyOTc0NGEzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVi bGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcwpAQCAtMSw5ICsxLDkgQEAKIAogY2xh c3MgU3VtbWFyeVBhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCi0gICAgY29uc3RydWN0 b3Ioc3VtbWFyeVNldHRpbmdzKQorICAgIGNvbnN0cnVjdG9yKHN1bW1hcnlTZXR0aW5ncywgdG9v bGJhcikKICAgICB7Ci0gICAgICAgIHN1cGVyKHN1bW1hcnlTZXR0aW5ncy5uYW1lLCBudWxsKTsK KyAgICAgICAgc3VwZXIoc3VtbWFyeVNldHRpbmdzLm5hbWUsIHRvb2xiYXIpOwogCiAgICAgICAg IHRoaXMuX3JvdXRlID0gc3VtbWFyeVNldHRpbmdzLnJvdXRlOwogICAgICAgICB0aGlzLl90YWJs ZSA9IHsKQEAgLTMxLDE0ICszMSwyOSBAQCBjbGFzcyBTdW1tYXJ5UGFnZSBleHRlbmRzIFBhZ2VX aXRoSGVhZGluZyB7CiAKICAgICBvcGVuKHN0YXRlKQogICAgIHsKKyAgICAgICAgdGhpcy50b29s YmFyKCkuc2V0TnVtYmVyT2ZEYXlzKDAsIHRydWUpOworICAgICAgICB0aGlzLnRvb2xiYXIoKS5l bnF1ZXVlVG9SZW5kZXIoKTsKKyAgICAgICAgdGhpcy50b29sYmFyKCkuc2V0TnVtYmVyT2ZEYXlz Q2FsbGJhY2sodGhpcy5zZXROdW1iZXJPZkRheXNGcm9tVG9vbGJhci5iaW5kKHRoaXMpKQogICAg ICAgICBzdXBlci5vcGVuKHN0YXRlKTsKKyAgICAgICAgdGhpcy51cGRhdGVBbmRSZW5kZXJGb3JS YW5nZSgwKQorICAgIH0KIAorICAgIHVwZGF0ZUFuZFJlbmRlckZvclJhbmdlKGRheXMpCisgICAg ewogICAgICAgICB2YXIgY3VycmVudCA9IERhdGUubm93KCk7Ci0gICAgICAgIHZhciB0aW1lUmFu Z2UgPSBbY3VycmVudCAtIDI0ICogMzYwMCAqIDEwMDAsIGN1cnJlbnRdOworICAgICAgICB2YXIg b25lRGF5ID0gMjQgKiAzNjAwICogMTAwMDsKKyAgICAgICAgdmFyIHRpbWVSYW5nZSA9IFtjdXJy ZW50IC0gb25lRGF5IC0gKGRheXMgKiBvbmVEYXkpLCBjdXJyZW50IC0gKGRheXMgKiBvbmVEYXkp XTsKICAgICAgICAgZm9yICh2YXIgZ3JvdXAgb2YgdGhpcy5fY29uZmlnR3JvdXBzKQogICAgICAg ICAgICAgZ3JvdXAuZmV0Y2hBbmRDb21wdXRlU3VtbWFyeSh0aW1lUmFuZ2UpLnRoZW4oKCkgPT4g eyB0aGlzLmVucXVldWVUb1JlbmRlcigpOyB9KTsKICAgICB9CiAKKyAgICBzZXROdW1iZXJPZkRh eXNGcm9tVG9vbGJhcihudW1iZXJPZkRheXMsIHNob3VsZFVwZGF0ZVN0YXRlKQorICAgIHsKKyAg ICAgICAgdGhpcy50b29sYmFyKCkuc2V0TnVtYmVyT2ZEYXlzKG51bWJlck9mRGF5cywgdHJ1ZSk7 CisgICAgICAgIHRoaXMudG9vbGJhcigpLmVucXVldWVUb1JlbmRlcigpOworICAgICAgICB0aGlz LnVwZGF0ZUFuZFJlbmRlckZvclJhbmdlKG51bWJlck9mRGF5cyk7CisgICAgfQorCiAgICAgcmVu ZGVyKCkKICAgICB7CiAgICAgICAgIEluc3RydW1lbnRhdGlvbi5zdGFydE1lYXN1cmluZ1RpbWUo J1N1bW1hcnlQYWdlJywgJ3JlbmRlcicpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXRvb2xiYXIuanMgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktdG9vbGJhci5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNjBiMmJkOWEzM2MKLS0tIC9kZXYvbnVsbAor KysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktdG9v bGJhci5qcwpAQCAtMCwwICsxLDU4IEBACitjbGFzcyBTdW1tYXJ5VG9vbGJhciBleHRlbmRzIFNs aWRlclRvb2xiYXIgeworICAgIGNvbnN0cnVjdG9yKCkKKyAgICB7CisgICAgICAgIHN1cGVyKCdz dW1tYXJ5LXRvb2xiYXInLCAwKTsKKworICAgICAgICB0aGlzLl9taW5EYXlDb3VudCA9IDA7Cisg ICAgICAgIHRoaXMuX21heERheUNvdW50ID0gMzY2OworICAgICAgICB0aGlzLl9pblRleHRNb2Rl ID0gZmFsc2U7CisKKyAgICAgICAgdGhpcy5fZGF5Q291bnREZXNjcmlwdGlvbiA9IHRoaXMuY29u dGVudCgnZGF5LWNvdW50LWRlc2NyaXB0aW9uJyk7CisgICAgfQorCisgICAgX2FkZFNsaWRlclRl eHRGb3JtYXR0aW5nRm9yWmVyb0RheXMoKSB7CisgICAgICAgIHRoaXMuX2xhYmVsU3Bhbi50ZXh0 Q29udGVudCA9ICcnOworICAgICAgICB0aGlzLl9sYWJlbFNwYW4uc3R5bGUud2lkdGggPSAnMS4y NXJlbSc7CisgICAgICAgIHRoaXMuX2RheUNvdW50RGVzY3JpcHRpb24uc3R5bGUud2lkdGggPSAn NC41cmVtJzsKKyAgICAgICAgdGhpcy5fZGF5Q291bnREZXNjcmlwdGlvbi50ZXh0Q29udGVudCA9 ICcgQ3VycmVudCc7CisgICAgfQorCisgICAgX3JlbW92ZVNsaWRlclRleHRGb3JtYXR0aW5nRm9y WmVyb0RheXMoKSB7CisgICAgICAgIHRoaXMuX2xhYmVsU3Bhbi5zdHlsZS53aWR0aCA9ICcycmVt JzsKKyAgICAgICAgdGhpcy5fZGF5Q291bnREZXNjcmlwdGlvbi5zdHlsZS53aWR0aCA9ICczLjc1 cmVtJzsKKyAgICAgICAgdGhpcy5fZGF5Q291bnREZXNjcmlwdGlvbi50ZXh0Q29udGVudCA9ICcg ZGF5cyBhZ28nOworICAgIH0KKworICAgIHJlbmRlcigpCisgICAgeworICAgICAgICBzdXBlci5y ZW5kZXIoKTsKKyAgICAgICAgaWYgKHRoaXMuX251bWJlck9mRGF5cyA9PT0gMCAmJiAhdGhpcy5f aW5UZXh0TW9kZSkgeworICAgICAgICAgICAgdGhpcy5fYWRkU2xpZGVyVGV4dEZvcm1hdHRpbmdG b3JaZXJvRGF5cygpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5fcmVtb3Zl U2xpZGVyVGV4dEZvcm1hdHRpbmdGb3JaZXJvRGF5cygpOworICAgICAgICB9CisgICAgfQorCisg ICAgX2VudGVyVGV4dE1vZGUoZXZlbnQpCisgICAgeworICAgICAgICBzdXBlci5fZW50ZXJUZXh0 TW9kZShldmVudCk7CisgICAgICAgIHRoaXMuX2luVGV4dE1vZGUgPSB0cnVlOworICAgICAgICB0 aGlzLl9yZW1vdmVTbGlkZXJUZXh0Rm9ybWF0dGluZ0Zvclplcm9EYXlzKCk7CisgICAgfQorCisg ICAgX2V4aXRUZXh0TW9kZShldmVudCkKKyAgICB7CisgICAgICAgIHN1cGVyLl9leGl0VGV4dE1v ZGUoZXZlbnQpOworICAgICAgICB0aGlzLl9pblRleHRNb2RlID0gZmFsc2U7CisgICAgICAgIGlm ICh0aGlzLl9udW1iZXJPZkRheXMgPT09IDApIHsKKyAgICAgICAgICAgIHRoaXMuX2FkZFNsaWRl clRleHRGb3JtYXR0aW5nRm9yWmVyb0RheXMoKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHN0 YXRpYyBkYXlzQ291bnRMYWJlbFRleHQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGA8bGFiZWwg aWQ9ImRheS1jb3VudC1kZXNjcmlwdGlvbiIgY2xhc3M9ImxhYmVsIj48L2xhYmVsPmA7CisgICAg fQorfQorCitDb21wb25lbnRCYXNlLmRlZmluZUVsZW1lbnQoJ3N1bW1hcnktdG9vbGJhcicsIFN1 bW1hcnlUb29sYmFyKTsK