197296 2019-04-25 14:36:02 -0700 Web Inspector: DOM: rename "low power" to "display composited" 2019-05-03 16:12:11 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes jer.noble joepeck timothy webkit-bug-importer oldest_to_newest 1530523 0 hi 2019-04-25 14:36:02 -0700 "low power" is not the correct term for this, as the power performance is somewhat implied (not a direct cause). 1530544 1 368277 hi 2019-04-25 15:20:21 -0700 Created attachment 368277 Patch 1531298 2 368277 joepeck 2019-04-29 14:23:50 -0700 Comment on attachment 368277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368277&action=review rs=me but I think there could be a better name for it still > Source/JavaScriptCore/ChangeLog:3 > + Web Inspector: DOM: rename "low power" to "display composted" Typo in all ChangeLogs from the bug title: "composted" => "composited" > Source/WebInspectorUI/UserInterface/Images/DisplayCompositedStateChanged.svg:2 > +<?xml version="1.0" encoding="utf-8"?> > +<!-- Copyright © 2013 Apple Inc. All rights reserved. --> This year should probably be 2010 instead of 2013. I see it is changing from an [L] to a [D]. > Source/WebInspectorUI/UserInterface/Models/MediaTimelineRecord.js:90 > + if (this._eventType === WI.MediaTimelineRecord.EventType.DisplayCompositedStateChanged) > + return this._isDisplayComposited ? WI.UIString("Started Display Compositing") : WI.UIString("Stopped Display Compositing"); This name sounds confusing to me. What is "Display Compositing"? I like the idea of "Started/Stopped Efficient Video Rendering" or something specific to the video compositing display. 1531308 3 368277 hi 2019-04-29 14:39:10 -0700 Comment on attachment 368277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368277&action=review >> Source/JavaScriptCore/ChangeLog:3 >> + Web Inspector: DOM: rename "low power" to "display composted" > > Typo in all ChangeLogs from the bug title: "composted" => "composited" LOOL, nah we should call it "display composted" 😂 >> Source/WebInspectorUI/UserInterface/Images/DisplayCompositedStateChanged.svg:2 >> +<!-- Copyright © 2013 Apple Inc. All rights reserved. --> > > This year should probably be 2010 instead of 2013. I see it is changing from an [L] to a [D]. This was copied from `DOMDocument.svg` which is 2013. 1532995 4 368996 hi 2019-05-03 14:55:21 -0700 Created attachment 368996 Patch 1533032 5 369007 hi 2019-05-03 15:49:38 -0700 Created attachment 369007 Patch 1533043 6 369007 commit-queue 2019-05-03 16:08:25 -0700 Comment on attachment 369007 Patch Clearing flags on attachment: 369007 Committed r244933: <https://trac.webkit.org/changeset/244933> 1533044 7 commit-queue 2019-05-03 16:08:27 -0700 All reviewed patches have been landed. Closing bug. 1533047 8 webkit-bug-importer 2019-05-03 16:12:11 -0700 <rdar://problem/50461053> 368277 2019-04-25 15:20:21 -0700 2019-05-03 14:55:19 -0700 Patch bug-197296-20190425152020.patch text/plain 37283 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGZhYWE1YjkzNTM2Yzk5MjY1ZDEyODUxNGZhYzll YTYwNjlkYWJlY2IuLjk1NGMxY2M1NmY2MDZmNjI4YTYzYmMzYTQ0NjBiNGU3MGQxOGMyNTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA0LTI1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IHJlbmFtZSAibG93IHBvd2VyIiB0byAiZGlzcGxheSBjb21wb3N0ZWQiCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyOTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHNwZWNpZmljIENo YW5nZUxvZyBlbnRyaWVzIHNpbmNlIGl0IGlzIGFsbW9zdCBlbnRpcmVseSBtZWNoYW5pY2FsIGNo YW5nZXMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb246CisKIDIwMTkt MDQtMjQgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIFNQ SSBjYWxsYmFja3MgZm9yIGJlZm9yZSBhbmQgYWZ0ZXIgbW9kdWxlIGV4ZWN1dGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGI5Zjk0ZTdkY2VlOTJmNzI3N2MyYmIyY2EzZWM5MTA2N2IyNmQ2M2UuLjFmMDZhMjZj YmRjYjlmMjBiZDk0YmNmNTRjODk5NmZjODFlYzFhNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxOS0wNC0yNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAg ICAgICAgV2ViIEluc3BlY3RvcjogRE9NOiByZW5hbWUgImxvdyBwb3dlciIgdG8gImRpc3BsYXkg Y29tcG9zdGVkIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk3Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlZCBzcGVjaWZpYyBDaGFuZ2VMb2cgZW50cmllcyBzaW5jZSBpdCBpcyBhbG1vc3Qg ZW50aXJlbHkgbWVjaGFuaWNhbCBjaGFuZ2VzLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50 cy9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yRE9NQWdlbnQuY3BwOgorCiAyMDE5LTA0LTI0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lvbiAocjI0NDI5MSk6IEJyb2tlbiBBUEkgVGVzdCBB dXRvTGF5b3V0UmVuZGVyaW5nUHJvZ3Jlc3NSZWxhdGl2ZU9yZGVyaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZwppbmRleCBjZDJhODBiM2VhYWViZmRjMGEzYmQ4OTkyYjYzYzE4Nzc3Mzg3MWEwLi44 OTYyYTFkNmNmODlhYWEyMjAxZGZkOTYxMmZlOWYyZTBiY2RjYjczIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxOS0wNC0yNSAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NOiByZW5hbWUgImxv dyBwb3dlciIgdG8gImRpc3BsYXkgY29tcG9zdGVkIgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCBzcGVjaWZpYyBDaGFuZ2VMb2cgZW50cmll cyBzaW5jZSBpdCBpcyBhbG1vc3QgZW50aXJlbHkgbWVjaGFuaWNhbCBjaGFuZ2VzLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVs cy9NZWRpYUluc3RydW1lbnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvTWVk aWFUaW1lbGluZVJlY29yZC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9UaW1l bGluZVJlY29yZGluZy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTUV2ZW50 c0JyZWFrZG93blZpZXcuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVu dHNCcmVha2Rvd25WaWV3LmNzczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RhYmxlQ29udGVudFZpZXcuY3NzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVJY29ucy5jc3M6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2VzL0Rpc3Bs YXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkLnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlckludGVy ZmFjZS9JbWFnZXMvTG93UG93ZXIuc3ZnOiBSZW1vdmVkLgorICAgICAgICAqIExvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAxOS0wNC0yNCAgTmlraXRhIFZh c2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZXM6IGRvbid0IHN0YXJ0IHByb3BlcnR5IHNlbGVjdGlvbiB3aGVuIHByZXNzaW5nIHJpZ2h0 IG1vdXNlIGJ1dHRvbgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9wcm90b2NvbC9ET00uanNvbiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJv dG9jb2wvRE9NLmpzb24KaW5kZXggMTE5NWU4ODZkZTkyYTE3MWFkZTQ4ZTgzMmM2YTA2YTYzNDU0 MjFmMC4uNWVhZmVhY2FkMjIwMjk4ZDljYmQzYjFjY2IzNmZhOTIyYWQ2ZTBlYSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbgorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uCkBAIC02 NzcsMTIgKzY3NywxMiBAQAogICAgICAgICAgICAgXQogICAgICAgICB9LAogICAgICAgICB7Ci0g ICAgICAgICAgICAibmFtZSI6ICJ2aWRlb0xvd1Bvd2VyQ2hhbmdlZCIsCi0gICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiQ2FsbGVkIHdoZW4gYSB2aWRlbyBlbGVtZW50IGVudGVycy9leGl0cyBs b3cgcG93ZXIgbW9kZS4iLAorICAgICAgICAgICAgIm5hbWUiOiAiZGlzcGxheUNvbXBvc2l0ZWRT dGF0ZUNoYW5nZWQiLAorICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNhbGxlZCB3aGVuIGFu IGVsZW1lbnQgZW50ZXJzL2V4aXRzIGEgZGlzcGxheSBjb21wb3NpdGVkIHN0YXRlLiIsCiAgICAg ICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJ ZCIsICIkcmVmIjogIk5vZGVJZCIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWVz dGFtcCIsICIkcmVmIjogIk5ldHdvcmsuVGltZXN0YW1wIiwgImRlc2NyaXB0aW9uIjogIlRpbWUg d2hlbiB0aGUgdmlkZW8gZWxlbWVudCBlbnRlcmVkL2V4aXRlZCBsb3cgcG93ZXIgbW9kZSIgfSwK LSAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlzTG93UG93ZXIiLCAidHlwZSI6ICJib29sZWFu IiB9CisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAiJHJlZiI6ICJOZXR3 b3JrLlRpbWVzdGFtcCIgfSwKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlzRGlzcGxheUNv bXBvc2l0ZWQiLCAidHlwZSI6ICJib29sZWFuIiB9CiAgICAgICAgICAgICBdCiAgICAgICAgIH0K ICAgICBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3Bl Y3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yRE9NQWdlbnQuY3BwCmluZGV4IGNlNmEyNzk4YzI1Y2QyNjhkNWIyYzYyYzJkNjYwMTg1YzM0 YWM2ZjAuLjEyMzNmMTlhNDdjYjFjYWExNDcxNjE1MjhhNWYxOTU3NzAzYWU3MDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQu Y3BwCkBAIC0yNTE0LDE0ICsyNTE0LDE0IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6Om1lZGlh TWV0cmljc1RpbWVyRmlyZWQoKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAot ICAgICAgICBib29sIGlzTG93UG93ZXIgPSAoZGlzcGxheUNvbXBvc2l0ZWRWaWRlb0ZyYW1lcyAt IGl0ZXJhdG9yLT52YWx1ZS5kaXNwbGF5Q29tcG9zaXRlZEZyYW1lcykgPiAwOwotICAgICAgICBp ZiAoaXRlcmF0b3ItPnZhbHVlLmlzTG93UG93ZXIgIT0gaXNMb3dQb3dlcikgewotICAgICAgICAg ICAgaXRlcmF0b3ItPnZhbHVlLmlzTG93UG93ZXIgPSBpc0xvd1Bvd2VyOworICAgICAgICBib29s IGlzRGlzcGxheUNvbXBvc2l0ZWQgPSAoZGlzcGxheUNvbXBvc2l0ZWRWaWRlb0ZyYW1lcyAtIGl0 ZXJhdG9yLT52YWx1ZS5kaXNwbGF5Q29tcG9zaXRlZEZyYW1lcykgPiAwOworICAgICAgICBpZiAo aXRlcmF0b3ItPnZhbHVlLmlzRGlzcGxheUNvbXBvc2l0ZWQgIT0gaXNEaXNwbGF5Q29tcG9zaXRl ZCkgeworICAgICAgICAgICAgaXRlcmF0b3ItPnZhbHVlLmlzRGlzcGxheUNvbXBvc2l0ZWQgPSBp c0Rpc3BsYXlDb21wb3NpdGVkOwogCiAgICAgICAgICAgICBpbnQgbm9kZUlkID0gcHVzaE5vZGVQ YXRoVG9Gcm9udGVuZChtZWRpYUVsZW1lbnQpOwogICAgICAgICAgICAgaWYgKG5vZGVJZCkgewog ICAgICAgICAgICAgICAgIGF1dG8gdGltZXN0YW1wID0gbV9lbnZpcm9ubWVudC5leGVjdXRpb25T dG9wd2F0Y2goKS0+ZWxhcHNlZFRpbWUoKS5zZWNvbmRzKCk7Ci0gICAgICAgICAgICAgICAgbV9m cm9udGVuZERpc3BhdGNoZXItPnZpZGVvTG93UG93ZXJDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1w LCBpdGVyYXRvci0+dmFsdWUuaXNMb3dQb3dlcik7CisgICAgICAgICAgICAgICAgbV9mcm9udGVu ZERpc3BhdGNoZXItPmRpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0 YW1wLCBpdGVyYXRvci0+dmFsdWUuaXNEaXNwbGF5Q29tcG9zaXRlZCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50 cy9JbnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JET01BZ2VudC5oCmluZGV4IGRmMjNjZWQ2MmViZDVjM2NkOWE4MDIzNTQ0YWMwNWY3 ODY5NmJmM2MuLmI5MjZlMGRiNjMxZDk1YjllYmMyMTcyZjFhYThhZWM2M2Y1MTk5ZWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50 LmgKQEAgLTI2NCw3ICsyNjQsNyBAQCBwcml2YXRlOgogICAgIFRpbWVyIG1fbWVkaWFNZXRyaWNz VGltZXI7CiAgICAgc3RydWN0IE1lZGlhTWV0cmljcyB7CiAgICAgICAgIHVuc2lnbmVkIGRpc3Bs YXlDb21wb3NpdGVkRnJhbWVzIHsgMCB9OwotICAgICAgICBib29sIGlzTG93UG93ZXIgeyBmYWxz ZSB9OworICAgICAgICBib29sIGlzRGlzcGxheUNvbXBvc2l0ZWQgeyBmYWxzZSB9OwogCiAgICAg ICAgIE1lZGlhTWV0cmljcygpIHsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpp bmRleCA1MWE2ZTg1OGY3MGVlNGI5MTI3MGM5MTI5Y2Q4YzdmMWEzNGM4MTVhLi43ODAyYTRjYTM5 NGYzOGIxMDA3NjVjYmEyMTY4MThmNDM5MWM4ZmJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKQEAgLTMzNCw2ICszMzQsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJEaXNhYmxlIHBh aW50IGZsYXNoaW5nIl0gPSAiRGlzYWJsZSBwYWludCBmbGFzaGluZyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJEaXNhYmxlOiJdID0gIkRpc2FibGU6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkRpc2FibGVk Il0gPSAiRGlzYWJsZWQiOwogbG9jYWxpemVkU3RyaW5nc1siRGlzayBDYWNoZSJdID0gIkRpc2sg Q2FjaGUiOworbG9jYWxpemVkU3RyaW5nc1siRGlzcGxheSBDb21wb3NpdGVkIl0gPSAiRGlzcGxh eSBDb21wb3NpdGVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRpc3BsYXllZCBDb2x1bW5zIl0gPSAi RGlzcGxheWVkIENvbHVtbnMiOwogbG9jYWxpemVkU3RyaW5nc1siRG8gbm90IGNsZWFyIG5ldHdv cmsgaXRlbXMgb24gbmV3IHBhZ2UgbG9hZHMiXSA9ICJEbyBub3QgY2xlYXIgbmV0d29yayBpdGVt cyBvbiBuZXcgcGFnZSBsb2FkcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEbyBub3QgY2xlYXIgdGhl IGNvbnNvbGUgb24gbmV3IHBhZ2UgbG9hZHMiXSA9ICJEbyBub3QgY2xlYXIgdGhlIGNvbnNvbGUg b24gbmV3IHBhZ2UgbG9hZHMiOwpAQCAtNDIxLDcgKzQyMiw2IEBAIGxvY2FsaXplZFN0cmluZ3Nb IkVuc3VyZSB0aGF0IG9ubHkgb25lIGxpdmUgcmVnaW9uIGlzIHVzZWQgb24gdGhlIHBhZ2UuIl0g PSAiRW5zCiBsb2NhbGl6ZWRTdHJpbmdzWyJFbnN1cmUgdGhhdCBvbmx5IG9uZSBtYWluIGNvbnRl bnQgc2VjdGlvbiBpcyB1c2VkIG9uIHRoZSBwYWdlLiJdID0gIkVuc3VyZSB0aGF0IG9ubHkgb25l IG1haW4gY29udGVudCBzZWN0aW9uIGlzIHVzZWQgb24gdGhlIHBhZ2UuIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkVuc3VyZSB0aGF0IHZhbHVlcyBmb3IgXHUwMDIyJXNcdTAwMjIgYXJlIHZhbGlkLiJd ID0gIkVuc3VyZSB0aGF0IHZhbHVlcyBmb3IgXHUwMDIyJXNcdTAwMjIgYXJlIHZhbGlkLiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJFbnRlcmVkIEZ1bGwtU2NyZWVuIE1vZGUiXSA9ICJFbnRlcmVkIEZ1 bGwtU2NyZWVuIE1vZGUiOwotbG9jYWxpemVkU3RyaW5nc1siRW50ZXJlZCBMb3ctUG93ZXIgTW9k ZSJdID0gIkVudGVyZWQgTG93LVBvd2VyIE1vZGUiOwogbG9jYWxpemVkU3RyaW5nc1siRW50aXJl IFJlY29yZGluZyJdID0gIkVudGlyZSBSZWNvcmRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siRXJy b3IiXSA9ICJFcnJvciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFcnJvcjogIl0gPSAiRXJyb3I6ICI7 CkBAIC00NDIsNyArNDQyLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRXhhbXBsZTogXHUyMDFDJXNc dTIwMUQiXSA9ICJFeGFtcGxlOiBcdTIwMUMlc1x1MjAxRCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJF eGNlcHRpb24gd2l0aCB0aHJvd24gdmFsdWU6ICVzIl0gPSAiRXhjZXB0aW9uIHdpdGggdGhyb3du IHZhbHVlOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFeGVjdXRpb24gY29udGV4dCBmb3IgJDAi XSA9ICJFeGVjdXRpb24gY29udGV4dCBmb3IgJDAiOwogbG9jYWxpemVkU3RyaW5nc1siRXhpdGVk IEZ1bGwtU2NyZWVuIE1vZGUiXSA9ICJFeGl0ZWQgRnVsbC1TY3JlZW4gTW9kZSI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJFeGl0ZWQgTG93LVBvd2VyIE1vZGUiXSA9ICJFeGl0ZWQgTG93LVBvd2VyIE1v ZGUiOwogbG9jYWxpemVkU3RyaW5nc1siRXhwYW5kIEFsbCJdID0gIkV4cGFuZCBBbGwiOwogbG9j YWxpemVkU3RyaW5nc1siRXhwYW5kIGNvbHVtbnMiXSA9ICJFeHBhbmQgY29sdW1ucyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJFeHBhbmRlZCJdID0gIkV4cGFuZGVkIjsKQEAgLTYyOCw3ICs2MjcsNiBA QCBsb2NhbGl6ZWRTdHJpbmdzWyJMb2cgV2ViU29ja2V0Il0gPSAiTG9nIFdlYlNvY2tldCI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJMb2c6ICJdID0gIkxvZzogIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxv Z3MiXSA9ICJMb2dzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvdyJdID0gIkxvdyI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJMb3ctUG93ZXIgTW9kZSJdID0gIkxvdy1Qb3dlciBNb2RlIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkxvd2VzdDogJXMiXSA9ICJMb3dlc3Q6ICVzIjsKIGxvY2FsaXplZFN0cmluZ3Nb Ik1JTUUgVHlwZSJdID0gIk1JTUUgVHlwZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNSU1FIFR5cGU6 Il0gPSAiTUlNRSBUeXBlOiI7CkBAIC05OTEsNiArOTg5LDcgQEAgbG9jYWxpemVkU3RyaW5nc1si U3RhcnQgZWxlbWVudCBzZWxlY3Rpb24gKCVzKSJdID0gIlN0YXJ0IGVsZW1lbnQgc2VsZWN0aW9u ICglcykKIGxvY2FsaXplZFN0cmluZ3NbIlN0YXJ0IHJlY29yZGluZyAoJXMpXG5DcmVhdGUgbmV3 IHJlY29yZGluZyAoJXMpIl0gPSAiU3RhcnQgcmVjb3JkaW5nICglcylcbkNyZWF0ZSBuZXcgcmVj b3JkaW5nICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siU3RhcnQgcmVjb3JkaW5nIGNhbnZhcyBh Y3Rpb25zLlxuU2hpZnQtY2xpY2sgdG8gcmVjb3JkIGEgc2luZ2xlIGZyYW1lLiJdID0gIlN0YXJ0 IHJlY29yZGluZyBjYW52YXMgYWN0aW9ucy5cblNoaWZ0LWNsaWNrIHRvIHJlY29yZCBhIHNpbmds ZSBmcmFtZS4iOwogbG9jYWxpemVkU3RyaW5nc1siU3RhcnQgdG8gRmluaXNoIl0gPSAiU3RhcnQg dG8gRmluaXNoIjsKK2xvY2FsaXplZFN0cmluZ3NbIlN0YXJ0ZWQgRGlzcGxheSBDb21wb3NpdGlu ZyJdID0gIlN0YXJ0ZWQgRGlzcGxheSBDb21wb3NpdGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJT dGF0ZSJdID0gIlN0YXRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0YXRpc3RpY3MiXSA9ICJTdGF0 aXN0aWNzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0YXR1cyJdID0gIlN0YXR1cyI7CkBAIC0xMDA3 LDYgKzEwMDYsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIHJlY29yZGluZyJdID0gIlN0b3Ag cmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0b3AgcmVjb3JkaW5nICglcykiXSA9ICJT dG9wIHJlY29yZGluZyAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0b3AgcmVjb3JkaW5nIGNh bnZhcyBhY3Rpb25zIl0gPSAiU3RvcCByZWNvcmRpbmcgY2FudmFzIGFjdGlvbnMiOwogbG9jYWxp emVkU3RyaW5nc1siU3RvcCByZWNvcmRpbmcgb25jZSBwYWdlIGxvYWRzIl0gPSAiU3RvcCByZWNv cmRpbmcgb25jZSBwYWdlIGxvYWRzIjsKK2xvY2FsaXplZFN0cmluZ3NbIlN0b3BwZWQgRGlzcGxh eSBDb21wb3NpdGluZyJdID0gIlN0b3BwZWQgRGlzcGxheSBDb21wb3NpdGluZyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJTdG9wcGluZyB0aGUgXHUyMDFDJXNcdTIwMUQgYXVkaXQiXSA9ICJTdG9wcGlu ZyB0aGUgXHUyMDFDJXNcdTIwMUQgYXVkaXQiOwogbG9jYWxpemVkU3RyaW5nc1siU3RvcmFnZSJd ID0gIlN0b3JhZ2UiOwogbG9jYWxpemVkU3RyaW5nc1siU3R5bGUgQXR0cmlidXRlIl0gPSAiU3R5 bGUgQXR0cmlidXRlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCmluZGV4IGY2OGQ4OTQwOWMw NDExNTdlODk5OWVmMzYxYjgyNDM2ZTI4M2UxYTcuLmU3NGY3N2NkMmViMTYzYTBiNzYwZGYwNTc3 NmFkYTRjNjg2ZTNjM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwpAQCAtMTY2LDcgKzE2 Niw3IEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgIG5vZGUuZGlkRmlyZUV2ZW50KGV2ZW50TmFtZSwgdGltZXN0YW1wLCBkYXRhKTsK ICAgICB9CiAKLSAgICB2aWRlb0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXNM b3dQb3dlcikKKyAgICBkaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZChub2RlSWQsIHRpbWVz dGFtcCwgaXNEaXNwbGF5Q29tcG9zaXRlZCkKICAgICB7CiAgICAgICAgIC8vIENhbGxlZCBmcm9t IFdJLkRPTU9ic2VydmVyLgogCkBAIC0xNzQsNyArMTc0LDcgQEAgV0kuRE9NTWFuYWdlciA9IGNs YXNzIERPTU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKCFub2RlKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIG5vZGUudmlkZW9Mb3dQb3dlckNoYW5nZWQodGlt ZXN0YW1wLCBpc0xvd1Bvd2VyKTsKKyAgICAgICAgbm9kZS5kaXNwbGF5Q29tcG9zaXRlZFN0YXRl Q2hhbmdlZCh0aW1lc3RhbXAsIGlzRGlzcGxheUNvbXBvc2l0ZWQpOwogICAgIH0KIAogICAgIC8v IFByaXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCBmZTUxNGM3 NTVhNzY4OWYxZjg2MDhmY2YzODliYjBjOWFkYzc1YTVkLi4zYTFhNWQyOTQwYTU4NTdmMjc2MjJm ZGIxNWI5YzZlMWM1YzM3ZWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpz CkBAIC0zNjUsNyArMzY1LDcgQEAgV0kuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVN YW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIFdJLm1lbW9yeU1hbmFnZXIuYWRkRXZl bnRMaXN0ZW5lcihXSS5NZW1vcnlNYW5hZ2VyLkV2ZW50Lk1lbW9yeVByZXNzdXJlLCB0aGlzLl9t ZW1vcnlQcmVzc3VyZSwgdGhpcyk7CiAKICAgICAgICAgV0kuRE9NTm9kZS5hZGRFdmVudExpc3Rl bmVyKFdJLkRPTU5vZGUuRXZlbnQuRGlkRmlyZUV2ZW50LCB0aGlzLl9oYW5kbGVET01Ob2RlRGlk RmlyZUV2ZW50LCB0aGlzKTsKLSAgICAgICAgV0kuRE9NTm9kZS5hZGRFdmVudExpc3RlbmVyKFdJ LkRPTU5vZGUuRXZlbnQuTG93UG93ZXJDaGFuZ2VkLCB0aGlzLl9oYW5kbGVET01Ob2RlTG93UG93 ZXJDaGFuZ2VkLCB0aGlzKTsKKyAgICAgICAgV0kuRE9NTm9kZS5hZGRFdmVudExpc3RlbmVyKFdJ LkRPTU5vZGUuRXZlbnQuRGlzcGxheUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQsIHRoaXMuX2hhbmRs ZURPTU5vZGVEaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAg dGhpcy5fdXBkYXRlQ2FwdHVyaW5nU3RhdGUoVGltZWxpbmVNYW5hZ2VyLkNhcHR1cmluZ1N0YXRl LkFjdGl2ZSwge3N0YXJ0VGltZTogdGhpcy5fY2FwdHVyaW5nU3RhcnRUaW1lfSk7CiAgICAgfQpA QCAtMTI0OCwxMyArMTI0OCwxMyBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGlu ZU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfSkpOwogICAgIH0KIAotICAgIF9o YW5kbGVET01Ob2RlTG93UG93ZXJDaGFuZ2VkKGV2ZW50KQorICAgIF9oYW5kbGVET01Ob2RlRGlz cGxheUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQoZXZlbnQpCiAgICAgewotICAgICAgICBsZXQge3Rp bWVzdGFtcCwgaXNMb3dQb3dlcn0gPSBldmVudC5kYXRhOworICAgICAgICBsZXQge3RpbWVzdGFt cCwgaXNEaXNwbGF5Q29tcG9zaXRlZH0gPSBldmVudC5kYXRhOwogCi0gICAgICAgIHRoaXMuX2Fk ZFJlY29yZChuZXcgV0kuTWVkaWFUaW1lbGluZVJlY29yZChXSS5NZWRpYVRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5Mb3dQb3dlciwgdGltZXN0YW1wLCB7CisgICAgICAgIHRoaXMuX2FkZFJlY29y ZChuZXcgV0kuTWVkaWFUaW1lbGluZVJlY29yZChXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50 VHlwZS5EaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZCwgdGltZXN0YW1wLCB7CiAgICAgICAg ICAgICBkb21Ob2RlOiBldmVudC50YXJnZXQsCi0gICAgICAgICAgICBpc0xvd1Bvd2VyLAorICAg ICAgICAgICAgaXNEaXNwbGF5Q29tcG9zaXRlZCwKICAgICAgICAgfSkpOwogICAgIH0KIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvRGlz cGxheUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL0Rpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkLnN2ZwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4yN2JmOTYxYjU2YzhiZDUwM2ZlOWQ4MzU5MzBlYTkzODI4OTgwNTJhCi0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Rp c3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkLnN2ZwpAQCAtMCwwICsxLDggQEAKKzw/eG1sIHZl cnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDEzIEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gLS0+Cis8c3ZnIHhtbG5zPSJodHRwOi8vd3d3 LnczLm9yZy8yMDAwL3N2ZyIgaWQ9InJvb3QiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2 IDE2Ij4KKyAgICA8cGF0aCBmaWxsPSJyZ2IoMTQ4LCAxOTAsIDE2NCkiIGQ9Ik0gMTMgMSBMIDMg MSBDIDEuODk4NDM4IDEgMSAxLjg5ODQzOCAxIDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIgMS44OTg0 MzggMTUgMyAxNSBMIDEzIDE1IEMgMTQuMTAxNTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAxMyBMIDE1 IDMgQyAxNSAxLjg5ODQzOCAxNC4xMDE1NjIgMSAxMyAxIFoiLz4KKyAgICA8cGF0aCBmaWxsPSJy Z2IoMTAxLCAxNjEsIDEzNCkiIGQ9Ik0gMTMgMSBMIDMgMSBDIDEuODk4NDM4IDEgMSAxLjg5ODQz OCAxIDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIgMS44OTg0MzggMTUgMyAxNSBMIDEzIDE1IEMgMTQu MTAxNTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAxMyBMIDE1IDMgQyAxNSAxLjg5ODQzOCAxNC4xMDE1 NjIgMSAxMyAxIE0gMTMgMiBDIDEzLjU1MDc4MSAyIDE0IDIuNDQ5MjE5IDE0IDMgTCAxNCAxMyBD IDE0IDEzLjU1MDc4MSAxMy41NTA3ODEgMTQgMTMgMTQgTCAzIDE0IEMgMi40NDkyMTkgMTQgMiAx My41NTA3ODEgMiAxMyBMIDIgMyBDIDIgMi40NDkyMTkgMi40NDkyMTkgMiAzIDIgTCAxMyAyIi8+ CisgICAgPHBhdGggZmlsbD0icmdiKDEwMSwgMTYxLCAxMzQpIiBkPSJNIDQuNDQ1MzEyIDEyLjc0 MjE4OCBDIDMuODkwNjI1IDEyLjc0MjE4OCAzLjQ0NTMxMiAxMi4yOTI5NjkgMy40NDUzMTIgMTEu NzQyMTg4IEwgMy40NDUzMTIgMy43OTI5NjkgQyAzLjQ0NTMxMiAzLjI0MjE4OCAzLjg5MDYyNSAy Ljc5Mjk2OSA0LjQ0NTMxMiAyLjc5Mjk2OSBMIDcuODY3MTg4IDIuNzkyOTY5IEMgOS4zNjcxODgg Mi43OTI5NjkgMTAuNTU0Njg4IDMuMjIyNjU2IDExLjQwMjM0NCA0LjA2MjUgQyAxMi4yNSA0Ljkx MDE1NiAxMi42Nzk2ODggNi4xMDE1NjIgMTIuNjc5Njg4IDcuNjAxNTYyIEMgMTIuNjc5Njg4IDku MTcxODc1IDEyLjIzNDM3NSAxMC40Mjk2ODggMTEuMzU5Mzc1IDExLjM0NzY1NiBDIDEwLjQ3MjY1 NiAxMi4yNzM0MzggOS4yNDYwOTQgMTIuNzQyMTg4IDcuNzE4NzUgMTIuNzQyMTg4IEwgNC40NDUz MTIgMTIuNzQyMTg4IE0gNy4zMzU5MzggOS42MTMyODEgQyA4LjE4NzUgOS42MTMyODEgOC40NDky MTkgOS4zMjQyMTkgOC41MzUxNTYgOS4yMjY1NjIgQyA4Ljc4OTA2MiA4Ljk0MTQwNiA4LjkyMTg3 NSA4LjQxNDA2MiA4LjkyMTg3NSA3LjY5OTIxOSBDIDguOTIxODc1IDcuMTQwNjI1IDguODEyNSA2 LjcwMzEyNSA4LjU3ODEyNSA2LjM2MzI4MSBDIDguNDU3MDMxIDYuMTgzNTk0IDguMzI4MTI1IDYu MDcwMzEyIDguMTg3NSA2LjAxMTcxOSBDIDguMDYyNSA1Ljk2NDg0NCA3Ljc2MTcxOSA1Ljg4Mjgx MiA3LjA5NzY1NiA1Ljg4MjgxMiBDIDcuMDk3NjU2IDYuOTYwOTM4IDcuMDk3NjU2IDguNTM5MDYy IDcuMDk3NjU2IDkuNjEzMjgxIEMgNy4xNzE4NzUgOS42MTMyODEgNy4zMzU5MzggOS42MTMyODEg Ny4zMzU5MzggOS42MTMyODEiLz4KKyAgICA8cGF0aCBmaWxsPSJ3aGl0ZSIgZD0iTSA0LjQ0NTMx MiAxMS43NDIxODggTCA0LjQ0NTMxMiAzLjc5Mjk2OSBMIDcuODY3MTg4IDMuNzkyOTY5IEMgOS4w OTc2NTYgMy43OTI5NjkgMTAuMDM5MDYyIDQuMTIxMDk0IDEwLjY5NTMxMiA0Ljc3MzQzOCBDIDEx LjM1MTU2MiA1LjQyNTc4MSAxMS42Nzk2ODggNi4zNzEwOTQgMTEuNjc5Njg4IDcuNjAxNTYyIEMg MTEuNjc5Njg4IDguOTEwMTU2IDExLjMzMjAzMSA5LjkyOTY4OCAxMC42MzY3MTkgMTAuNjU2MjUg QyA5Ljk0MTQwNiAxMS4zNzg5MDYgOC45Njg3NSAxMS43NDIxODggNy43MTg3NSAxMS43NDIxODgg WiBNIDYuMDk3NjU2IDEwLjYxMzI4MSBMIDcuMzMyMDMxIDEwLjYxMzI4MSBDIDguMjAzMTI1IDEw LjYxMzI4MSA4Ljg1MTU2MiAxMC4zNzUgOS4yODEyNSA5Ljg5MDYyNSBDIDkuNzA3MDMxIDkuNDEw MTU2IDkuOTIxODc1IDguNjc5Njg4IDkuOTIxODc1IDcuNjk5MjE5IEMgOS45MjE4NzUgNi45Mzc1 IDkuNzUgNi4zMDg1OTQgOS40MDYyNSA1LjgwMDc4MSBDIDkuMTcxODc1IDUuNDUzMTI1IDguODg2 NzE5IDUuMjE0ODQ0IDguNTU0Njg4IDUuMDgyMDMxIEMgOC4yMTg3NSA0Ljk0OTIxOSA3LjczNDM3 NSA0Ljg4MjgxMiA3LjA5NzY1NiA0Ljg4MjgxMiBMIDYuMDk3NjU2IDQuODgyODEyIFoiLz4KKzwv c3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1h Z2VzL0xvd1Bvd2VyLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0lt YWdlcy9Mb3dQb3dlci5zdmcKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDFiNmUzODIw ODA2Zjc5Y2QyOWQwMDgyMzVmNjY3OWRmYjRlN2JmZmMuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0xvd1Bvd2VyLnN2ZworKysgL2Rldi9udWxsCkBAIC0xLDggKzAsMCBAQAotPD94 bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KLTwhLS0gQ29weXJpZ2h0IMKpIDIw MTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KLTxzdmcgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0icm9vdCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIw IDAgMTYgMTYiPgotICAgIDxwYXRoIGZpbGw9InJnYigxNDgsIDE5MCwgMTY0KSIgZD0iTSAxMyAx IEwgMyAxIEMgMS44OTg0MzggMSAxIDEuODk4NDM4IDEgMyBMIDEgMTMgQyAxIDE0LjEwMTU2MiAx Ljg5ODQzOCAxNSAzIDE1IEwgMTMgMTUgQyAxNC4xMDE1NjIgMTUgMTUgMTQuMTAxNTYyIDE1IDEz IEwgMTUgMyBDIDE1IDEuODk4NDM4IDE0LjEwMTU2MiAxIDEzIDEgWiIvPgotICAgIDxwYXRoIGZp bGw9InJnYigxMDEsIDE2MSwgMTM0KSIgZD0iTSAxMyAxIEwgMyAxIEMgMS44OTg0MzggMSAxIDEu ODk4NDM4IDEgMyBMIDEgMTMgQyAxIDE0LjEwMTU2MiAxLjg5ODQzOCAxNSAzIDE1IEwgMTMgMTUg QyAxNC4xMDE1NjIgMTUgMTUgMTQuMTAxNTYyIDE1IDEzIEwgMTUgMyBDIDE1IDEuODk4NDM4IDE0 LjEwMTU2MiAxIDEzIDEgTSAxMyAyIEMgMTMuNTUwNzgxIDIgMTQgMi40NDkyMTkgMTQgMyBMIDE0 IDEzIEMgMTQgMTMuNTUwNzgxIDEzLjU1MDc4MSAxNCAxMyAxNCBMIDMgMTQgQyAyLjQ0OTIxOSAx NCAyIDEzLjU1MDc4MSAyIDEzIEwgMiAzIEMgMiAyLjQ0OTIxOSAyLjQ0OTIxOSAyIDMgMiBMIDEz IDIiLz4KLSAgICA8cGF0aCBmaWxsPSJyZ2IoMTAxLCAxNjEsIDEzNCkiIGQ9Ik0gNSAxMyBMIDYg MTMgTCAxMSAxMyBMIDEyIDEzIEwgMTIgMTIgTCAxMiAxMC44NjQ4NjQ5IEwgMTIgOS44NjQ4NjQ4 NiBMIDExIDkuODY0ODY0ODYgTCA4LjU3OTQ4NzA5IDkuODY0ODY0ODMgTCA4LjU3OTQ4NzE4IDQg TCA4LjU3OTQ4NzE4IDMgTCA3LjU3OTQ4NzE4IDMgTCA2IDMgTCA1IDMgTCA1IDQgTCA1IDEyIEwg NSAxMyBaIE0gNSAxMyIvPgotICAgIDxwYXRoIGZpbGw9IndoaXRlIiBkPSJNIDYgNCBMIDcuNTc5 NDg3MTggNCBMIDcuNTc5NDg3MTggMTAuODY0ODY0OSBMIDExIDEwLjg2NDg2NDkgTCAxMSAxMiBM IDYgMTIgTCA2IDQgWiBNIDYgNCIvPgotPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCmluZGV4IDE4YjdlMTVmZGNi ODE1OTU5NWRlNDFlNDY4Yjk2MGM3MmNkYmE1MjMuLmMzMDA0MmZkODAyYWZhZTc0Yzg4NzAyNGNk YjdjN2Q4MTdlYTM5NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC0xNDcsNyArMTQ3LDcgQEAgV0kuRE9NTm9k ZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfQogCiAgICAgICAg IHRoaXMuX2RvbUV2ZW50cyA9IFtdOwotICAgICAgICB0aGlzLl9sb3dQb3dlclJhbmdlcyA9IFtd OworICAgICAgICB0aGlzLl9kaXNwbGF5Q29tcG9zaXRlZFJhbmdlcyA9IFtdOwogCiAgICAgICAg IGlmICh0aGlzLl9zaG91bGRMaXN0ZW5Gb3JFdmVudExpc3RlbmVycygpKQogICAgICAgICAgICAg V0kuRE9NTm9kZS5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU5vZGUuRXZlbnQuRGlkRmlyZUV2ZW50 LCB0aGlzLl9oYW5kbGVET01Ob2RlRGlkRmlyZUV2ZW50LCB0aGlzKTsKQEAgLTE4OCw3ICsxODgs NyBAQCBXSS5ET01Ob2RlID0gY2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAg Z2V0IGZyYW1lKCkgeyByZXR1cm4gdGhpcy5fZnJhbWU7IH0KICAgICBnZXQgZG9tRXZlbnRzKCkg eyByZXR1cm4gdGhpcy5fZG9tRXZlbnRzOyB9Ci0gICAgZ2V0IGxvd1Bvd2VyUmFuZ2VzKCkgeyBy ZXR1cm4gdGhpcy5fbG93UG93ZXJSYW5nZXM7IH0KKyAgICBnZXQgZGlzcGxheUNvbXBvc2l0ZWRS YW5nZXMoKSB7IHJldHVybiB0aGlzLl9kaXNwbGF5Q29tcG9zaXRlZFJhbmdlczsgfQogCiAgICAg Z2V0IGF0dGFjaGVkKCkKICAgICB7CkBAIC03NTcsMzAgKzc1NywzMCBAQCBXSS5ET01Ob2RlID0g Y2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9KTsKICAgICB9CiAKLSAg ICB2aWRlb0xvd1Bvd2VyQ2hhbmdlZCh0aW1lc3RhbXAsIGlzTG93UG93ZXIpCisgICAgZGlzcGxh eUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQodGltZXN0YW1wLCBpc0Rpc3BsYXlDb21wb3NpdGVkKQog ICAgIHsKICAgICAgICAgLy8gQ2FsbGVkIGZyb20gV0kuRE9NTWFuYWdlci4KIAotICAgICAgICBj b25zb2xlLmFzc2VydCh0aGlzLmNhbkVudGVyTG93UG93ZXJNb2RlKCkpOworICAgICAgICBjb25z b2xlLmFzc2VydCh0aGlzLmNhbkVudGVyRGlzcGxheUNvbXBvc2l0ZWRTdGF0ZSgpKTsKIAotICAg ICAgICBsZXQgbGFzdFZhbHVlID0gdGhpcy5fbG93UG93ZXJSYW5nZXMubGFzdFZhbHVlOworICAg ICAgICBsZXQgbGFzdFZhbHVlID0gdGhpcy5fZGlzcGxheUNvbXBvc2l0ZWRSYW5nZXMubGFzdFZh bHVlOwogCi0gICAgICAgIGlmIChpc0xvd1Bvd2VyKSB7CisgICAgICAgIGlmIChpc0Rpc3BsYXlD b21wb3NpdGVkKSB7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghbGFzdFZhbHVlIHx8IGxh c3RWYWx1ZS5lbmRUaW1lc3RhbXApOwogICAgICAgICAgICAgaWYgKCFsYXN0VmFsdWUgfHwgbGFz dFZhbHVlLmVuZFRpbWVzdGFtcCkKLSAgICAgICAgICAgICAgICB0aGlzLl9sb3dQb3dlclJhbmdl cy5wdXNoKHtzdGFydFRpbWVzdGFtcDogdGltZXN0YW1wfSk7CisgICAgICAgICAgICAgICAgdGhp cy5fZGlzcGxheUNvbXBvc2l0ZWRSYW5nZXMucHVzaCh7c3RhcnRUaW1lc3RhbXA6IHRpbWVzdGFt cH0pOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIWxhc3RW YWx1ZSB8fCBsYXN0VmFsdWUuc3RhcnRUaW1lc3RhbXApOwogICAgICAgICAgICAgaWYgKCFsYXN0 VmFsdWUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbG93UG93ZXJSYW5nZXMucHVzaCh7ZW5kVGlt ZXN0YW1wOiB0aW1lc3RhbXB9KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kaXNwbGF5Q29tcG9z aXRlZFJhbmdlcy5wdXNoKHtlbmRUaW1lc3RhbXA6IHRpbWVzdGFtcH0pOwogICAgICAgICAgICAg ZWxzZSBpZiAobGFzdFZhbHVlLnN0YXJ0VGltZXN0YW1wKQogICAgICAgICAgICAgICAgIGxhc3RW YWx1ZS5lbmRUaW1lc3RhbXAgPSB0aW1lc3RhbXA7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5ET01Ob2RlLkV2ZW50Lkxvd1Bvd2VyQ2hhbmdl ZCwge2lzTG93UG93ZXIsIHRpbWVzdGFtcH0pOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXSS5ET01Ob2RlLkV2ZW50LkRpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2Vk LCB7aXNEaXNwbGF5Q29tcG9zaXRlZCwgdGltZXN0YW1wfSk7CiAgICAgfQogCi0gICAgY2FuRW50 ZXJMb3dQb3dlck1vZGUoKQorICAgIGNhbkVudGVyRGlzcGxheUNvbXBvc2l0ZWRTdGF0ZSgpCiAg ICAgewogICAgICAgICByZXR1cm4gdGhpcy5sb2NhbE5hbWUoKSA9PT0gInZpZGVvIiB8fCB0aGlz Lm5vZGVOYW1lKCkudG9Mb3dlckNhc2UoKSA9PT0gInZpZGVvIjsKICAgICB9CkBAIC05NTcsNyAr OTU3LDcgQEAgV0kuRE9NTm9kZS5FdmVudCA9IHsKICAgICBBdHRyaWJ1dGVSZW1vdmVkOiAiZG9t LW5vZGUtYXR0cmlidXRlLXJlbW92ZWQiLAogICAgIEV2ZW50TGlzdGVuZXJzQ2hhbmdlZDogImRv bS1ub2RlLWV2ZW50LWxpc3RlbmVycy1jaGFuZ2VkIiwKICAgICBEaWRGaXJlRXZlbnQ6ICJkb20t bm9kZS1kaWQtZmlyZS1ldmVudCIsCi0gICAgTG93UG93ZXJDaGFuZ2VkOiAiZG9tLW5vZGUtdmlk ZW8tbG93LXBvd2VyLWNoYW5nZWQiLAorICAgIERpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2Vk OiAiZG9tLW5vZGUtZGlzcGxheS1jb21wb3NpdGVkLXN0YXRlLWNoYW5nZWQiLAogfTsKIAogV0ku RE9NTm9kZS5Qc2V1ZG9FbGVtZW50VHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9NZWRpYUluc3RydW1lbnQuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVtZW50LmpzCmlu ZGV4IDIwYmY2ZDlmNTk4YTgwOWRlNGY1MTNjOTNiZmU2YzNmMWZhMzNiMjAuLjljYmMwNmY1YTAz NTMzOGM4YWQ0MDcxNzc1OTQzZDEwZDZmN2E1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9NZWRpYUluc3RydW1lbnQuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlhSW5zdHJ1bWVudC5q cwpAQCAtMzYsOCArMzYsOCBAQCBXSS5NZWRpYUluc3RydW1lbnQgPSBjbGFzcyBNZWRpYUluc3Ry dW1lbnQgZXh0ZW5kcyBXSS5JbnN0cnVtZW50CiAKICAgICBzdGF0aWMgc3VwcG9ydGVkKCkKICAg ICB7Ci0gICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMik6IERPTS5kaWRGaXJlRXZlbnQg YW5kIERPTS52aWRlb0xvd1Bvd2VyQ2hhbmdlZCBkaWQgbm90IGV4aXN0LgotICAgICAgICByZXR1 cm4gd2luZG93LkRPTUFnZW50ICYmIERPTUFnZW50Lmhhc0V2ZW50KCJkaWRGaXJlRXZlbnQiKSAm JiBET01BZ2VudC5oYXNFdmVudCgidmlkZW9Mb3dQb3dlckNoYW5nZWQiKTsKKyAgICAgICAgLy8g Q09NUEFUSUJJTElUWSAoaU9TIDEyKTogRE9NLmRpZEZpcmVFdmVudC4KKyAgICAgICAgcmV0dXJu IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5ET00gJiYgSW5zcGVjdG9yQmFja2VuZC5kb21haW5z LkRPTS5oYXNFdmVudCgiZGlkRmlyZUV2ZW50Iik7CiAgICAgfQogCiAgICAgLy8gUHJvdGVjdGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv TWVkaWFUaW1lbGluZVJlY29yZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9NZWRpYVRpbWVsaW5lUmVjb3JkLmpzCmluZGV4IGVkMzcwNzA0ZDVlYjljZWE2 MDQyZDBkNDZhYTdhMmIwZDY5YTMyMmIuLmEzZWFhNTM0ODcxM2E0ODcwMGJkNTJjODgyN2NiNTQw ZWQ1N2UxZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9NZWRpYVRpbWVsaW5lUmVjb3JkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9NZWRpYVRpbWVsaW5lUmVjb3JkLmpzCkBAIC0yNSw3ICsy NSw3IEBACiAKIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQgPSBjbGFzcyBNZWRpYVRpbWVsaW5lUmVj b3JkIGV4dGVuZHMgV0kuVGltZWxpbmVSZWNvcmQKIHsKLSAgICBjb25zdHJ1Y3RvcihldmVudFR5 cGUsIHRpbWVzdGFtcCwge2RvbU5vZGUsIGRvbUV2ZW50LCBpc0xvd1Bvd2VyfSA9IHt9KQorICAg IGNvbnN0cnVjdG9yKGV2ZW50VHlwZSwgdGltZXN0YW1wLCB7ZG9tTm9kZSwgZG9tRXZlbnQsIGlz RGlzcGxheUNvbXBvc2l0ZWR9ID0ge30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChP YmplY3QudmFsdWVzKFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlKS5pbmNsdWRlcyhl dmVudFR5cGUpKTsKIApAQCAtMzQsNyArMzQsNyBAQCBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0g Y2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5lUmVjb3JkCiAgICAg ICAgIHRoaXMuX2V2ZW50VHlwZSA9IGV2ZW50VHlwZTsKICAgICAgICAgdGhpcy5fZG9tTm9kZSA9 IGRvbU5vZGUgfHwgbnVsbDsKICAgICAgICAgdGhpcy5fZG9tRXZlbnQgPSBkb21FdmVudCB8fCBu dWxsOwotICAgICAgICB0aGlzLl9pc0xvd1Bvd2VyID0gaXNMb3dQb3dlciB8fCBmYWxzZTsKKyAg ICAgICAgdGhpcy5faXNEaXNwbGF5Q29tcG9zaXRlZCA9IGlzRGlzcGxheUNvbXBvc2l0ZWQgfHwg ZmFsc2U7CiAgICAgfQogCiAgICAgLy8gSW1wb3J0IC8gRXhwb3J0CkBAIC00Miw2ICs0MiwxMSBA QCBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRl bmRzIFdJLlRpbWVsaW5lUmVjb3JkCiAgICAgc3RhdGljIGZyb21KU09OKGpzb24pCiAgICAgewog ICAgICAgICBsZXQge2V2ZW50VHlwZSwgdGltZXN0YW1wfSA9IGpzb247CisKKyAgICAgICAgLy8g Q09NUEFUSUJJTElUWSAoaU9TIDEyLjIpOiBpc0xvd1Bvd2VyIHdhcyByZW5hbWVkIHRvIGlzRGlz cGxheUNvbXBvc2l0ZWQuCisgICAgICAgIGlmICgiaXNMb3dQb3dlciIgaW4ganNvbiAmJiAhKCJp c0Rpc3BsYXlDb21wb3NpdGVkIiBpbiBqc29uKSkKKyAgICAgICAgICAgIGpzb24uaXNEaXNwbGF5 Q29tcG9zaXRlZCA9IGpzb24uaXNMb3dQb3dlcjsKKwogICAgICAgICByZXR1cm4gbmV3IFdJLk1l ZGlhVGltZWxpbmVSZWNvcmQoZXZlbnRUeXBlLCB0aW1lc3RhbXAsIGpzb24pOwogICAgIH0KIApA QCAtNjEsNyArNjYsNyBAQCBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgTWVkaWFUaW1l bGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5lUmVjb3JkCiAgICAgICAgICAgICBldmVudFR5 cGU6IHRoaXMuX2V2ZW50VHlwZSwKICAgICAgICAgICAgIHRpbWVzdGFtcDogdGhpcy5zdGFydFRp bWUsCiAgICAgICAgICAgICBkb21FdmVudCwKLSAgICAgICAgICAgIGlzTG93UG93ZXI6IHRoaXMu X2lzTG93UG93ZXIsCisgICAgICAgICAgICBpc0Rpc3BsYXlDb21wb3NpdGVkOiB0aGlzLl9pc0Rp c3BsYXlDb21wb3NpdGVkLAogICAgICAgICB9OwogICAgIH0KIApAQCAtNzAsNyArNzUsNyBAQCBX SS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRlbmRz IFdJLlRpbWVsaW5lUmVjb3JkCiAgICAgZ2V0IGV2ZW50VHlwZSgpIHsgcmV0dXJuIHRoaXMuX2V2 ZW50VHlwZTsgfQogICAgIGdldCBkb21Ob2RlKCkgeyByZXR1cm4gdGhpcy5fZG9tTm9kZTsgfQog ICAgIGdldCBkb21FdmVudCgpIHsgcmV0dXJuIHRoaXMuX2RvbUV2ZW50OyB9Ci0gICAgZ2V0IGlz TG93UG93ZXIoKSB7IHJldHVybiB0aGlzLl9pc0xvd1Bvd2VyOyB9CisgICAgZ2V0IGlzRGlzcGxh eUNvbXBvc2l0ZWQoKSB7IHJldHVybiB0aGlzLl9pc0Rpc3BsYXlDb21wb3NpdGVkOyB9CiAKICAg ICBnZXQgZGlzcGxheU5hbWUoKQogICAgIHsKQEAgLTgxLDggKzg2LDggQEAgV0kuTWVkaWFUaW1l bGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGlu ZVJlY29yZAogICAgICAgICAgICAgcmV0dXJuIGV2ZW50TmFtZTsKICAgICAgICAgfQogCi0gICAg ICAgIGlmICh0aGlzLl9ldmVudFR5cGUgPT09IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRU eXBlLkxvd1Bvd2VyKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2lzTG93UG93ZXIgPyBXSS5V SVN0cmluZygiRW50ZXJlZCBMb3ctUG93ZXIgTW9kZSIpIDogV0kuVUlTdHJpbmcoIkV4aXRlZCBM b3ctUG93ZXIgTW9kZSIpOworICAgICAgICBpZiAodGhpcy5fZXZlbnRUeXBlID09PSBXSS5NZWRp YVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5EaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZCkK KyAgICAgICAgICAgIHJldHVybiB0aGlzLl9pc0Rpc3BsYXlDb21wb3NpdGVkID8gV0kuVUlTdHJp bmcoIlN0YXJ0ZWQgRGlzcGxheSBDb21wb3NpdGluZyIpIDogV0kuVUlTdHJpbmcoIlN0b3BwZWQg RGlzcGxheSBDb21wb3NpdGluZyIpOwogCiAgICAgICAgIGlmICh0aGlzLl9kb21Ob2RlKQogICAg ICAgICAgICAgcmV0dXJuIHRoaXMuX2RvbU5vZGUuZGlzcGxheU5hbWU7CkBAIC05NiwxNiArMTAx LDE5IEBAIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQgPSBjbGFzcyBNZWRpYVRpbWVsaW5lUmVjb3Jk IGV4dGVuZHMgV0kuVGltZWxpbmVSZWNvcmQKICAgICAgICAgc3VwZXIuc2F2ZUlkZW50aXR5VG9D b29raWUoY29va2llKTsKIAogICAgICAgICBjb29raWVbIm1lZGlhLXRpbWVsaW5lLXJlY29yZC1l dmVudC10eXBlIl0gPSB0aGlzLl9ldmVudFR5cGU7CisgICAgICAgIGlmICh0aGlzLl9ldmVudFR5 cGUgPT09IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkRpc3BsYXlDb21wb3NpdGVk U3RhdGVDaGFuZ2VkKQorICAgICAgICAgICAgY29va2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQt ZGlzcGxheS1jb21wb3NpdGVkIl0gPSB0aGlzLl9pc0Rpc3BsYXlDb21wb3NpdGVkOwogICAgICAg ICBpZiAodGhpcy5fZG9tTm9kZSkKICAgICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxpbmUt cmVjb3JkLWRvbS1ub2RlIl0gPSB0aGlzLl9kb21Ob2RlLnBhdGgoKTsKLSAgICAgICAgaWYgKHRo aXMuX2RvbUV2ZW50KQorICAgICAgICBpZiAodGhpcy5fZG9tRXZlbnQpIHsKICAgICAgICAgICAg IGNvb2tpZVsibWVkaWEtdGltZWxpbmUtcmVjb3JkLWRvbS1ldmVudCJdID0gdGhpcy5fZG9tRXZl bnQuZXZlbnROYW1lOwotICAgICAgICBpZiAodGhpcy5faXNMb3dQb3dlciB8fCAodGhpcy5fZG9t RXZlbnQgJiYgdGhpcy5fZG9tRXZlbnQuZGF0YSAmJiB0aGlzLl9kb21FdmVudC5kYXRhLmVuYWJs ZWQpKQotICAgICAgICAgICAgY29va2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQtYWN0aXZlIl0g PSB0cnVlOworICAgICAgICAgICAgaWYgKHRoaXMuX2RvbUV2ZW50LmRhdGEgJiYgdGhpcy5fZG9t RXZlbnQuZGF0YS5lbmFibGVkKQorICAgICAgICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxp bmUtcmVjb3JkLWRvbS1ldmVudC1hY3RpdmUiXSA9IHRydWU7CisgICAgICAgIH0KICAgICB9CiB9 OwogCiBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZSA9IHsKICAgICBET01FdmVudDog ImRvbS1ldmVudCIsCi0gICAgTG93UG93ZXI6ICJsb3ctcG93ZXIiLAorICAgIERpc3BsYXlDb21w b3NpdGVkU3RhdGVDaGFuZ2VkOiAiZGlzcGxheS1jb21wb3NpdGVkLXN0YXRlLWNoYW5nZWQiLAog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9UaW1lbGluZVJlY29yZGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9UaW1lbGluZVJlY29yZGluZy5qcwppbmRleCBkMDlmYTY2MWU0N2FhODBmZjNj MjUxODdlMTRjMjA5NWI0NjBhNzIzLi5mYmE5ZjkyYWU4YjliNGZkNTU2YzkwYmMwMTlhNWU0NzVl YTBiMmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzCkBAIC00NjcsOCArNDY3LDgg QEAgV0kuVGltZWxpbmVSZWNvcmRpbmcgPSBjbGFzcyBUaW1lbGluZVJlY29yZGluZyBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICAgICAgaWYgKHJlY29yZC5ldmVudFR5cGUgPT09IFdJLk1lZGlh VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkRPTUV2ZW50KSB7CiAgICAgICAgICAgICAgICAgaWYg KHJlY29yZC5kb21FdmVudCAmJiByZWNvcmQuZG9tRXZlbnQuZXZlbnROYW1lKQogICAgICAgICAg ICAgICAgICAgICBrZXkgKz0gIjoiICsgcmVjb3JkLmRvbUV2ZW50LmV2ZW50TmFtZTsKLSAgICAg ICAgICAgIH0gZWxzZSBpZiAocmVjb3JkLmV2ZW50VHlwZSA9PT0gV0kuTWVkaWFUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuTG93UG93ZXIpCi0gICAgICAgICAgICAgICAga2V5ICs9ICI6IiArIChy ZWNvcmQuaXNMb3dQb3dlciA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOworICAgICAgICAgICAg fSBlbHNlIGlmIChyZWNvcmQuZXZlbnRUeXBlID09PSBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2 ZW50VHlwZS5EaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZCkKKyAgICAgICAgICAgICAgICBr ZXkgKz0gIjoiICsgKHJlY29yZC5pc0Rpc3BsYXlDb21wb3NpdGVkID8gImVuYWJsZWQiIDogImRp c2FibGVkIik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlY29yZC5zb3VyY2VDb2RlTG9jYXRp b24pCiAgICAgICAgICAgICBrZXkgKz0gIjoiICsgcmVjb3JkLnNvdXJjZUNvZGVMb2NhdGlvbi5s aW5lTnVtYmVyICsgIjoiICsgcmVjb3JkLnNvdXJjZUNvZGVMb2NhdGlvbi5jb2x1bW5OdW1iZXI7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9ET01PYnNlcnZlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL0RPTU9ic2VydmVyLmpzCmluZGV4IGVlZGRiMjhmMDEwOWFhOGY2YzdiZDRkMTdiYjhm MzU4YTc2ZGZjMWYuLmEwYTc5YTk3ZjFhYzNjOGE5MzQwMGM0MWJjZjY0Y2I4NDQyNTU2YWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0RP TU9ic2VydmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL0RPTU9ic2VydmVyLmpzCkBAIC0xMTksNiArMTE5LDEyIEBAIFdJLkRPTU9ic2VydmVy ID0gY2xhc3MgRE9NT2JzZXJ2ZXIKIAogICAgIHZpZGVvTG93UG93ZXJDaGFuZ2VkKG5vZGVJZCwg dGltZXN0YW1wLCBpc0xvd1Bvd2VyKQogICAgIHsKLSAgICAgICAgV0kuZG9tTWFuYWdlci52aWRl b0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXNMb3dQb3dlcik7CisgICAgICAg IC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMi4yKTogRE9NLnZpZGVvTG93UG93ZXJDaGFuZ2VkIHdh cyByZW5hbWVkIHRvIERPTS5kaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZC4KKyAgICAgICAg V0kuZG9tTWFuYWdlci5kaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdlZChub2RlSWQsIHRpbWVz dGFtcCwgaXNMb3dQb3dlcik7CisgICAgfQorCisgICAgZGlzcGxheUNvbXBvc2l0ZWRTdGF0ZUNo YW5nZWQobm9kZUlkLCB0aW1lc3RhbXAsIGlzRGlzcGxheUNvbXBvc2l0ZWQpCisgICAgeworICAg ICAgICBXSS5kb21NYW5hZ2VyLmRpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkKG5vZGVJZCwg dGltZXN0YW1wLCBpc0Rpc3BsYXlDb21wb3NpdGVkKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtk b3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01FdmVudHNCcmVha2Rvd25WaWV3LmNzcwppbmRleCA2NGFlYTI0YjFkNDViYjcxZTA4ZTRlZThh YTU0ZmQ5ZDdiZmMwMTJhLi43MGQ2MjM0YWI4MmVkOGY0OWI2ZGY1MGQzZGVjOTJiN2RkOTNkNjVl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01FdmVudHNCcmVha2Rvd25WaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmNzcwpAQCAtNzYsNyArNzYs NyBAQAogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbGEoMCwgMCUsIDc1JSwgMC4yNSk7CiB9CiAK LS5kb20tZXZlbnRzLWJyZWFrZG93biAuZ3JhcGggPiAuYXJlYS5sb3ctcG93ZXIgeworLmRvbS1l dmVudHMtYnJlYWtkb3duIC5ncmFwaCA+IC5hcmVhLmRpc3BsYXktY29tcG9zaXRlZCB7CiAgICAg YmFja2dyb3VuZC1jb2xvcjogaHNsYSg4MywgMTAwJSwgNDglLCAwLjQpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNC cmVha2Rvd25WaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NRXZlbnRzQnJlYWtkb3duVmlldy5qcwppbmRleCA4OWZmNWZmYTgzYmQwNWFhYmY5MzI3 NjQ0MzRkYjQ3MjI5ODhiYTU2Li44MzgxZDQ2ZTM3OTcyYWEyNjIzYTc4YTJiM2Q2ODFkODEyNDA1 YjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTUV2ZW50c0JyZWFrZG93blZpZXcuanMKQEAgLTM0LDE0ICsz NCwxMyBAQCBXSS5ET01FdmVudHNCcmVha2Rvd25WaWV3ID0gY2xhc3MgRE9NRXZlbnRzQnJlYWtk b3duVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgaWYgKGRvbU5vZGVPckV2ZW50cyBpbnN0 YW5jZW9mIFdJLkRPTU5vZGUpIHsKICAgICAgICAgICAgIHRoaXMuX2RvbU5vZGUgPSBkb21Ob2Rl T3JFdmVudHM7CiAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0ku RE9NTm9kZS5FdmVudC5EaWRGaXJlRXZlbnQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaWRGaXJlRXZl bnQsIHRoaXMpOwotICAgICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUuY2FuRW50ZXJMb3dQb3dl ck1vZGUoKSkKLSAgICAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIo V0kuRE9NTm9kZS5FdmVudC5Mb3dQb3dlckNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVMb3dQ b3dlckNoYW5nZWQsIHRoaXMpOworICAgICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUuY2FuRW50 ZXJEaXNwbGF5Q29tcG9zaXRlZFN0YXRlKCkpCisgICAgICAgICAgICAgICAgdGhpcy5fZG9tTm9k ZS5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU5vZGUuRXZlbnQuRGlzcGxheUNvbXBvc2l0ZWRTdGF0 ZUNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaXNwbGF5Q29tcG9zaXRlZFN0YXRlQ2hhbmdl ZCwgdGhpcyk7CiAKICAgICAgICAgICAgIHRoaXMuX2RvbUV2ZW50cyA9IG51bGw7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlID0gbnVsbDsKICAgICAgICAgICAg IHRoaXMuX2RvbUV2ZW50cyA9IGRvbU5vZGVPckV2ZW50czsKLSAgICAgICAgICAgIHRoaXMuX2xv d1Bvd2VyUmFuZ2VzID0gW107CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9pbmNsdWRlR3Jh cGggPSBpbmNsdWRlR3JhcGggfHwgZmFsc2U7CkBAIC0xMTIsNyArMTExLDcgQEAgV0kuRE9NRXZl bnRzQnJlYWtkb3duVmlldyA9IGNsYXNzIERPTUV2ZW50c0JyZWFrZG93blZpZXcgZXh0ZW5kcyBX SS5WaWV3CiAgICAgICAgICAgICAgICAgZnVsbHNjcmVlblJhbmdlcy5sYXN0VmFsdWUub3JpZ2lu YXRvciA9IGZ1bGxzY3JlZW5ET01FdmVudC5vcmlnaW5hdG9yOwogICAgICAgICB9CiAKLSAgICAg ICAgbGV0IGxvd1Bvd2VyUmFuZ2VzID0gdGhpcy5fZG9tTm9kZSA/IHRoaXMuX2RvbU5vZGUubG93 UG93ZXJSYW5nZXMgOiBbXTsKKyAgICAgICAgbGV0IGRpc3BsYXlDb21wb3NpdGVkUmFuZ2VzID0g dGhpcy5fZG9tTm9kZSA/IHRoaXMuX2RvbU5vZGUuZGlzcGxheUNvbXBvc2l0ZWRSYW5nZXMgOiBb XTsKIAogICAgICAgICBmb3IgKGxldCBkb21FdmVudCBvZiBkb21FdmVudHMpIHsKICAgICAgICAg ICAgIGxldCByb3dFbGVtZW50ID0gdGhpcy5fdGFibGVCb2R5RWxlbWVudC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ciIpKTsKQEAgLTEzOCwxMyArMTM3LDEzIEBAIFdJLkRP TUV2ZW50c0JyZWFrZG93blZpZXcgPSBjbGFzcyBET01FdmVudHNCcmVha2Rvd25WaWV3IGV4dGVu ZHMgV0kuVmlldwogICAgICAgICAgICAgICAgICAgICAgICAgZnVsbHNjcmVlbkFyZWEudGl0bGUg PSBXSS5VSVN0cmluZygiRnVsbC1TY3JlZW4iKTsKICAgICAgICAgICAgICAgICB9CiAKLSAgICAg ICAgICAgICAgICBsZXQgbG93UG93ZXJSYW5nZSA9IGxvd1Bvd2VyUmFuZ2VzLmZpbmQoKHJhbmdl KSA9PiBkb21FdmVudC50aW1lc3RhbXAgPj0gcmFuZ2Uuc3RhcnRUaW1lc3RhbXAgJiYgZG9tRXZl bnQudGltZXN0YW1wIDw9IHJhbmdlLmVuZFRpbWVzdGFtcCk7Ci0gICAgICAgICAgICAgICAgaWYg KGxvd1Bvd2VyUmFuZ2UpIHsKLSAgICAgICAgICAgICAgICAgICAgbGV0IGxvd1Bvd2VyQXJlYSA9 IGdyYXBoQ2VsbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0g ICAgICAgICAgICAgICAgICAgIGxvd1Bvd2VyQXJlYS5jbGFzc0xpc3QuYWRkKCJhcmVhIiwgImxv dy1wb3dlciIpOwotICAgICAgICAgICAgICAgICAgICBsb3dQb3dlckFyZWEudGl0bGUgPSBXSS5V SVN0cmluZygiTG93LVBvd2VyIE1vZGUiKTsKLSAgICAgICAgICAgICAgICAgICAgbG93UG93ZXJB cmVhLnN0eWxlLnNldFByb3BlcnR5KHN0eWxlQXR0cmlidXRlLCBwZXJjZW50T2ZUb3RhbFRpbWUo bG93UG93ZXJSYW5nZS5zdGFydFRpbWVzdGFtcCAtIHN0YXJ0VGltZXN0YW1wKSArICIlIik7Ci0g ICAgICAgICAgICAgICAgICAgIGxvd1Bvd2VyQXJlYS5zdHlsZS5zZXRQcm9wZXJ0eSgid2lkdGgi LCBwZXJjZW50T2ZUb3RhbFRpbWUobG93UG93ZXJSYW5nZS5lbmRUaW1lc3RhbXAgLSBsb3dQb3dl clJhbmdlLnN0YXJ0VGltZXN0YW1wKSArICIlIik7CisgICAgICAgICAgICAgICAgbGV0IGRpc3Bs YXlDb21wb3NpdGVkUmFuZ2UgPSBkaXNwbGF5Q29tcG9zaXRlZFJhbmdlcy5maW5kKChyYW5nZSkg PT4gZG9tRXZlbnQudGltZXN0YW1wID49IHJhbmdlLnN0YXJ0VGltZXN0YW1wICYmIGRvbUV2ZW50 LnRpbWVzdGFtcCA8PSByYW5nZS5lbmRUaW1lc3RhbXApOworICAgICAgICAgICAgICAgIGlmIChk aXNwbGF5Q29tcG9zaXRlZFJhbmdlKSB7CisgICAgICAgICAgICAgICAgICAgIGxldCBkaXNwbGF5 Q29tcG9zaXRlZEFyZWEgPSBncmFwaENlbGwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2IikpOworICAgICAgICAgICAgICAgICAgICBkaXNwbGF5Q29tcG9zaXRlZEFyZWEu Y2xhc3NMaXN0LmFkZCgiYXJlYSIsICJkaXNwbGF5LWNvbXBvc2l0ZWQiKTsKKyAgICAgICAgICAg ICAgICAgICAgZGlzcGxheUNvbXBvc2l0ZWRBcmVhLnRpdGxlID0gV0kuVUlTdHJpbmcoIkRpc3Bs YXkgQ29tcG9zaXRlZCIpOworICAgICAgICAgICAgICAgICAgICBkaXNwbGF5Q29tcG9zaXRlZEFy ZWEuc3R5bGUuc2V0UHJvcGVydHkoc3R5bGVBdHRyaWJ1dGUsIHBlcmNlbnRPZlRvdGFsVGltZShk aXNwbGF5Q29tcG9zaXRlZFJhbmdlLnN0YXJ0VGltZXN0YW1wIC0gc3RhcnRUaW1lc3RhbXApICsg IiUiKTsKKyAgICAgICAgICAgICAgICAgICAgZGlzcGxheUNvbXBvc2l0ZWRBcmVhLnN0eWxlLnNl dFByb3BlcnR5KCJ3aWR0aCIsIHBlcmNlbnRPZlRvdGFsVGltZShkaXNwbGF5Q29tcG9zaXRlZFJh bmdlLmVuZFRpbWVzdGFtcCAtIGRpc3BsYXlDb21wb3NpdGVkUmFuZ2Uuc3RhcnRUaW1lc3RhbXAp ICsgIiUiKTsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBsZXQgZ3JhcGhJ bWFnZSA9IGdyYXBoQ2VsbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWci KSk7CkBAIC0xODMsNyArMTgyLDcgQEAgV0kuRE9NRXZlbnRzQnJlYWtkb3duVmlldyA9IGNsYXNz IERPTUV2ZW50c0JyZWFrZG93blZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMubmVl ZHNMYXlvdXQoKTsKICAgICB9CiAKLSAgICBfaGFuZGxlRE9NTm9kZUxvd1Bvd2VyQ2hhbmdlZChl dmVudCkKKyAgICBfaGFuZGxlRE9NTm9kZURpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkKGV2 ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5uZWVkc0xheW91dCgpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzcwppbmRleCA2ZTNkZDFlNDViOGM2ZDg3YzM4 NWZkOGUxMGM1ZGIyNjJkMjc2OTY3Li4xMzFlYzViZTUwYjgxODlkZWZjM2QwZjZiMDczYzE3NzE5 NDY0YTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuY3NzCkBAIC0y MTEsNyArMjExLDcgQEAgYm9keVtkaXI9cnRsXSAubmV0d29yay10YWJsZSAuY2VsbC5uYW1lID4g LnN0YXR1cyB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsYSgwLCAwJSwgNzUlLCAwLjc1KTsK IH0KIAotLm5ldHdvcmstdGFibGUgOm5vdCguaGVhZGVyKSAuY2VsbC53YXRlcmZhbGwgLndhdGVy ZmFsbC1jb250YWluZXIgPiAuYXJlYS5sb3ctcG93ZXIgeworLm5ldHdvcmstdGFibGUgOm5vdCgu aGVhZGVyKSAuY2VsbC53YXRlcmZhbGwgLndhdGVyZmFsbC1jb250YWluZXIgPiAuYXJlYS5kaXNw bGF5LWNvbXBvc2l0ZWQgewogICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLW5ldHdvcmstcmVx dWVzdC1jb2xvcik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMK aW5kZXggYTdhOWZjN2JiMjVmMjE3ZTIzMTZjYjNlYzg2YWJiMDY2YjJiZjQwNy4uMDlmZGU2NDM1 ZTY2OTJlMGJjZTlkNjk4YmVlMjZjNWU0MjQzYmQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YmxlQ29udGVudFZpZXcuanMKQEAgLTgyMiwxNSArODIyLDE1IEBAIFdJLk5ldHdvcmtUYWJsZUNv bnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250 ZW50VmllCiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBm b3IgKGxldCBsb3dQb3dlclJhbmdlIG9mIGRvbU5vZGUubG93UG93ZXJSYW5nZXMpIHsKLSAgICAg ICAgICAgICAgICBsZXQgc3RhcnRUaW1lc3RhbXAgPSBsb3dQb3dlclJhbmdlLnN0YXJ0VGltZXN0 YW1wIHx8IGdyYXBoU3RhcnRUaW1lOwotICAgICAgICAgICAgICAgIGxldCBlbmRUaW1lc3RhbXAg PSBsb3dQb3dlclJhbmdlLmVuZFRpbWVzdGFtcCB8fCBjb2xsZWN0aW9uLndhdGVyZmFsbEVuZFRp bWU7CisgICAgICAgICAgICBmb3IgKGxldCBkaXNwbGF5Q29tcG9zaXRlZFJhbmdlIG9mIGRvbU5v ZGUuZGlzcGxheUNvbXBvc2l0ZWRSYW5nZXMpIHsKKyAgICAgICAgICAgICAgICBsZXQgc3RhcnRU aW1lc3RhbXAgPSBkaXNwbGF5Q29tcG9zaXRlZFJhbmdlLnN0YXJ0VGltZXN0YW1wIHx8IGdyYXBo U3RhcnRUaW1lOworICAgICAgICAgICAgICAgIGxldCBlbmRUaW1lc3RhbXAgPSBkaXNwbGF5Q29t cG9zaXRlZFJhbmdlLmVuZFRpbWVzdGFtcCB8fCBjb2xsZWN0aW9uLndhdGVyZmFsbEVuZFRpbWU7 CiAKLSAgICAgICAgICAgICAgICBsZXQgbG93UG93ZXJFbGVtZW50ID0gY29udGFpbmVyLmFwcGVu ZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgICAgICAgICBs b3dQb3dlckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiYXJlYSIsICJsb3ctcG93ZXIiKTsKLSAgICAg ICAgICAgICAgICBsb3dQb3dlckVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiTG93LVBvd2Vy IE1vZGUiKTsKLSAgICAgICAgICAgICAgICBwb3NpdGlvbkJ5U3RhcnRPZmZzZXQobG93UG93ZXJF bGVtZW50LCBzdGFydFRpbWVzdGFtcCk7Ci0gICAgICAgICAgICAgICAgc2V0V2lkdGhGb3JEdXJh dGlvbihsb3dQb3dlckVsZW1lbnQsIHN0YXJ0VGltZXN0YW1wLCBlbmRUaW1lc3RhbXApOworICAg ICAgICAgICAgICAgIGxldCBkaXNwbGF5Q29tcG9zaXRlZFJhbmdlRWxlbWVudCA9IGNvbnRhaW5l ci5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CisgICAgICAgICAg ICAgICAgZGlzcGxheUNvbXBvc2l0ZWRSYW5nZUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiYXJlYSIs ICJkaXNwbGF5LWNvbXBvc2l0ZWQiKTsKKyAgICAgICAgICAgICAgICBkaXNwbGF5Q29tcG9zaXRl ZFJhbmdlRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5nKCJEaXNwbGF5IENvbXBvc2l0ZWQiKTsK KyAgICAgICAgICAgICAgICBwb3NpdGlvbkJ5U3RhcnRPZmZzZXQoZGlzcGxheUNvbXBvc2l0ZWRS YW5nZUVsZW1lbnQsIHN0YXJ0VGltZXN0YW1wKTsKKyAgICAgICAgICAgICAgICBzZXRXaWR0aEZv ckR1cmF0aW9uKGRpc3BsYXlDb21wb3NpdGVkUmFuZ2VFbGVtZW50LCBzdGFydFRpbWVzdGFtcCwg ZW5kVGltZXN0YW1wKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbGV0IHBsYXlpbmcg PSBmYWxzZTsKQEAgLTE4MTksOCArMTgxOSw4IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAg ICAgICAgICAgICB0aGlzLl9kb21Ob2RlRW50cmllcy5zZXQocmVzb3VyY2UuaW5pdGlhdG9yTm9k ZSwgbm9kZUVudHJ5KTsKIAogICAgICAgICAgICAgcmVzb3VyY2UuaW5pdGlhdG9yTm9kZS5hZGRF dmVudExpc3RlbmVyKFdJLkRPTU5vZGUuRXZlbnQuRGlkRmlyZUV2ZW50LCB0aGlzLl9oYW5kbGVO b2RlRGlkRmlyZUV2ZW50LCB0aGlzKTsKLSAgICAgICAgICAgIGlmIChyZXNvdXJjZS5pbml0aWF0 b3JOb2RlLmNhbkVudGVyTG93UG93ZXJNb2RlKCkpCi0gICAgICAgICAgICAgICAgcmVzb3VyY2Uu aW5pdGlhdG9yTm9kZS5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU5vZGUuRXZlbnQuTG93UG93ZXJD aGFuZ2VkLCB0aGlzLl9oYW5kbGVOb2RlTG93UG93ZXJDaGFuZ2VkLCB0aGlzKTsKKyAgICAgICAg ICAgIGlmIChyZXNvdXJjZS5pbml0aWF0b3JOb2RlLmNhbkVudGVyRGlzcGxheUNvbXBvc2l0ZWRT dGF0ZSgpKQorICAgICAgICAgICAgICAgIHJlc291cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRM aXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LkRpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkLCB0 aGlzLl9oYW5kbGVET01Ob2RlRGlzcGxheUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQsIHRoaXMpOwog ICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9lbnRyaWVzU29ydENvbXBhcmF0b3IpCkBA IC0xODU4LDcgKzE4NTgsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5l dHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICB9KTsK ICAgICB9CiAKLSAgICBfaGFuZGxlTm9kZUxvd1Bvd2VyQ2hhbmdlZChldmVudCkKKyAgICBfaGFu ZGxlRE9NTm9kZURpc3BsYXlDb21wb3NpdGVkU3RhdGVDaGFuZ2VkKGV2ZW50KQogICAgIHsKICAg ICAgICAgdGhpcy5fcnVuRm9yTWFpbkNvbGxlY3Rpb24oKGNvbGxlY3Rpb24sIHdhc01haW4pID0+ IHsKICAgICAgICAgICAgIGxldCBkb21Ob2RlID0gZXZlbnQudGFyZ2V0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVJY29ucy5j c3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUlj b25zLmNzcwppbmRleCBjYThlODkzMzkzZjc0NmUzOGI4NDg2NTExNjdlM2Y2ODBmOTViZjAyLi5k OWNlY2Y0OGEwOWNiOGZlNDk1NDFhM2UwYTM0NzZkNTkzYjk2Zjk5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUljb25zLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUlj b25zLmNzcwpAQCAtMTMzLDggKzEzMyw4IEBACiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9E T01FdmVudEZ1bGxzY3JlZW4uc3ZnKTsKIH0KIAotLmxvdy1wb3dlci1yZWNvcmQgLmljb24gewot ICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvTG93UG93ZXIuc3ZnKTsKKy5kaXNwbGF5LWNvbXBv c2l0ZWQtc3RhdGUtY2hhbmdlZC1yZWNvcmQgLmljb24geworICAgIGNvbnRlbnQ6IHVybCguLi9J bWFnZXMvRGlzcGxheUNvbXBvc2l0ZWRTdGF0ZUNoYW5nZWQuc3ZnKTsKIH0KIAogQG1lZGlhIChw cmVmZXJzLWNvbG9yLXNjaGVtZTogZGFyaykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVu dFZpZXcuanMKaW5kZXggYWVkNWVjZjA4M2E5ZmZlZWFjMTg0YzQ1M2E0NWM1NTJiOWM0MDFhYi4u NGFjNWU5MmE0YzY1Y2JjNDRiNTQ4YTU2OTNiMzFlMTVkMzBkMjEwZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNTEsOCArMjUxLDggQEAgV0kuVGltZWxpbmVU YWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50QnJvd3MKICAgICAgICAgICAgIHN3aXRjaCAodGltZWxpbmVSZWNvcmQuZXZlbnRUeXBl KSB7CiAgICAgICAgICAgICBjYXNlIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkRP TUV2ZW50OgogICAgICAgICAgICAgICAgIHJldHVybiAiZG9tLWV2ZW50LXJlY29yZCI7Ci0gICAg ICAgICAgICBjYXNlIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkxvd1Bvd2VyOgot ICAgICAgICAgICAgICAgIHJldHVybiAibG93LXBvd2VyLXJlY29yZCI7CisgICAgICAgICAgICBj YXNlIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkRpc3BsYXlDb21wb3NpdGVkU3Rh dGVDaGFuZ2VkOgorICAgICAgICAgICAgICAgIHJldHVybiAiZGlzcGxheS1jb21wb3NpdGVkLXN0 YXRlLWNoYW5nZWQtcmVjb3JkIjsKICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAg ICAgY29uc29sZS5lcnJvcigiVW5rbm93biBNZWRpYVRpbWVsaW5lUmVjb3JkIGV2ZW50VHlwZTog IiArIHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSwgdGltZWxpbmVSZWNvcmQpOwogICAgICAgICAg ICAgfQo= 368996 2019-05-03 14:55:21 -0700 2019-05-03 15:49:36 -0700 Patch bug-197296-20190503145520.patch text/plain 36492 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDg0YjQ0MjMyYTY2MDUzNjA3ZmRiNjcwZjQ5ZjM5 OTc5NmQ4OWE1NWMuLjI2MGViYzNlNzJmOTkwNzViNmZlODFmMWE3ZmQ4M2VkZTgxMGEyOWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1LTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IHJlbmFtZSAibG93IHBvd2VyIiB0byAiZGlzcGxheSBjb21wb3NpdGVkIgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Mjk2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFJlbW92ZWQgc3BlY2lmaWMg Q2hhbmdlTG9nIGVudHJpZXMgc2luY2UgaXQgaXMgYWxtb3N0IGVudGlyZWx5IG1lY2hhbmljYWwg Y2hhbmdlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbjoKKwogMjAx OS0wNS0wMSAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBCYXNl bGluZSBKSVQgc2hvdWxkIGRvIGFyZ3VtZW50IHZhbHVlIHByb2ZpbGluZyBhZnRlciBjaGVja2lu ZyBmb3Igc3RhY2sgb3ZlcmZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MGE0NDQwN2ZjZTg1ZjdiNzI2MmRl ZWY2YTBlYmI5ZDc4NTE0OTczLi4zMjBhZWQ0NWI1ODU2MTA5NTJkNGM5YzYwNTQxNTdiM2ZkMjBk NjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDUtMDMgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERPTTogcmVu YW1lICJsb3cgcG93ZXIiIHRvICJkaXNwbGF5IGNvbXBvc2l0ZWQiCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyOTYKKworICAgICAgICBSZXZpZXdl ZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgUmVtb3ZlZCBzcGVjaWZpYyBDaGFuZ2VM b2cgZW50cmllcyBzaW5jZSBpdCBpcyBhbG1vc3QgZW50aXJlbHkgbWVjaGFuaWNhbCBjaGFuZ2Vz LgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oOgorICAg ICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorCiAyMDE5LTA1 LTAxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkF1 dGhOXSBBZG9wdCBTZWN1cml0eU9yaWdpbjo6aXNNYXRjaGluZ1JlZ2lzdHJhYmxlRG9tYWluU3Vm Zml4KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlkYzhkMGQyOTkxMzQ5NzZkM2I2MjMx YzA2ODAxNWZiOTg0OTUxOWIuLmY4YjgzY2M2NTRiMzFhY2MxNDkzOWNlMTljODQxZDMwN2U1ZGFm ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA1LTAz ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBET006IHJlbmFtZSAibG93IHBvd2VyIiB0byAiZGlzcGxheSBjb21wb3NpdGVkIgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Mjk2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFJlbW92ZWQgc3Bl Y2lmaWMgQ2hhbmdlTG9nIGVudHJpZXMgc2luY2UgaXQgaXMgYWxtb3N0IGVudGlyZWx5IG1lY2hh bmljYWwgY2hhbmdlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2Jz ZXJ2ZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2Vy LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVtZW50LmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlhVGltZWxpbmVSZWNvcmQuanM6CisgICAgICAgICogVXNl ckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtkb3duVmlldy5jc3M6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lSWNvbnMuY3NzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0ltYWdlcy9Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLnN2Zzog QWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9JbWFnZXMvTG93UG93ZXIuc3ZnOiBSZW1v dmVkLgorICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKwogMjAxOS0wNC0yOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDI5OTM5Nj4gRml4IGludGVybmFsIEhp Z2ggU2llcnJhIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL0RPTS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9w cm90b2NvbC9ET00uanNvbgppbmRleCAxMTk1ZTg4NmRlOTJhMTcxYWRlNDhlODMyYzZhMDZhNjM0 NTQyMWYwLi43NzkxMGM5YjRjODJlZGI3NjBmZDkyNjQ2ZmRkNGY3MjcxMjExZDAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAg LTY3NywxMiArNjc3LDEyIEBACiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCiAgICAgICAgIHsK LSAgICAgICAgICAgICJuYW1lIjogInZpZGVvTG93UG93ZXJDaGFuZ2VkIiwKLSAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJDYWxsZWQgd2hlbiBhIHZpZGVvIGVsZW1lbnQgZW50ZXJzL2V4aXRz IGxvdyBwb3dlciBtb2RlLiIsCisgICAgICAgICAgICAibmFtZSI6ICJwb3dlckVmZmljaWVudFBs YXliYWNrU3RhdGVDaGFuZ2VkIiwKKyAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJDYWxsZWQg d2hlbiBhbiBlbGVtZW50IGVudGVycy9leGl0cyBhIHBvd2VyIGVmZmljaWVudCBwbGF5YmFjayBz dGF0ZS4iLAogICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJub2RlSWQiLCAiJHJlZiI6ICJOb2RlSWQiIH0sCi0gICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ0aW1lc3RhbXAiLCAiJHJlZiI6ICJOZXR3b3JrLlRpbWVzdGFtcCIsICJkZXNjcmlw dGlvbiI6ICJUaW1lIHdoZW4gdGhlIHZpZGVvIGVsZW1lbnQgZW50ZXJlZC9leGl0ZWQgbG93IHBv d2VyIG1vZGUiIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpc0xvd1Bvd2VyIiwgInR5 cGUiOiAiYm9vbGVhbiIgfQorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwg IiRyZWYiOiAiTmV0d29yay5UaW1lc3RhbXAiIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJpc1Bvd2VyRWZmaWNpZW50IiwgInR5cGUiOiAiYm9vbGVhbiIgfQogICAgICAgICAgICAgXQog ICAgICAgICB9CiAgICAgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBjZTZhMjc5OGMyNWNkMjY4ZDViMmM2MmMy ZDY2MDE4NWMzNGFjNmYwLi42Y2NlNThlNDBjMjhiOTEyNzZlMGIxZGViMzY0YzUyZWEyNjU2YTg5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRP TUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ckRPTUFnZW50LmNwcApAQCAtMjUxNCwxNCArMjUxNCwxNCBAQCB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjptZWRpYU1ldHJpY3NUaW1lckZpcmVkKCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CiAKLSAgICAgICAgYm9vbCBpc0xvd1Bvd2VyID0gKGRpc3BsYXlDb21wb3NpdGVkVmlk ZW9GcmFtZXMgLSBpdGVyYXRvci0+dmFsdWUuZGlzcGxheUNvbXBvc2l0ZWRGcmFtZXMpID4gMDsK LSAgICAgICAgaWYgKGl0ZXJhdG9yLT52YWx1ZS5pc0xvd1Bvd2VyICE9IGlzTG93UG93ZXIpIHsK LSAgICAgICAgICAgIGl0ZXJhdG9yLT52YWx1ZS5pc0xvd1Bvd2VyID0gaXNMb3dQb3dlcjsKKyAg ICAgICAgYm9vbCBpc0Rpc3BsYXlDb21wb3NpdGVkID0gKGRpc3BsYXlDb21wb3NpdGVkVmlkZW9G cmFtZXMgLSBpdGVyYXRvci0+dmFsdWUuZGlzcGxheUNvbXBvc2l0ZWRGcmFtZXMpID4gMDsKKyAg ICAgICAgaWYgKGl0ZXJhdG9yLT52YWx1ZS5pc0Rpc3BsYXlDb21wb3NpdGVkICE9IGlzRGlzcGxh eUNvbXBvc2l0ZWQpIHsKKyAgICAgICAgICAgIGl0ZXJhdG9yLT52YWx1ZS5pc0Rpc3BsYXlDb21w b3NpdGVkID0gaXNEaXNwbGF5Q29tcG9zaXRlZDsKIAogICAgICAgICAgICAgaW50IG5vZGVJZCA9 IHB1c2hOb2RlUGF0aFRvRnJvbnRlbmQobWVkaWFFbGVtZW50KTsKICAgICAgICAgICAgIGlmIChu b2RlSWQpIHsKICAgICAgICAgICAgICAgICBhdXRvIHRpbWVzdGFtcCA9IG1fZW52aXJvbm1lbnQu ZXhlY3V0aW9uU3RvcHdhdGNoKCktPmVsYXBzZWRUaW1lKCkuc2Vjb25kcygpOwotICAgICAgICAg ICAgICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT52aWRlb0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQs IHRpbWVzdGFtcCwgaXRlcmF0b3ItPnZhbHVlLmlzTG93UG93ZXIpOworICAgICAgICAgICAgICAg IG1fZnJvbnRlbmREaXNwYXRjaGVyLT5wb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2Vk KG5vZGVJZCwgdGltZXN0YW1wLCBpdGVyYXRvci0+dmFsdWUuaXNEaXNwbGF5Q29tcG9zaXRlZCk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IGRmMjNjZWQ2MmViZDVjM2Nk OWE4MDIzNTQ0YWMwNWY3ODY5NmJmM2MuLmI5MjZlMGRiNjMxZDk1YjllYmMyMTcyZjFhYThhZWM2 M2Y1MTk5ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvckRPTUFnZW50LmgKQEAgLTI2NCw3ICsyNjQsNyBAQCBwcml2YXRlOgogICAgIFRpbWVy IG1fbWVkaWFNZXRyaWNzVGltZXI7CiAgICAgc3RydWN0IE1lZGlhTWV0cmljcyB7CiAgICAgICAg IHVuc2lnbmVkIGRpc3BsYXlDb21wb3NpdGVkRnJhbWVzIHsgMCB9OwotICAgICAgICBib29sIGlz TG93UG93ZXIgeyBmYWxzZSB9OworICAgICAgICBib29sIGlzRGlzcGxheUNvbXBvc2l0ZWQgeyBm YWxzZSB9OwogCiAgICAgICAgIE1lZGlhTWV0cmljcygpIHsgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcwppbmRleCA1MWE2ZTg1OGY3MGVlNGI5MTI3MGM5MTI5Y2Q4YzdmMWEzNGM4 MTVhLi41MGIyM2MyYThiN2RjZTQ1MmM2MzVjNjQxZDQyOTJkYzZlZWJhNTRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTQyMSw3ICs0MjEsNiBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJFbnN1cmUgdGhhdCBvbmx5IG9uZSBsaXZlIHJlZ2lvbiBpcyB1c2VkIG9uIHRoZSBwYWdl LiJdID0gIkVucwogbG9jYWxpemVkU3RyaW5nc1siRW5zdXJlIHRoYXQgb25seSBvbmUgbWFpbiBj b250ZW50IHNlY3Rpb24gaXMgdXNlZCBvbiB0aGUgcGFnZS4iXSA9ICJFbnN1cmUgdGhhdCBvbmx5 IG9uZSBtYWluIGNvbnRlbnQgc2VjdGlvbiBpcyB1c2VkIG9uIHRoZSBwYWdlLiI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJFbnN1cmUgdGhhdCB2YWx1ZXMgZm9yIFx1MDAyMiVzXHUwMDIyIGFyZSB2YWxp ZC4iXSA9ICJFbnN1cmUgdGhhdCB2YWx1ZXMgZm9yIFx1MDAyMiVzXHUwMDIyIGFyZSB2YWxpZC4i OwogbG9jYWxpemVkU3RyaW5nc1siRW50ZXJlZCBGdWxsLVNjcmVlbiBNb2RlIl0gPSAiRW50ZXJl ZCBGdWxsLVNjcmVlbiBNb2RlIjsKLWxvY2FsaXplZFN0cmluZ3NbIkVudGVyZWQgTG93LVBvd2Vy IE1vZGUiXSA9ICJFbnRlcmVkIExvdy1Qb3dlciBNb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVu dGlyZSBSZWNvcmRpbmciXSA9ICJFbnRpcmUgUmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkVycm9yIl0gPSAiRXJyb3IiOwogbG9jYWxpemVkU3RyaW5nc1siRXJyb3I6ICJdID0gIkVycm9y OiAiOwpAQCAtNDQyLDcgKzQ0MSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIkV4YW1wbGU6IFx1MjAx QyVzXHUyMDFEIl0gPSAiRXhhbXBsZTogXHUyMDFDJXNcdTIwMUQiOwogbG9jYWxpemVkU3RyaW5n c1siRXhjZXB0aW9uIHdpdGggdGhyb3duIHZhbHVlOiAlcyJdID0gIkV4Y2VwdGlvbiB3aXRoIHRo cm93biB2YWx1ZTogJXMiOwogbG9jYWxpemVkU3RyaW5nc1siRXhlY3V0aW9uIGNvbnRleHQgZm9y ICQwIl0gPSAiRXhlY3V0aW9uIGNvbnRleHQgZm9yICQwIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV4 aXRlZCBGdWxsLVNjcmVlbiBNb2RlIl0gPSAiRXhpdGVkIEZ1bGwtU2NyZWVuIE1vZGUiOwotbG9j YWxpemVkU3RyaW5nc1siRXhpdGVkIExvdy1Qb3dlciBNb2RlIl0gPSAiRXhpdGVkIExvdy1Qb3dl ciBNb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV4cGFuZCBBbGwiXSA9ICJFeHBhbmQgQWxsIjsK IGxvY2FsaXplZFN0cmluZ3NbIkV4cGFuZCBjb2x1bW5zIl0gPSAiRXhwYW5kIGNvbHVtbnMiOwog bG9jYWxpemVkU3RyaW5nc1siRXhwYW5kZWQiXSA9ICJFeHBhbmRlZCI7CkBAIC02MjgsNyArNjI2 LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siTG9nIFdlYlNvY2tldCJdID0gIkxvZyBXZWJTb2NrZXQi OwogbG9jYWxpemVkU3RyaW5nc1siTG9nOiAiXSA9ICJMb2c6ICI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJMb2dzIl0gPSAiTG9ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb3ciXSA9ICJMb3ciOwotbG9j YWxpemVkU3RyaW5nc1siTG93LVBvd2VyIE1vZGUiXSA9ICJMb3ctUG93ZXIgTW9kZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJMb3dlc3Q6ICVzIl0gPSAiTG93ZXN0OiAlcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJNSU1FIFR5cGUiXSA9ICJNSU1FIFR5cGUiOwogbG9jYWxpemVkU3RyaW5nc1siTUlNRSBU eXBlOiJdID0gIk1JTUUgVHlwZToiOwpAQCAtNzYzLDYgKzc2MCw5IEBAIGxvY2FsaXplZFN0cmlu Z3NbIlBsYXkgU291bmQiXSA9ICJQbGF5IFNvdW5kIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBvbGl0 ZSJdID0gIlBvbGl0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQb25nIEZyYW1lIl0gPSAiUG9uZyBG cmFtZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQb3J0Il0gPSAiUG9ydCI7Citsb2NhbGl6ZWRTdHJp bmdzWyJQb3dlciBFZmZpY2llbnQgUGxheWJhY2siXSA9ICJQb3dlciBFZmZpY2llbnQgUGxheWJh Y2siOworbG9jYWxpemVkU3RyaW5nc1siUG93ZXIgRWZmaWNpZW50IFBsYXliYWNrIFN0YXJ0ZWQi XSA9ICJQb3dlciBFZmZpY2llbnQgUGxheWJhY2sgU3RhcnRlZCI7Citsb2NhbGl6ZWRTdHJpbmdz WyJQb3dlciBFZmZpY2llbnQgUGxheWJhY2sgU3RvcHBlZCJdID0gIlBvd2VyIEVmZmljaWVudCBQ bGF5YmFjayBTdG9wcGVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIlByZWZlciBpbmRlbnQgdXNpbmc6 Il0gPSAiUHJlZmVyIGluZGVudCB1c2luZzoiOwogbG9jYWxpemVkU3RyaW5nc1siUHJlc2VydmUg TG9nIl0gPSAiUHJlc2VydmUgTG9nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlByZXNzICVzIHRvIGlt cG9ydCBhIHRlc3Qgb3IgcmVzdWx0IGZpbGUiXSA9ICJQcmVzcyAlcyB0byBpbXBvcnQgYSB0ZXN0 IG9yIHJlc3VsdCBmaWxlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCmluZGV4IGY2OGQ4OTQw OWMwNDExNTdlODk5OWVmMzYxYjgyNDM2ZTI4M2UxYTcuLjdhOTFiM2ZlYTM3Mzg1ZWFiMmRjMWY4 MGNiMWYxMzRjZGM5MWJiODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwpAQCAtMTY2LDcg KzE2Niw3IEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4dGVuZHMgV0kuT2Jq ZWN0CiAgICAgICAgIG5vZGUuZGlkRmlyZUV2ZW50KGV2ZW50TmFtZSwgdGltZXN0YW1wLCBkYXRh KTsKICAgICB9CiAKLSAgICB2aWRlb0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwg aXNMb3dQb3dlcikKKyAgICBwb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJ ZCwgdGltZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50KQogICAgIHsKICAgICAgICAgLy8gQ2FsbGVk IGZyb20gV0kuRE9NT2JzZXJ2ZXIuCiAKQEAgLTE3NCw3ICsxNzQsNyBAQCBXSS5ET01NYW5hZ2Vy ID0gY2xhc3MgRE9NTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoIW5vZGUp CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbm9kZS52aWRlb0xvd1Bvd2VyQ2hhbmdl ZCh0aW1lc3RhbXAsIGlzTG93UG93ZXIpOworICAgICAgICBub2RlLnBvd2VyRWZmaWNpZW50UGxh eWJhY2tTdGF0ZUNoYW5nZWQodGltZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50KTsKICAgICB9CiAK ICAgICAvLyBQcml2YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXgg ZmU1MTRjNzU1YTc2ODlmMWY4NjA4ZmNmMzg5YmIwYzlhZGM3NWE1ZC4uYTA0Mzg2ZWQxN2QwZWNk N2Y1ZTRlZDRjNDlmMDVmNmJhZmZjNGM1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFu YWdlci5qcwpAQCAtMzY1LDcgKzM2NSw3IEBAIFdJLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRp bWVsaW5lTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBXSS5tZW1vcnlNYW5hZ2Vy LmFkZEV2ZW50TGlzdGVuZXIoV0kuTWVtb3J5TWFuYWdlci5FdmVudC5NZW1vcnlQcmVzc3VyZSwg dGhpcy5fbWVtb3J5UHJlc3N1cmUsIHRoaXMpOwogCiAgICAgICAgIFdJLkRPTU5vZGUuYWRkRXZl bnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LkRpZEZpcmVFdmVudCwgdGhpcy5faGFuZGxlRE9N Tm9kZURpZEZpcmVFdmVudCwgdGhpcyk7Ci0gICAgICAgIFdJLkRPTU5vZGUuYWRkRXZlbnRMaXN0 ZW5lcihXSS5ET01Ob2RlLkV2ZW50Lkxvd1Bvd2VyQ2hhbmdlZCwgdGhpcy5faGFuZGxlRE9NTm9k ZUxvd1Bvd2VyQ2hhbmdlZCwgdGhpcyk7CisgICAgICAgIFdJLkRPTU5vZGUuYWRkRXZlbnRMaXN0 ZW5lcihXSS5ET01Ob2RlLkV2ZW50LlBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQs IHRoaXMuX2hhbmRsZURPTU5vZGVQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB0 aGlzKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVDYXB0dXJpbmdTdGF0ZShUaW1lbGluZU1hbmFn ZXIuQ2FwdHVyaW5nU3RhdGUuQWN0aXZlLCB7c3RhcnRUaW1lOiB0aGlzLl9jYXB0dXJpbmdTdGFy dFRpbWV9KTsKICAgICB9CkBAIC0xMjQ4LDEzICsxMjQ4LDEzIEBAIFdJLlRpbWVsaW5lTWFuYWdl ciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9KSk7 CiAgICAgfQogCi0gICAgX2hhbmRsZURPTU5vZGVMb3dQb3dlckNoYW5nZWQoZXZlbnQpCisgICAg X2hhbmRsZURPTU5vZGVQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKGV2ZW50KQog ICAgIHsKLSAgICAgICAgbGV0IHt0aW1lc3RhbXAsIGlzTG93UG93ZXJ9ID0gZXZlbnQuZGF0YTsK KyAgICAgICAgbGV0IHt0aW1lc3RhbXAsIGlzUG93ZXJFZmZpY2llbnR9ID0gZXZlbnQuZGF0YTsK IAotICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQoV0ku TWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuTG93UG93ZXIsIHRpbWVzdGFtcCwgeworICAg ICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQoV0kuTWVkaWFU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdl ZCwgdGltZXN0YW1wLCB7CiAgICAgICAgICAgICBkb21Ob2RlOiBldmVudC50YXJnZXQsCi0gICAg ICAgICAgICBpc0xvd1Bvd2VyLAorICAgICAgICAgICAgaXNQb3dlckVmZmljaWVudCwKICAgICAg ICAgfSkpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9JbWFnZXMvTG93UG93ZXIuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL0xvd1Bvd2VyLnN2ZwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMWI2ZTM4MjA4MDZmNzljZDI5ZDAwODIzNWY2Njc5ZGZiNGU3YmZmYy4uMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvTG93UG93ZXIuc3ZnCisrKyAvZGV2L251bGwKQEAgLTEs OCArMCwwIEBACi08P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgotPCEtLSBD b3B5cmlnaHQgwqkgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgotPHN2 ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJyb290IiB2ZXJzaW9uPSIx LjEiIHZpZXdCb3g9IjAgMCAxNiAxNiI+Ci0gICAgPHBhdGggZmlsbD0icmdiKDE0OCwgMTkwLCAx NjQpIiBkPSJNIDEzIDEgTCAzIDEgQyAxLjg5ODQzOCAxIDEgMS44OTg0MzggMSAzIEwgMSAxMyBD IDEgMTQuMTAxNTYyIDEuODk4NDM4IDE1IDMgMTUgTCAxMyAxNSBDIDE0LjEwMTU2MiAxNSAxNSAx NC4xMDE1NjIgMTUgMTMgTCAxNSAzIEMgMTUgMS44OTg0MzggMTQuMTAxNTYyIDEgMTMgMSBaIi8+ Ci0gICAgPHBhdGggZmlsbD0icmdiKDEwMSwgMTYxLCAxMzQpIiBkPSJNIDEzIDEgTCAzIDEgQyAx Ljg5ODQzOCAxIDEgMS44OTg0MzggMSAzIEwgMSAxMyBDIDEgMTQuMTAxNTYyIDEuODk4NDM4IDE1 IDMgMTUgTCAxMyAxNSBDIDE0LjEwMTU2MiAxNSAxNSAxNC4xMDE1NjIgMTUgMTMgTCAxNSAzIEMg MTUgMS44OTg0MzggMTQuMTAxNTYyIDEgMTMgMSBNIDEzIDIgQyAxMy41NTA3ODEgMiAxNCAyLjQ0 OTIxOSAxNCAzIEwgMTQgMTMgQyAxNCAxMy41NTA3ODEgMTMuNTUwNzgxIDE0IDEzIDE0IEwgMyAx NCBDIDIuNDQ5MjE5IDE0IDIgMTMuNTUwNzgxIDIgMTMgTCAyIDMgQyAyIDIuNDQ5MjE5IDIuNDQ5 MjE5IDIgMyAyIEwgMTMgMiIvPgotICAgIDxwYXRoIGZpbGw9InJnYigxMDEsIDE2MSwgMTM0KSIg ZD0iTSA1IDEzIEwgNiAxMyBMIDExIDEzIEwgMTIgMTMgTCAxMiAxMiBMIDEyIDEwLjg2NDg2NDkg TCAxMiA5Ljg2NDg2NDg2IEwgMTEgOS44NjQ4NjQ4NiBMIDguNTc5NDg3MDkgOS44NjQ4NjQ4MyBM IDguNTc5NDg3MTggNCBMIDguNTc5NDg3MTggMyBMIDcuNTc5NDg3MTggMyBMIDYgMyBMIDUgMyBM IDUgNCBMIDUgMTIgTCA1IDEzIFogTSA1IDEzIi8+Ci0gICAgPHBhdGggZmlsbD0id2hpdGUiIGQ9 Ik0gNiA0IEwgNy41Nzk0ODcxOCA0IEwgNy41Nzk0ODcxOCAxMC44NjQ4NjQ5IEwgMTEgMTAuODY0 ODY0OSBMIDExIDEyIEwgNiAxMiBMIDYgNCBaIE0gNiA0Ii8+Ci08L3N2Zz4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Qb3dlckVmZmljaWVu dFBsYXliYWNrU3RhdGVDaGFuZ2VkLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0ltYWdlcy9Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLnN2ZwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi43OTNhZGYwZTQzYTNmYTEzNWU1ZjM5ODkzNGM3Mjc0N2JmZTUzMzU4Ci0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1Bv d2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQuc3ZnCkBAIC0wLDAgKzEsOCBAQAorPD94 bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KKzxzdmcgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0icm9vdCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIw IDAgMTYgMTYiPgorICAgIDxwYXRoIGZpbGw9InJnYigxNDgsIDE5MCwgMTY0KSIgZD0iTSAxMyAx IEwgMyAxIEMgMS44OTg0MzggMSAxIDEuODk4NDM4IDEgMyBMIDEgMTMgQyAxIDE0LjEwMTU2MiAx Ljg5ODQzOCAxNSAzIDE1IEwgMTMgMTUgQyAxNC4xMDE1NjIgMTUgMTUgMTQuMTAxNTYyIDE1IDEz IEwgMTUgMyBDIDE1IDEuODk4NDM4IDE0LjEwMTU2MiAxIDEzIDEgWiIvPgorICAgIDxwYXRoIGZp bGw9InJnYigxMDEsIDE2MSwgMTM0KSIgZD0iTSAxMyAxIEwgMyAxIEMgMS44OTg0MzggMSAxIDEu ODk4NDM4IDEgMyBMIDEgMTMgQyAxIDE0LjEwMTU2MiAxLjg5ODQzOCAxNSAzIDE1IEwgMTMgMTUg QyAxNC4xMDE1NjIgMTUgMTUgMTQuMTAxNTYyIDE1IDEzIEwgMTUgMyBDIDE1IDEuODk4NDM4IDE0 LjEwMTU2MiAxIDEzIDEgTSAxMyAyIEMgMTMuNTUwNzgxIDIgMTQgMi40NDkyMTkgMTQgMyBMIDE0 IDEzIEMgMTQgMTMuNTUwNzgxIDEzLjU1MDc4MSAxNCAxMyAxNCBMIDMgMTQgQyAyLjQ0OTIxOSAx NCAyIDEzLjU1MDc4MSAyIDEzIEwgMiAzIEMgMiAyLjQ0OTIxOSAyLjQ0OTIxOSAyIDMgMiBMIDEz IDIiLz4KKyAgICA8cGF0aCBmaWxsPSJ3aGl0ZSIgZD0iTSA2Ljc4MTI1IDcuNzY5NTMxIEwgNy4x MzY3MTkgNy43Njk1MzEgQyA3Ljc1NzgxMiA3Ljc2OTUzMSA4LjI0NjA5NCA3LjYzNjcxOSA4LjYw NTQ2OSA3LjM3MTA5NCBDIDguOTY4NzUgNy4xMDU0NjkgOS4xNDg0MzggNi43NDYwOTQgOS4xNDg0 MzggNi4yOTI5NjkgQyA5LjE0ODQzOCA1LjQ5NjA5NCA4LjU5Mzc1IDUuMDk3NjU2IDcuNDg4Mjgx IDUuMDk3NjU2IEwgNi43ODEyNSA1LjA5NzY1NiBaIE0gNSAxMiBMIDUgNCBMIDguMDQyOTY5IDQg QyA5LjEwNTQ2OSA0IDkuODYzMjgxIDQuMTY0MDYyIDEwLjMxNjQwNiA0LjQ4ODI4MSBDIDEwLjc3 MzQzOCA0LjgxNjQwNiAxMSA1LjM1OTM3NSAxMSA2LjEyNSBDIDExIDYuOTg4MjgxIDEwLjY5NTMx MiA3LjY2MDE1NiAxMC4wODU5MzggOC4xNDQ1MzEgQyA5LjQ4MDQ2OSA4LjYyNSA4LjYyODkwNiA4 Ljg2MzI4MSA3LjUzNTE1NiA4Ljg2MzI4MSBMIDYuNzgxMjUgOC44NjMyODEgTCA2Ljc4MTI1IDEy IFoiLz4KKyAgICA8cGF0aCBmaWxsPSJyZ2IoMTAxLCAxNjEsIDEzNCkiIGQ9Ik0gNy43ODEyNSA2 LjY3OTY4OCBMIDcuNzgxMjUgNi4xMTMyODEgQyA4LjAxOTUzMSA2LjEzNjcxOSA4LjExNzE4OCA2 LjE4NzUgOC4xNDQ1MzEgNi4yMDMxMjUgQyA4LjE0MDYyNSA2LjIxMDkzOCA4LjE0ODQzOCA2LjI0 MjE4OCA4LjE0ODQzOCA2LjI5Mjk2OSBDIDguMTQ4NDM4IDYuNDQxNDA2IDguMTA1NDY5IDYuNDk2 MDk0IDguMDE1NjI1IDYuNTY2NDA2IEMgNy45NTMxMjUgNi42MTMyODEgNy44NzUgNi42NDg0Mzgg Ny43ODEyNSA2LjY3OTY4OCBNIDguMDQyOTY5IDMgTCA0IDMgTCA0IDEzIEwgNy43ODEyNSAxMyBM IDcuNzgxMjUgOS44NjMyODEgQyA4Ljk4ODI4MSA5LjgyNDIxOSA5Ljk2ODc1IDkuNTA3ODEyIDEw LjcwNzAzMSA4LjkyNTc4MSBDIDExLjU1MDc4MSA4LjI1NzgxMiAxMiA3LjI4OTA2MiAxMiA2LjEy NSBDIDEyIDQuNzUzOTA2IDExLjQwMjM0NCA0LjAzNTE1NiAxMC45MDIzNDQgMy42NzU3ODEgQyAx MC4yNjU2MjUgMy4yMjI2NTYgOS4zMzIwMzEgMyA4LjA0Mjk2OSAzIE0gNi43ODEyNSA3Ljc2OTUz MSBMIDcuMTM2NzE5IDcuNzY5NTMxIEMgNy43NTc4MTIgNy43Njk1MzEgOC4yNDYwOTQgNy42MzY3 MTkgOC42MDU0NjkgNy4zNzEwOTQgQyA4Ljk2ODc1IDcuMTA1NDY5IDkuMTQ4NDM4IDYuNzQ2MDk0 IDkuMTQ4NDM4IDYuMjkyOTY5IEMgOS4xNDg0MzggNS40OTYwOTQgOC41OTM3NSA1LjA5NzY1NiA3 LjQ4ODI4MSA1LjA5NzY1NiBMIDYuNzgxMjUgNS4wOTc2NTYgTCA2Ljc4MTI1IDcuNzY5NTMxIE0g OC4wNDI5NjkgNCBDIDkuMTA1NDY5IDQgOS44NjMyODEgNC4xNjQwNjIgMTAuMzE2NDA2IDQuNDg4 MjgxIEMgMTAuNzczNDM4IDQuODE2NDA2IDExIDUuMzU5Mzc1IDExIDYuMTI1IEMgMTEgNi45ODgy ODEgMTAuNjk1MzEyIDcuNjYwMTU2IDEwLjA4NTkzOCA4LjE0NDUzMSBDIDkuNDgwNDY5IDguNjI1 IDguNjI4OTA2IDguODYzMjgxIDcuNTM1MTU2IDguODYzMjgxIEwgNi43ODEyNSA4Ljg2MzI4MSBM IDYuNzgxMjUgMTIgTCA1IDEyIEwgNSA0IEwgOC4wNDI5NjkgNCIvPgorPC9zdmc+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpz CmluZGV4IDE4YjdlMTVmZGNiODE1OTU5NWRlNDFlNDY4Yjk2MGM3MmNkYmE1MjMuLmEwODg1Mzdj ODk1OGNjM2E2YjE5NGZiYjE0MWIxMTU2NDMxZDY4YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC0xNDcsNyAr MTQ3LDcgQEAgV0kuRE9NTm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAg ICAgICAgfQogCiAgICAgICAgIHRoaXMuX2RvbUV2ZW50cyA9IFtdOwotICAgICAgICB0aGlzLl9s b3dQb3dlclJhbmdlcyA9IFtdOworICAgICAgICB0aGlzLl9wb3dlckVmZmljaWVudFBsYXliYWNr UmFuZ2VzID0gW107CiAKICAgICAgICAgaWYgKHRoaXMuX3Nob3VsZExpc3RlbkZvckV2ZW50TGlz dGVuZXJzKCkpCiAgICAgICAgICAgICBXSS5ET01Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9N Tm9kZS5FdmVudC5EaWRGaXJlRXZlbnQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaWRGaXJlRXZlbnQs IHRoaXMpOwpAQCAtMTg4LDcgKzE4OCw3IEBAIFdJLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4 dGVuZHMgV0kuT2JqZWN0CiAKICAgICBnZXQgZnJhbWUoKSB7IHJldHVybiB0aGlzLl9mcmFtZTsg fQogICAgIGdldCBkb21FdmVudHMoKSB7IHJldHVybiB0aGlzLl9kb21FdmVudHM7IH0KLSAgICBn ZXQgbG93UG93ZXJSYW5nZXMoKSB7IHJldHVybiB0aGlzLl9sb3dQb3dlclJhbmdlczsgfQorICAg IGdldCBwb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKCkgeyByZXR1cm4gdGhpcy5f cG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlczsgfQogCiAgICAgZ2V0IGF0dGFjaGVkKCkKICAg ICB7CkBAIC03NTcsMzAgKzc1NywzMCBAQCBXSS5ET01Ob2RlID0gY2xhc3MgRE9NTm9kZSBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICB9KTsKICAgICB9CiAKLSAgICB2aWRlb0xvd1Bvd2VyQ2hh bmdlZCh0aW1lc3RhbXAsIGlzTG93UG93ZXIpCisgICAgcG93ZXJFZmZpY2llbnRQbGF5YmFja1N0 YXRlQ2hhbmdlZCh0aW1lc3RhbXAsIGlzUG93ZXJFZmZpY2llbnQpCiAgICAgewogICAgICAgICAv LyBDYWxsZWQgZnJvbSBXSS5ET01NYW5hZ2VyLgogCi0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuY2FuRW50ZXJMb3dQb3dlck1vZGUoKSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMu Y2FuRW50ZXJQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGUoKSk7CiAKLSAgICAgICAgbGV0IGxh c3RWYWx1ZSA9IHRoaXMuX2xvd1Bvd2VyUmFuZ2VzLmxhc3RWYWx1ZTsKKyAgICAgICAgbGV0IGxh c3RWYWx1ZSA9IHRoaXMuX3Bvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZXMubGFzdFZhbHVlOwog Ci0gICAgICAgIGlmIChpc0xvd1Bvd2VyKSB7CisgICAgICAgIGlmIChpc1Bvd2VyRWZmaWNpZW50 KSB7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghbGFzdFZhbHVlIHx8IGxhc3RWYWx1ZS5l bmRUaW1lc3RhbXApOwogICAgICAgICAgICAgaWYgKCFsYXN0VmFsdWUgfHwgbGFzdFZhbHVlLmVu ZFRpbWVzdGFtcCkKLSAgICAgICAgICAgICAgICB0aGlzLl9sb3dQb3dlclJhbmdlcy5wdXNoKHtz dGFydFRpbWVzdGFtcDogdGltZXN0YW1wfSk7CisgICAgICAgICAgICAgICAgdGhpcy5fcG93ZXJF ZmZpY2llbnRQbGF5YmFja1Jhbmdlcy5wdXNoKHtzdGFydFRpbWVzdGFtcDogdGltZXN0YW1wfSk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghbGFzdFZhbHVl IHx8IGxhc3RWYWx1ZS5zdGFydFRpbWVzdGFtcCk7CiAgICAgICAgICAgICBpZiAoIWxhc3RWYWx1 ZSkKLSAgICAgICAgICAgICAgICB0aGlzLl9sb3dQb3dlclJhbmdlcy5wdXNoKHtlbmRUaW1lc3Rh bXA6IHRpbWVzdGFtcH0pOworICAgICAgICAgICAgICAgIHRoaXMuX3Bvd2VyRWZmaWNpZW50UGxh eWJhY2tSYW5nZXMucHVzaCh7ZW5kVGltZXN0YW1wOiB0aW1lc3RhbXB9KTsKICAgICAgICAgICAg IGVsc2UgaWYgKGxhc3RWYWx1ZS5zdGFydFRpbWVzdGFtcCkKICAgICAgICAgICAgICAgICBsYXN0 VmFsdWUuZW5kVGltZXN0YW1wID0gdGltZXN0YW1wOwogICAgICAgICB9CiAKLSAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRE9NTm9kZS5FdmVudC5Mb3dQb3dlckNoYW5n ZWQsIHtpc0xvd1Bvd2VyLCB0aW1lc3RhbXB9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoRE9NTm9kZS5FdmVudC5Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFu Z2VkLCB7aXNQb3dlckVmZmljaWVudCwgdGltZXN0YW1wfSk7CiAgICAgfQogCi0gICAgY2FuRW50 ZXJMb3dQb3dlck1vZGUoKQorICAgIGNhbkVudGVyUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRl KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLmxvY2FsTmFtZSgpID09PSAidmlkZW8iIHx8 IHRoaXMubm9kZU5hbWUoKS50b0xvd2VyQ2FzZSgpID09PSAidmlkZW8iOwogICAgIH0KQEAgLTk1 Nyw3ICs5NTcsNyBAQCBXSS5ET01Ob2RlLkV2ZW50ID0gewogICAgIEF0dHJpYnV0ZVJlbW92ZWQ6 ICJkb20tbm9kZS1hdHRyaWJ1dGUtcmVtb3ZlZCIsCiAgICAgRXZlbnRMaXN0ZW5lcnNDaGFuZ2Vk OiAiZG9tLW5vZGUtZXZlbnQtbGlzdGVuZXJzLWNoYW5nZWQiLAogICAgIERpZEZpcmVFdmVudDog ImRvbS1ub2RlLWRpZC1maXJlLWV2ZW50IiwKLSAgICBMb3dQb3dlckNoYW5nZWQ6ICJkb20tbm9k ZS12aWRlby1sb3ctcG93ZXItY2hhbmdlZCIsCisgICAgUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0 YXRlQ2hhbmdlZDogImRvbS1ub2RlLXBvd2VyLWVmZmljaWVudC1wbGF5YmFjay1zdGF0ZS1jaGFu Z2VkIiwKIH07CiAKIFdJLkRPTU5vZGUuUHNldWRvRWxlbWVudFR5cGUgPSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVt ZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlh SW5zdHJ1bWVudC5qcwppbmRleCAyMGJmNmQ5ZjU5OGE4MDlkZTRmNTEzYzkzYmZlNmMzZjFmYTMz YjIwLi45Y2JjMDZmNWEwMzUzMzhjOGFkNDA3MTc3NTk0M2QxMGQ2ZjdhNTYwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVt ZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9N ZWRpYUluc3RydW1lbnQuanMKQEAgLTM2LDggKzM2LDggQEAgV0kuTWVkaWFJbnN0cnVtZW50ID0g Y2xhc3MgTWVkaWFJbnN0cnVtZW50IGV4dGVuZHMgV0kuSW5zdHJ1bWVudAogCiAgICAgc3RhdGlj IHN1cHBvcnRlZCgpCiAgICAgewotICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTIpOiBE T00uZGlkRmlyZUV2ZW50IGFuZCBET00udmlkZW9Mb3dQb3dlckNoYW5nZWQgZGlkIG5vdCBleGlz dC4KLSAgICAgICAgcmV0dXJuIHdpbmRvdy5ET01BZ2VudCAmJiBET01BZ2VudC5oYXNFdmVudCgi ZGlkRmlyZUV2ZW50IikgJiYgRE9NQWdlbnQuaGFzRXZlbnQoInZpZGVvTG93UG93ZXJDaGFuZ2Vk Iik7CisgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMik6IERPTS5kaWRGaXJlRXZlbnQu CisgICAgICAgIHJldHVybiBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuRE9NICYmIEluc3BlY3Rv ckJhY2tlbmQuZG9tYWlucy5ET00uaGFzRXZlbnQoImRpZEZpcmVFdmVudCIpOwogICAgIH0KIAog ICAgIC8vIFByb3RlY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL01lZGlhVGltZWxpbmVSZWNvcmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFUaW1lbGluZVJlY29yZC5qcwppbmRleCBl ZDM3MDcwNGQ1ZWI5Y2VhNjA0MmQwZDQ2YWE3YTJiMGQ2OWEzMjJiLi5kNTM0NzMyNDZkMDYyYzI1 NWI0OTdlZGJhZGRjZTgwMDExZTdhYzljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFUaW1lbGluZVJlY29yZC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFUaW1lbGluZVJlY29y ZC5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3Mg TWVkaWFUaW1lbGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5lUmVjb3JkCiB7Ci0gICAgY29u c3RydWN0b3IoZXZlbnRUeXBlLCB0aW1lc3RhbXAsIHtkb21Ob2RlLCBkb21FdmVudCwgaXNMb3dQ b3dlcn0gPSB7fSkKKyAgICBjb25zdHJ1Y3RvcihldmVudFR5cGUsIHRpbWVzdGFtcCwge2RvbU5v ZGUsIGRvbUV2ZW50LCBpc1Bvd2VyRWZmaWNpZW50fSA9IHt9KQogICAgIHsKICAgICAgICAgY29u c29sZS5hc3NlcnQoT2JqZWN0LnZhbHVlcyhXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlw ZSkuaW5jbHVkZXMoZXZlbnRUeXBlKSk7CiAKQEAgLTM0LDcgKzM0LDcgQEAgV0kuTWVkaWFUaW1l bGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGlu ZVJlY29yZAogICAgICAgICB0aGlzLl9ldmVudFR5cGUgPSBldmVudFR5cGU7CiAgICAgICAgIHRo aXMuX2RvbU5vZGUgPSBkb21Ob2RlIHx8IG51bGw7CiAgICAgICAgIHRoaXMuX2RvbUV2ZW50ID0g ZG9tRXZlbnQgfHwgbnVsbDsKLSAgICAgICAgdGhpcy5faXNMb3dQb3dlciA9IGlzTG93UG93ZXIg fHwgZmFsc2U7CisgICAgICAgIHRoaXMuX2lzUG93ZXJFZmZpY2llbnQgPSBpc1Bvd2VyRWZmaWNp ZW50IHx8IGZhbHNlOwogICAgIH0KIAogICAgIC8vIEltcG9ydCAvIEV4cG9ydApAQCAtNDIsNiAr NDIsMTEgQEAgV0kuTWVkaWFUaW1lbGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNv cmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29yZAogICAgIHN0YXRpYyBmcm9tSlNPTihqc29uKQog ICAgIHsKICAgICAgICAgbGV0IHtldmVudFR5cGUsIHRpbWVzdGFtcH0gPSBqc29uOworCisgICAg ICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMi4yKTogaXNMb3dQb3dlciB3YXMgcmVuYW1lZCB0 byBpc1Bvd2VyRWZmaWNpZW50LgorICAgICAgICBpZiAoImlzTG93UG93ZXIiIGluIGpzb24gJiYg ISgiaXNQb3dlckVmZmljaWVudCIgaW4ganNvbikpCisgICAgICAgICAgICBqc29uLmlzUG93ZXJF ZmZpY2llbnQgPSBqc29uLmlzTG93UG93ZXI7CisKICAgICAgICAgcmV0dXJuIG5ldyBXSS5NZWRp YVRpbWVsaW5lUmVjb3JkKGV2ZW50VHlwZSwgdGltZXN0YW1wLCBqc29uKTsKICAgICB9CiAKQEAg LTYxLDcgKzY2LDcgQEAgV0kuTWVkaWFUaW1lbGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxp bmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29yZAogICAgICAgICAgICAgZXZlbnRUeXBl OiB0aGlzLl9ldmVudFR5cGUsCiAgICAgICAgICAgICB0aW1lc3RhbXA6IHRoaXMuc3RhcnRUaW1l LAogICAgICAgICAgICAgZG9tRXZlbnQsCi0gICAgICAgICAgICBpc0xvd1Bvd2VyOiB0aGlzLl9p c0xvd1Bvd2VyLAorICAgICAgICAgICAgaXNQb3dlckVmZmljaWVudDogdGhpcy5faXNQb3dlckVm ZmljaWVudCwKICAgICAgICAgfTsKICAgICB9CiAKQEAgLTcwLDcgKzc1LDcgQEAgV0kuTWVkaWFU aW1lbGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1l bGluZVJlY29yZAogICAgIGdldCBldmVudFR5cGUoKSB7IHJldHVybiB0aGlzLl9ldmVudFR5cGU7 IH0KICAgICBnZXQgZG9tTm9kZSgpIHsgcmV0dXJuIHRoaXMuX2RvbU5vZGU7IH0KICAgICBnZXQg ZG9tRXZlbnQoKSB7IHJldHVybiB0aGlzLl9kb21FdmVudDsgfQotICAgIGdldCBpc0xvd1Bvd2Vy KCkgeyByZXR1cm4gdGhpcy5faXNMb3dQb3dlcjsgfQorICAgIGdldCBpc1Bvd2VyRWZmaWNpZW50 KCkgeyByZXR1cm4gdGhpcy5faXNQb3dlckVmZmljaWVudDsgfQogCiAgICAgZ2V0IGRpc3BsYXlO YW1lKCkKICAgICB7CkBAIC04MSw4ICs4Niw4IEBAIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQgPSBj bGFzcyBNZWRpYVRpbWVsaW5lUmVjb3JkIGV4dGVuZHMgV0kuVGltZWxpbmVSZWNvcmQKICAgICAg ICAgICAgIHJldHVybiBldmVudE5hbWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy5f ZXZlbnRUeXBlID09PSBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Mb3dQb3dlcikK LSAgICAgICAgICAgIHJldHVybiB0aGlzLl9pc0xvd1Bvd2VyID8gV0kuVUlTdHJpbmcoIkVudGVy ZWQgTG93LVBvd2VyIE1vZGUiKSA6IFdJLlVJU3RyaW5nKCJFeGl0ZWQgTG93LVBvd2VyIE1vZGUi KTsKKyAgICAgICAgaWYgKHRoaXMuX2V2ZW50VHlwZSA9PT0gTWVkaWFUaW1lbGluZVJlY29yZC5F dmVudFR5cGUuUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZCkKKyAgICAgICAgICAg IHJldHVybiB0aGlzLl9pc1Bvd2VyRWZmaWNpZW50ID8gV0kuVUlTdHJpbmcoIlBvd2VyIEVmZmlj aWVudCBQbGF5YmFjayBTdGFydGVkIikgOiBXSS5VSVN0cmluZygiUG93ZXIgRWZmaWNpZW50IFBs YXliYWNrIFN0b3BwZWQiKTsKIAogICAgICAgICBpZiAodGhpcy5fZG9tTm9kZSkKICAgICAgICAg ICAgIHJldHVybiB0aGlzLl9kb21Ob2RlLmRpc3BsYXlOYW1lOwpAQCAtOTYsMTYgKzEwMSwxOSBA QCBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRl bmRzIFdJLlRpbWVsaW5lUmVjb3JkCiAgICAgICAgIHN1cGVyLnNhdmVJZGVudGl0eVRvQ29va2ll KGNvb2tpZSk7CiAKICAgICAgICAgY29va2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQtZXZlbnQt dHlwZSJdID0gdGhpcy5fZXZlbnRUeXBlOworICAgICAgICBpZiAodGhpcy5fZXZlbnRUeXBlID09 PSBNZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Qb3dlckVmZmljaWVudFBsYXliYWNrU3Rh dGVDaGFuZ2VkKQorICAgICAgICAgICAgY29va2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQtcG93 ZXItZWZmaWNpZW50LXBsYXliYWNrIl0gPSB0aGlzLl9pc1Bvd2VyRWZmaWNpZW50OwogICAgICAg ICBpZiAodGhpcy5fZG9tTm9kZSkKICAgICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxpbmUt cmVjb3JkLWRvbS1ub2RlIl0gPSB0aGlzLl9kb21Ob2RlLnBhdGgoKTsKLSAgICAgICAgaWYgKHRo aXMuX2RvbUV2ZW50KQorICAgICAgICBpZiAodGhpcy5fZG9tRXZlbnQpIHsKICAgICAgICAgICAg IGNvb2tpZVsibWVkaWEtdGltZWxpbmUtcmVjb3JkLWRvbS1ldmVudCJdID0gdGhpcy5fZG9tRXZl bnQuZXZlbnROYW1lOwotICAgICAgICBpZiAodGhpcy5faXNMb3dQb3dlciB8fCAodGhpcy5fZG9t RXZlbnQgJiYgdGhpcy5fZG9tRXZlbnQuZGF0YSAmJiB0aGlzLl9kb21FdmVudC5kYXRhLmVuYWJs ZWQpKQotICAgICAgICAgICAgY29va2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQtYWN0aXZlIl0g PSB0cnVlOworICAgICAgICAgICAgaWYgKHRoaXMuX2RvbUV2ZW50LmRhdGEgJiYgdGhpcy5fZG9t RXZlbnQuZGF0YS5lbmFibGVkKQorICAgICAgICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxp bmUtcmVjb3JkLWRvbS1ldmVudC1hY3RpdmUiXSA9IHRydWU7CisgICAgICAgIH0KICAgICB9CiB9 OwogCiBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZSA9IHsKICAgICBET01FdmVudDog ImRvbS1ldmVudCIsCi0gICAgTG93UG93ZXI6ICJsb3ctcG93ZXIiLAorICAgIFBvd2VyRWZmaWNp ZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQ6ICJwb3dlci1lZmZpY2llbnQtcGxheWJhY2stc3RhdGUt Y2hhbmdlZCIsCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzCmluZGV4IGQwOWZhNjYx ZTQ3YWE4MGZmM2MyNTE4N2UxNGMyMDk1YjQ2MGE3MjMuLjk3NDQwOWNkZjNhZDVjZDg1MWJiNGMz YmZjMzVhM2FiNDcwNDA3ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29yZGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKQEAgLTQ2 Nyw4ICs0NjcsOCBAQCBXSS5UaW1lbGluZVJlY29yZGluZyA9IGNsYXNzIFRpbWVsaW5lUmVjb3Jk aW5nIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBpZiAocmVjb3JkLmV2ZW50VHlwZSA9 PT0gV0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuRE9NRXZlbnQpIHsKICAgICAgICAg ICAgICAgICBpZiAocmVjb3JkLmRvbUV2ZW50ICYmIHJlY29yZC5kb21FdmVudC5ldmVudE5hbWUp CiAgICAgICAgICAgICAgICAgICAgIGtleSArPSAiOiIgKyByZWNvcmQuZG9tRXZlbnQuZXZlbnRO YW1lOwotICAgICAgICAgICAgfSBlbHNlIGlmIChyZWNvcmQuZXZlbnRUeXBlID09PSBXSS5NZWRp YVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Mb3dQb3dlcikKLSAgICAgICAgICAgICAgICBrZXkg Kz0gIjoiICsgKHJlY29yZC5pc0xvd1Bvd2VyID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7Cisg ICAgICAgICAgICB9IGVsc2UgaWYgKHJlY29yZC5ldmVudFR5cGUgPT09IFdJLk1lZGlhVGltZWxp bmVSZWNvcmQuRXZlbnRUeXBlLlBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQpCisg ICAgICAgICAgICAgICAga2V5ICs9ICI6IiArIChyZWNvcmQuaXNQb3dlckVmZmljaWVudCA/ICJl bmFibGVkIiA6ICJkaXNhYmxlZCIpOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZWNvcmQuc291 cmNlQ29kZUxvY2F0aW9uKQogICAgICAgICAgICAga2V5ICs9ICI6IiArIHJlY29yZC5zb3VyY2VD b2RlTG9jYXRpb24ubGluZU51bWJlciArICI6IiArIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24u Y29sdW1uTnVtYmVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcwppbmRleCBlZWRkYjI4ZjAxMDlhYThm NmM3YmQ0ZDE3YmI4ZjM1OGE3NmRmYzFmLi43M2NiZWYzMjYwZDA4YTdiNmE1ZThjNmMzZGU0MmUz NTQ0NGNhNjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcwpAQCAtMTE5LDYgKzExOSwxMiBAQCBX SS5ET01PYnNlcnZlciA9IGNsYXNzIERPTU9ic2VydmVyCiAKICAgICB2aWRlb0xvd1Bvd2VyQ2hh bmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXNMb3dQb3dlcikKICAgICB7Ci0gICAgICAgIFdJLmRv bU1hbmFnZXIudmlkZW9Mb3dQb3dlckNoYW5nZWQobm9kZUlkLCB0aW1lc3RhbXAsIGlzTG93UG93 ZXIpOworICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTIuMik6IERPTS52aWRlb0xvd1Bv d2VyQ2hhbmdlZCB3YXMgcmVuYW1lZCB0byBET00ucG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRl Q2hhbmdlZC4KKyAgICAgICAgV0kuZG9tTWFuYWdlci5wb3dlckVmZmljaWVudFBsYXliYWNrU3Rh dGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1wLCBpc0xvd1Bvd2VyKTsKKyAgICB9CisKKyAgICBw b3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1wLCBpc1Bv d2VyRWZmaWNpZW50KQorICAgIHsKKyAgICAgICAgV0kuZG9tTWFuYWdlci5wb3dlckVmZmljaWVu dFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50 KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtkb3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmNzcwppbmRl eCA2NGFlYTI0YjFkNDViYjcxZTA4ZTRlZThhYTU0ZmQ5ZDdiZmMwMTJhLi43OGZiMTk2YzcyZmIx NzQ2N2M4NTY5MzdjMjFkNDNlYjc3Mzk3M2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVh a2Rvd25WaWV3LmNzcwpAQCAtNzYsNyArNzYsNyBAQAogICAgIGJhY2tncm91bmQtY29sb3I6IGhz bGEoMCwgMCUsIDc1JSwgMC4yNSk7CiB9CiAKLS5kb20tZXZlbnRzLWJyZWFrZG93biAuZ3JhcGgg PiAuYXJlYS5sb3ctcG93ZXIgeworLmRvbS1ldmVudHMtYnJlYWtkb3duIC5ncmFwaCA+IC5hcmVh LnBvd2VyLWVmZmljaWVudC1wbGF5YmFjayB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsYSg4 MywgMTAwJSwgNDglLCAwLjQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtkb3duVmll dy5qcwppbmRleCA4OWZmNWZmYTgzYmQwNWFhYmY5MzI3NjQ0MzRkYjQ3MjI5ODhiYTU2Li4yNWZm M2Q2Njk1ZDRiZTg0MmFmYTY0ZjQ5MmMzNzNkZjJkZGYwZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTUV2 ZW50c0JyZWFrZG93blZpZXcuanMKQEAgLTM0LDE0ICszNCwxMyBAQCBXSS5ET01FdmVudHNCcmVh a2Rvd25WaWV3ID0gY2xhc3MgRE9NRXZlbnRzQnJlYWtkb3duVmlldyBleHRlbmRzIFdJLlZpZXcK ICAgICAgICAgaWYgKGRvbU5vZGVPckV2ZW50cyBpbnN0YW5jZW9mIFdJLkRPTU5vZGUpIHsKICAg ICAgICAgICAgIHRoaXMuX2RvbU5vZGUgPSBkb21Ob2RlT3JFdmVudHM7CiAgICAgICAgICAgICB0 aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTm9kZS5FdmVudC5EaWRGaXJlRXZl bnQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaWRGaXJlRXZlbnQsIHRoaXMpOwotICAgICAgICAgICAg aWYgKHRoaXMuX2RvbU5vZGUuY2FuRW50ZXJMb3dQb3dlck1vZGUoKSkKLSAgICAgICAgICAgICAg ICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTm9kZS5FdmVudC5Mb3dQb3dl ckNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVMb3dQb3dlckNoYW5nZWQsIHRoaXMpOworICAg ICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUuY2FuRW50ZXJQb3dlckVmZmljaWVudFBsYXliYWNr U3RhdGUoKSkKKyAgICAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIo V0kuRE9NTm9kZS5FdmVudC5Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB0aGlz Ll9oYW5kbGVET01Ob2RlUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZCwgdGhpcyk7 CiAKICAgICAgICAgICAgIHRoaXMuX2RvbUV2ZW50cyA9IG51bGw7CiAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlID0gbnVsbDsKICAgICAgICAgICAgIHRoaXMuX2Rv bUV2ZW50cyA9IGRvbU5vZGVPckV2ZW50czsKLSAgICAgICAgICAgIHRoaXMuX2xvd1Bvd2VyUmFu Z2VzID0gW107CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9pbmNsdWRlR3JhcGggPSBpbmNs dWRlR3JhcGggfHwgZmFsc2U7CkBAIC0xMTIsNyArMTExLDcgQEAgV0kuRE9NRXZlbnRzQnJlYWtk b3duVmlldyA9IGNsYXNzIERPTUV2ZW50c0JyZWFrZG93blZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgICAgICAgICAgZnVsbHNjcmVlblJhbmdlcy5sYXN0VmFsdWUub3JpZ2luYXRvciA9IGZ1 bGxzY3JlZW5ET01FdmVudC5vcmlnaW5hdG9yOwogICAgICAgICB9CiAKLSAgICAgICAgbGV0IGxv d1Bvd2VyUmFuZ2VzID0gdGhpcy5fZG9tTm9kZSA/IHRoaXMuX2RvbU5vZGUubG93UG93ZXJSYW5n ZXMgOiBbXTsKKyAgICAgICAgbGV0IHBvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZXMgPSB0aGlz Ll9kb21Ob2RlID8gdGhpcy5fZG9tTm9kZS5wb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VzIDog W107CiAKICAgICAgICAgZm9yIChsZXQgZG9tRXZlbnQgb2YgZG9tRXZlbnRzKSB7CiAgICAgICAg ICAgICBsZXQgcm93RWxlbWVudCA9IHRoaXMuX3RhYmxlQm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidHIiKSk7CkBAIC0xMzgsMTMgKzEzNywxMyBAQCBXSS5E T01FdmVudHNCcmVha2Rvd25WaWV3ID0gY2xhc3MgRE9NRXZlbnRzQnJlYWtkb3duVmlldyBleHRl bmRzIFdJLlZpZXcKICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bGxzY3JlZW5BcmVhLnRpdGxl ID0gV0kuVUlTdHJpbmcoIkZ1bGwtU2NyZWVuIik7CiAgICAgICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICAgICAgbGV0IGxvd1Bvd2VyUmFuZ2UgPSBsb3dQb3dlclJhbmdlcy5maW5kKChyYW5n ZSkgPT4gZG9tRXZlbnQudGltZXN0YW1wID49IHJhbmdlLnN0YXJ0VGltZXN0YW1wICYmIGRvbUV2 ZW50LnRpbWVzdGFtcCA8PSByYW5nZS5lbmRUaW1lc3RhbXApOwotICAgICAgICAgICAgICAgIGlm IChsb3dQb3dlclJhbmdlKSB7Ci0gICAgICAgICAgICAgICAgICAgIGxldCBsb3dQb3dlckFyZWEg PSBncmFwaENlbGwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwot ICAgICAgICAgICAgICAgICAgICBsb3dQb3dlckFyZWEuY2xhc3NMaXN0LmFkZCgiYXJlYSIsICJs b3ctcG93ZXIiKTsKLSAgICAgICAgICAgICAgICAgICAgbG93UG93ZXJBcmVhLnRpdGxlID0gV0ku VUlTdHJpbmcoIkxvdy1Qb3dlciBNb2RlIik7Ci0gICAgICAgICAgICAgICAgICAgIGxvd1Bvd2Vy QXJlYS5zdHlsZS5zZXRQcm9wZXJ0eShzdHlsZUF0dHJpYnV0ZSwgcGVyY2VudE9mVG90YWxUaW1l KGxvd1Bvd2VyUmFuZ2Uuc3RhcnRUaW1lc3RhbXAgLSBzdGFydFRpbWVzdGFtcCkgKyAiJSIpOwot ICAgICAgICAgICAgICAgICAgICBsb3dQb3dlckFyZWEuc3R5bGUuc2V0UHJvcGVydHkoIndpZHRo IiwgcGVyY2VudE9mVG90YWxUaW1lKGxvd1Bvd2VyUmFuZ2UuZW5kVGltZXN0YW1wIC0gbG93UG93 ZXJSYW5nZS5zdGFydFRpbWVzdGFtcCkgKyAiJSIpOworICAgICAgICAgICAgICAgIGxldCBwb3dl ckVmZmljaWVudFBsYXliYWNrUmFuZ2UgPSBwb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VzLmZp bmQoKHJhbmdlKSA9PiBkb21FdmVudC50aW1lc3RhbXAgPj0gcmFuZ2Uuc3RhcnRUaW1lc3RhbXAg JiYgZG9tRXZlbnQudGltZXN0YW1wIDw9IHJhbmdlLmVuZFRpbWVzdGFtcCk7CisgICAgICAgICAg ICAgICAgaWYgKHBvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZSkgeworICAgICAgICAgICAgICAg ICAgICBsZXQgcG93ZXJFZmZpY2llbnRQbGF5YmFja0FyZWEgPSBncmFwaENlbGwuYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOworICAgICAgICAgICAgICAgICAgICBw b3dlckVmZmljaWVudFBsYXliYWNrQXJlYS5jbGFzc0xpc3QuYWRkKCJhcmVhIiwgInBvd2VyLWVm ZmljaWVudC1wbGF5YmFjayIpOworICAgICAgICAgICAgICAgICAgICBwb3dlckVmZmljaWVudFBs YXliYWNrQXJlYS50aXRsZSA9IFdJLlVJU3RyaW5nKCJQb3dlciBFZmZpY2llbnQgUGxheWJhY2si KTsKKyAgICAgICAgICAgICAgICAgICAgcG93ZXJFZmZpY2llbnRQbGF5YmFja0FyZWEuc3R5bGUu c2V0UHJvcGVydHkoc3R5bGVBdHRyaWJ1dGUsIHBlcmNlbnRPZlRvdGFsVGltZShwb3dlckVmZmlj aWVudFBsYXliYWNrUmFuZ2Uuc3RhcnRUaW1lc3RhbXAgLSBzdGFydFRpbWVzdGFtcCkgKyAiJSIp OworICAgICAgICAgICAgICAgICAgICBwb3dlckVmZmljaWVudFBsYXliYWNrQXJlYS5zdHlsZS5z ZXRQcm9wZXJ0eSgid2lkdGgiLCBwZXJjZW50T2ZUb3RhbFRpbWUocG93ZXJFZmZpY2llbnRQbGF5 YmFja1JhbmdlLmVuZFRpbWVzdGFtcCAtIHBvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZS5zdGFy dFRpbWVzdGFtcCkgKyAiJSIpOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAg IGxldCBncmFwaEltYWdlID0gZ3JhcGhDZWxsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImltZyIpKTsKQEAgLTE4Myw3ICsxODIsNyBAQCBXSS5ET01FdmVudHNCcmVha2Rvd25W aWV3ID0gY2xhc3MgRE9NRXZlbnRzQnJlYWtkb3duVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAg ICAgdGhpcy5uZWVkc0xheW91dCgpOwogICAgIH0KIAotICAgIF9oYW5kbGVET01Ob2RlTG93UG93 ZXJDaGFuZ2VkKGV2ZW50KQorICAgIF9oYW5kbGVET01Ob2RlUG93ZXJFZmZpY2llbnRQbGF5YmFj a1N0YXRlQ2hhbmdlZChldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsK ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MKaW5kZXggNmUz ZGQxZTQ1YjhjNmQ4N2MzODVmZDhlMTBjNWRiMjYyZDI3Njk2Ny4uMDlhMDAyY2U1YzhmYTNiMGNi MTlmNTIyNmRiZjgwNjY3OGYxMWZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuY3NzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmNzcwpAQCAtMjExLDcgKzIxMSw3IEBAIGJvZHlbZGlyPXJ0bF0gLm5ldHdvcmstdGFi bGUgLmNlbGwubmFtZSA+IC5zdGF0dXMgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbGEoMCwg MCUsIDc1JSwgMC43NSk7CiB9CiAKLS5uZXR3b3JrLXRhYmxlIDpub3QoLmhlYWRlcikgLmNlbGwu d2F0ZXJmYWxsIC53YXRlcmZhbGwtY29udGFpbmVyID4gLmFyZWEubG93LXBvd2VyIHsKKy5uZXR3 b3JrLXRhYmxlIDpub3QoLmhlYWRlcikgLmNlbGwud2F0ZXJmYWxsIC53YXRlcmZhbGwtY29udGFp bmVyID4gLmFyZWEucG93ZXItZWZmaWNpZW50LXBsYXliYWNrIHsKICAgICBiYWNrZ3JvdW5kLWNv bG9yOiB2YXIoLS1uZXR3b3JrLXJlcXVlc3QtY29sb3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4IGE3YTlmYzdiYjI1ZjIxN2UyMzE2Y2IzZWM4NmFi YjA2NmIyYmY0MDcuLjMzYjkxNjNjNzYwYTYwNzlhZGY1YjhlNGM0MWM1NGZmYzE1ZTBmYjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCkBAIC04MjIsMTUgKzgyMiwx NSBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRl bnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgZm9yIChsZXQgbG93UG93ZXJSYW5nZSBvZiBkb21Ob2RlLmxv d1Bvd2VyUmFuZ2VzKSB7Ci0gICAgICAgICAgICAgICAgbGV0IHN0YXJ0VGltZXN0YW1wID0gbG93 UG93ZXJSYW5nZS5zdGFydFRpbWVzdGFtcCB8fCBncmFwaFN0YXJ0VGltZTsKLSAgICAgICAgICAg ICAgICBsZXQgZW5kVGltZXN0YW1wID0gbG93UG93ZXJSYW5nZS5lbmRUaW1lc3RhbXAgfHwgY29s bGVjdGlvbi53YXRlcmZhbGxFbmRUaW1lOworICAgICAgICAgICAgZm9yIChsZXQgcG93ZXJFZmZp Y2llbnRQbGF5YmFja1JhbmdlIG9mIGRvbU5vZGUucG93ZXJFZmZpY2llbnRQbGF5YmFja1Jhbmdl cykgeworICAgICAgICAgICAgICAgIGxldCBzdGFydFRpbWVzdGFtcCA9IHBvd2VyRWZmaWNpZW50 UGxheWJhY2tSYW5nZS5zdGFydFRpbWVzdGFtcCB8fCBncmFwaFN0YXJ0VGltZTsKKyAgICAgICAg ICAgICAgICBsZXQgZW5kVGltZXN0YW1wID0gcG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlLmVu ZFRpbWVzdGFtcCB8fCBjb2xsZWN0aW9uLndhdGVyZmFsbEVuZFRpbWU7CiAKLSAgICAgICAgICAg ICAgICBsZXQgbG93UG93ZXJFbGVtZW50ID0gY29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgICAgICAgICBsb3dQb3dlckVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgiYXJlYSIsICJsb3ctcG93ZXIiKTsKLSAgICAgICAgICAgICAgICBsb3dQ b3dlckVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiTG93LVBvd2VyIE1vZGUiKTsKLSAgICAg ICAgICAgICAgICBwb3NpdGlvbkJ5U3RhcnRPZmZzZXQobG93UG93ZXJFbGVtZW50LCBzdGFydFRp bWVzdGFtcCk7Ci0gICAgICAgICAgICAgICAgc2V0V2lkdGhGb3JEdXJhdGlvbihsb3dQb3dlckVs ZW1lbnQsIHN0YXJ0VGltZXN0YW1wLCBlbmRUaW1lc3RhbXApOworICAgICAgICAgICAgICAgIGxl dCBwb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VFbGVtZW50ID0gY29udGFpbmVyLmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICAgICAgICAgICAgICBwb3dl ckVmZmljaWVudFBsYXliYWNrUmFuZ2VFbGVtZW50LmNsYXNzTGlzdC5hZGQoImFyZWEiLCAicG93 ZXItZWZmaWNpZW50LXBsYXliYWNrIik7CisgICAgICAgICAgICAgICAgcG93ZXJFZmZpY2llbnRQ bGF5YmFja1JhbmdlRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5nKCJQb3dlciBFZmZpY2llbnQg UGxheWJhY2siKTsKKyAgICAgICAgICAgICAgICBwb3NpdGlvbkJ5U3RhcnRPZmZzZXQocG93ZXJF ZmZpY2llbnRQbGF5YmFja1JhbmdlRWxlbWVudCwgc3RhcnRUaW1lc3RhbXApOworICAgICAgICAg ICAgICAgIHNldFdpZHRoRm9yRHVyYXRpb24ocG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlRWxl bWVudCwgc3RhcnRUaW1lc3RhbXAsIGVuZFRpbWVzdGFtcCk7CiAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIGxldCBwbGF5aW5nID0gZmFsc2U7CkBAIC0xODE5LDggKzE4MTksOCBAQCBXSS5O ZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICAgICAgdGhpcy5fZG9tTm9kZUVudHJpZXMuc2V0 KHJlc291cmNlLmluaXRpYXRvck5vZGUsIG5vZGVFbnRyeSk7CiAKICAgICAgICAgICAgIHJlc291 cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LkRpZEZp cmVFdmVudCwgdGhpcy5faGFuZGxlTm9kZURpZEZpcmVFdmVudCwgdGhpcyk7Ci0gICAgICAgICAg ICBpZiAocmVzb3VyY2UuaW5pdGlhdG9yTm9kZS5jYW5FbnRlckxvd1Bvd2VyTW9kZSgpKQotICAg ICAgICAgICAgICAgIHJlc291cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5E T01Ob2RlLkV2ZW50Lkxvd1Bvd2VyQ2hhbmdlZCwgdGhpcy5faGFuZGxlTm9kZUxvd1Bvd2VyQ2hh bmdlZCwgdGhpcyk7CisgICAgICAgICAgICBpZiAocmVzb3VyY2UuaW5pdGlhdG9yTm9kZS5jYW5F bnRlclBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZSgpKQorICAgICAgICAgICAgICAgIHJlc291 cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LlBvd2Vy RWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVQb3dlckVm ZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAg IGlmICghdGhpcy5fZW50cmllc1NvcnRDb21wYXJhdG9yKQpAQCAtMTg1OCw3ICsxODU4LDcgQEAg V0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgX2hhbmRs ZU5vZGVMb3dQb3dlckNoYW5nZWQoZXZlbnQpCisgICAgX2hhbmRsZURPTU5vZGVQb3dlckVmZmlj aWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fcnVu Rm9yTWFpbkNvbGxlY3Rpb24oKGNvbGxlY3Rpb24sIHdhc01haW4pID0+IHsKICAgICAgICAgICAg IGxldCBkb21Ob2RlID0gZXZlbnQudGFyZ2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVJY29ucy5jc3MgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUljb25zLmNzcwppbmRleCBj YThlODkzMzkzZjc0NmUzOGI4NDg2NTExNjdlM2Y2ODBmOTViZjAyLi43ZTQxMjQ1ZGMwZmMyMjk0 ZDhmMjdkYzgzY2FjN2UwYzBhMThmYzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUljb25zLmNzcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUljb25zLmNzcwpAQCAtMTMz LDggKzEzMyw4IEBACiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9ET01FdmVudEZ1bGxzY3Jl ZW4uc3ZnKTsKIH0KIAotLmxvdy1wb3dlci1yZWNvcmQgLmljb24gewotICAgIGNvbnRlbnQ6IHVy bCguLi9JbWFnZXMvTG93UG93ZXIuc3ZnKTsKKy5wb3dlci1lZmZpY2llbnQtcGxheWJhY2stc3Rh dGUtY2hhbmdlZC1yZWNvcmQgLmljb24geworICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUG93 ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZC5zdmcpOwogfQogCiBAbWVkaWEgKHByZWZl cnMtY29sb3Itc2NoZW1lOiBkYXJrKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmll dy5qcwppbmRleCBhZWQ1ZWNmMDgzYTlmZmVlYWMxODRjNDUzYTQ1YzU1MmI5YzQwMWFiLi4zMmQ5 MjE1YWZlMjRiYzFkNjJlZGI0MGZlOTAwMmZkNDdlN2ViNzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lVGFiQ29udGVudFZpZXcuanMKQEAgLTI1MSw4ICsyNTEsOCBAQCBXSS5UaW1lbGluZVRhYkNv bnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRCcm93cwogICAgICAgICAgICAgc3dpdGNoICh0aW1lbGluZVJlY29yZC5ldmVudFR5cGUpIHsK ICAgICAgICAgICAgIGNhc2UgV0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuRE9NRXZl bnQ6CiAgICAgICAgICAgICAgICAgcmV0dXJuICJkb20tZXZlbnQtcmVjb3JkIjsKLSAgICAgICAg ICAgIGNhc2UgV0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuTG93UG93ZXI6Ci0gICAg ICAgICAgICAgICAgcmV0dXJuICJsb3ctcG93ZXItcmVjb3JkIjsKKyAgICAgICAgICAgIGNhc2Ug V0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0 YXRlQ2hhbmdlZDoKKyAgICAgICAgICAgICAgICByZXR1cm4gInBvd2VyLWVmZmljaWVudC1wbGF5 YmFjay1zdGF0ZS1jaGFuZ2VkLXJlY29yZCI7CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAg ICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gTWVkaWFUaW1lbGluZVJlY29yZCBldmVu dFR5cGU6ICIgKyB0aW1lbGluZVJlY29yZC5ldmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkKTsKICAg ICAgICAgICAgIH0K 369007 2019-05-03 15:49:38 -0700 2019-05-03 16:08:25 -0700 Patch bug-197296-20190503154937.patch text/plain 36465 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDg0YjQ0MjMyYTY2MDUzNjA3ZmRiNjcwZjQ5ZjM5 OTc5NmQ4OWE1NWMuLjI2MGViYzNlNzJmOTkwNzViNmZlODFmMWE3ZmQ4M2VkZTgxMGEyOWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1LTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IHJlbmFtZSAibG93IHBvd2VyIiB0byAiZGlzcGxheSBjb21wb3NpdGVkIgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Mjk2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFJlbW92ZWQgc3BlY2lmaWMg Q2hhbmdlTG9nIGVudHJpZXMgc2luY2UgaXQgaXMgYWxtb3N0IGVudGlyZWx5IG1lY2hhbmljYWwg Y2hhbmdlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbjoKKwogMjAx OS0wNS0wMSAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBCYXNl bGluZSBKSVQgc2hvdWxkIGRvIGFyZ3VtZW50IHZhbHVlIHByb2ZpbGluZyBhZnRlciBjaGVja2lu ZyBmb3Igc3RhY2sgb3ZlcmZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MGE0NDQwN2ZjZTg1ZjdiNzI2MmRl ZWY2YTBlYmI5ZDc4NTE0OTczLi4zMjBhZWQ0NWI1ODU2MTA5NTJkNGM5YzYwNTQxNTdiM2ZkMjBk NjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDUtMDMgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERPTTogcmVu YW1lICJsb3cgcG93ZXIiIHRvICJkaXNwbGF5IGNvbXBvc2l0ZWQiCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyOTYKKworICAgICAgICBSZXZpZXdl ZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgUmVtb3ZlZCBzcGVjaWZpYyBDaGFuZ2VM b2cgZW50cmllcyBzaW5jZSBpdCBpcyBhbG1vc3QgZW50aXJlbHkgbWVjaGFuaWNhbCBjaGFuZ2Vz LgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oOgorICAg ICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorCiAyMDE5LTA1 LTAxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkF1 dGhOXSBBZG9wdCBTZWN1cml0eU9yaWdpbjo6aXNNYXRjaGluZ1JlZ2lzdHJhYmxlRG9tYWluU3Vm Zml4KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlkYzhkMGQyOTkxMzQ5NzZkM2I2MjMx YzA2ODAxNWZiOTg0OTUxOWIuLmY4YjgzY2M2NTRiMzFhY2MxNDkzOWNlMTljODQxZDMwN2U1ZGFm ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA1LTAz ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBET006IHJlbmFtZSAibG93IHBvd2VyIiB0byAiZGlzcGxheSBjb21wb3NpdGVkIgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Mjk2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFJlbW92ZWQgc3Bl Y2lmaWMgQ2hhbmdlTG9nIGVudHJpZXMgc2luY2UgaXQgaXMgYWxtb3N0IGVudGlyZWx5IG1lY2hh bmljYWwgY2hhbmdlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2Jz ZXJ2ZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2Vy LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVtZW50LmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlhVGltZWxpbmVSZWNvcmQuanM6CisgICAgICAgICogVXNl ckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtkb3duVmlldy5jc3M6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lSWNvbnMuY3NzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0ltYWdlcy9Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLnN2Zzog QWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9JbWFnZXMvTG93UG93ZXIuc3ZnOiBSZW1v dmVkLgorICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKwogMjAxOS0wNC0yOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDI5OTM5Nj4gRml4IGludGVybmFsIEhp Z2ggU2llcnJhIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL0RPTS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9w cm90b2NvbC9ET00uanNvbgppbmRleCAxMTk1ZTg4NmRlOTJhMTcxYWRlNDhlODMyYzZhMDZhNjM0 NTQyMWYwLi43NzkxMGM5YjRjODJlZGI3NjBmZDkyNjQ2ZmRkNGY3MjcxMjExZDAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAg LTY3NywxMiArNjc3LDEyIEBACiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCiAgICAgICAgIHsK LSAgICAgICAgICAgICJuYW1lIjogInZpZGVvTG93UG93ZXJDaGFuZ2VkIiwKLSAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJDYWxsZWQgd2hlbiBhIHZpZGVvIGVsZW1lbnQgZW50ZXJzL2V4aXRz IGxvdyBwb3dlciBtb2RlLiIsCisgICAgICAgICAgICAibmFtZSI6ICJwb3dlckVmZmljaWVudFBs YXliYWNrU3RhdGVDaGFuZ2VkIiwKKyAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJDYWxsZWQg d2hlbiBhbiBlbGVtZW50IGVudGVycy9leGl0cyBhIHBvd2VyIGVmZmljaWVudCBwbGF5YmFjayBz dGF0ZS4iLAogICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJub2RlSWQiLCAiJHJlZiI6ICJOb2RlSWQiIH0sCi0gICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ0aW1lc3RhbXAiLCAiJHJlZiI6ICJOZXR3b3JrLlRpbWVzdGFtcCIsICJkZXNjcmlw dGlvbiI6ICJUaW1lIHdoZW4gdGhlIHZpZGVvIGVsZW1lbnQgZW50ZXJlZC9leGl0ZWQgbG93IHBv d2VyIG1vZGUiIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpc0xvd1Bvd2VyIiwgInR5 cGUiOiAiYm9vbGVhbiIgfQorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwg IiRyZWYiOiAiTmV0d29yay5UaW1lc3RhbXAiIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJpc1Bvd2VyRWZmaWNpZW50IiwgInR5cGUiOiAiYm9vbGVhbiIgfQogICAgICAgICAgICAgXQog ICAgICAgICB9CiAgICAgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBjZTZhMjc5OGMyNWNkMjY4ZDViMmM2MmMy ZDY2MDE4NWMzNGFjNmYwLi5mMzQ1ZjE1YjdhZTViZjZjYzQ1ODIzYWRkMjllNGI2N2U0YWM2NzAw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRP TUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ckRPTUFnZW50LmNwcApAQCAtMjUxNCwxNCArMjUxNCwxNCBAQCB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjptZWRpYU1ldHJpY3NUaW1lckZpcmVkKCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CiAKLSAgICAgICAgYm9vbCBpc0xvd1Bvd2VyID0gKGRpc3BsYXlDb21wb3NpdGVkVmlk ZW9GcmFtZXMgLSBpdGVyYXRvci0+dmFsdWUuZGlzcGxheUNvbXBvc2l0ZWRGcmFtZXMpID4gMDsK LSAgICAgICAgaWYgKGl0ZXJhdG9yLT52YWx1ZS5pc0xvd1Bvd2VyICE9IGlzTG93UG93ZXIpIHsK LSAgICAgICAgICAgIGl0ZXJhdG9yLT52YWx1ZS5pc0xvd1Bvd2VyID0gaXNMb3dQb3dlcjsKKyAg ICAgICAgYm9vbCBpc1Bvd2VyRWZmaWNpZW50ID0gKGRpc3BsYXlDb21wb3NpdGVkVmlkZW9GcmFt ZXMgLSBpdGVyYXRvci0+dmFsdWUuZGlzcGxheUNvbXBvc2l0ZWRGcmFtZXMpID4gMDsKKyAgICAg ICAgaWYgKGl0ZXJhdG9yLT52YWx1ZS5pc1Bvd2VyRWZmaWNpZW50ICE9IGlzUG93ZXJFZmZpY2ll bnQpIHsKKyAgICAgICAgICAgIGl0ZXJhdG9yLT52YWx1ZS5pc1Bvd2VyRWZmaWNpZW50ID0gaXNQ b3dlckVmZmljaWVudDsKIAogICAgICAgICAgICAgaW50IG5vZGVJZCA9IHB1c2hOb2RlUGF0aFRv RnJvbnRlbmQobWVkaWFFbGVtZW50KTsKICAgICAgICAgICAgIGlmIChub2RlSWQpIHsKICAgICAg ICAgICAgICAgICBhdXRvIHRpbWVzdGFtcCA9IG1fZW52aXJvbm1lbnQuZXhlY3V0aW9uU3RvcHdh dGNoKCktPmVsYXBzZWRUaW1lKCkuc2Vjb25kcygpOwotICAgICAgICAgICAgICAgIG1fZnJvbnRl bmREaXNwYXRjaGVyLT52aWRlb0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXRl cmF0b3ItPnZhbHVlLmlzTG93UG93ZXIpOworICAgICAgICAgICAgICAgIG1fZnJvbnRlbmREaXNw YXRjaGVyLT5wb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0 YW1wLCBpdGVyYXRvci0+dmFsdWUuaXNQb3dlckVmZmljaWVudCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JET01BZ2VudC5oCmluZGV4IGRmMjNjZWQ2MmViZDVjM2NkOWE4MDIzNTQ0YWMwNWY3ODY5 NmJmM2MuLmNiNTliODFhYjZmZDM0MTExNjQ1MDA1MGUxMWIxMGViYTA1ZTc4NDggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmgK QEAgLTI2NCw3ICsyNjQsNyBAQCBwcml2YXRlOgogICAgIFRpbWVyIG1fbWVkaWFNZXRyaWNzVGlt ZXI7CiAgICAgc3RydWN0IE1lZGlhTWV0cmljcyB7CiAgICAgICAgIHVuc2lnbmVkIGRpc3BsYXlD b21wb3NpdGVkRnJhbWVzIHsgMCB9OwotICAgICAgICBib29sIGlzTG93UG93ZXIgeyBmYWxzZSB9 OworICAgICAgICBib29sIGlzUG93ZXJFZmZpY2llbnQgeyBmYWxzZSB9OwogCiAgICAgICAgIE1l ZGlhTWV0cmljcygpIHsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1 MWE2ZTg1OGY3MGVlNGI5MTI3MGM5MTI5Y2Q4YzdmMWEzNGM4MTVhLi41MGIyM2MyYThiN2RjZTQ1 MmM2MzVjNjQxZDQyOTJkYzZlZWJhNTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKQEAgLTQyMSw3ICs0MjEsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJFbnN1cmUgdGhhdCBvbmx5 IG9uZSBsaXZlIHJlZ2lvbiBpcyB1c2VkIG9uIHRoZSBwYWdlLiJdID0gIkVucwogbG9jYWxpemVk U3RyaW5nc1siRW5zdXJlIHRoYXQgb25seSBvbmUgbWFpbiBjb250ZW50IHNlY3Rpb24gaXMgdXNl ZCBvbiB0aGUgcGFnZS4iXSA9ICJFbnN1cmUgdGhhdCBvbmx5IG9uZSBtYWluIGNvbnRlbnQgc2Vj dGlvbiBpcyB1c2VkIG9uIHRoZSBwYWdlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbnN1cmUgdGhh dCB2YWx1ZXMgZm9yIFx1MDAyMiVzXHUwMDIyIGFyZSB2YWxpZC4iXSA9ICJFbnN1cmUgdGhhdCB2 YWx1ZXMgZm9yIFx1MDAyMiVzXHUwMDIyIGFyZSB2YWxpZC4iOwogbG9jYWxpemVkU3RyaW5nc1si RW50ZXJlZCBGdWxsLVNjcmVlbiBNb2RlIl0gPSAiRW50ZXJlZCBGdWxsLVNjcmVlbiBNb2RlIjsK LWxvY2FsaXplZFN0cmluZ3NbIkVudGVyZWQgTG93LVBvd2VyIE1vZGUiXSA9ICJFbnRlcmVkIExv dy1Qb3dlciBNb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVudGlyZSBSZWNvcmRpbmciXSA9ICJF bnRpcmUgUmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVycm9yIl0gPSAiRXJyb3IiOwog bG9jYWxpemVkU3RyaW5nc1siRXJyb3I6ICJdID0gIkVycm9yOiAiOwpAQCAtNDQyLDcgKzQ0MSw2 IEBAIGxvY2FsaXplZFN0cmluZ3NbIkV4YW1wbGU6IFx1MjAxQyVzXHUyMDFEIl0gPSAiRXhhbXBs ZTogXHUyMDFDJXNcdTIwMUQiOwogbG9jYWxpemVkU3RyaW5nc1siRXhjZXB0aW9uIHdpdGggdGhy b3duIHZhbHVlOiAlcyJdID0gIkV4Y2VwdGlvbiB3aXRoIHRocm93biB2YWx1ZTogJXMiOwogbG9j YWxpemVkU3RyaW5nc1siRXhlY3V0aW9uIGNvbnRleHQgZm9yICQwIl0gPSAiRXhlY3V0aW9uIGNv bnRleHQgZm9yICQwIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV4aXRlZCBGdWxsLVNjcmVlbiBNb2Rl Il0gPSAiRXhpdGVkIEZ1bGwtU2NyZWVuIE1vZGUiOwotbG9jYWxpemVkU3RyaW5nc1siRXhpdGVk IExvdy1Qb3dlciBNb2RlIl0gPSAiRXhpdGVkIExvdy1Qb3dlciBNb2RlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkV4cGFuZCBBbGwiXSA9ICJFeHBhbmQgQWxsIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV4 cGFuZCBjb2x1bW5zIl0gPSAiRXhwYW5kIGNvbHVtbnMiOwogbG9jYWxpemVkU3RyaW5nc1siRXhw YW5kZWQiXSA9ICJFeHBhbmRlZCI7CkBAIC02MjgsNyArNjI2LDYgQEAgbG9jYWxpemVkU3RyaW5n c1siTG9nIFdlYlNvY2tldCJdID0gIkxvZyBXZWJTb2NrZXQiOwogbG9jYWxpemVkU3RyaW5nc1si TG9nOiAiXSA9ICJMb2c6ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2dzIl0gPSAiTG9ncyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJMb3ciXSA9ICJMb3ciOwotbG9jYWxpemVkU3RyaW5nc1siTG93LVBv d2VyIE1vZGUiXSA9ICJMb3ctUG93ZXIgTW9kZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb3dlc3Q6 ICVzIl0gPSAiTG93ZXN0OiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNSU1FIFR5cGUiXSA9ICJN SU1FIFR5cGUiOwogbG9jYWxpemVkU3RyaW5nc1siTUlNRSBUeXBlOiJdID0gIk1JTUUgVHlwZToi OwpAQCAtNzYzLDYgKzc2MCw5IEBAIGxvY2FsaXplZFN0cmluZ3NbIlBsYXkgU291bmQiXSA9ICJQ bGF5IFNvdW5kIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBvbGl0ZSJdID0gIlBvbGl0ZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJQb25nIEZyYW1lIl0gPSAiUG9uZyBGcmFtZSI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJQb3J0Il0gPSAiUG9ydCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJQb3dlciBFZmZpY2llbnQg UGxheWJhY2siXSA9ICJQb3dlciBFZmZpY2llbnQgUGxheWJhY2siOworbG9jYWxpemVkU3RyaW5n c1siUG93ZXIgRWZmaWNpZW50IFBsYXliYWNrIFN0YXJ0ZWQiXSA9ICJQb3dlciBFZmZpY2llbnQg UGxheWJhY2sgU3RhcnRlZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJQb3dlciBFZmZpY2llbnQgUGxh eWJhY2sgU3RvcHBlZCJdID0gIlBvd2VyIEVmZmljaWVudCBQbGF5YmFjayBTdG9wcGVkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlByZWZlciBpbmRlbnQgdXNpbmc6Il0gPSAiUHJlZmVyIGluZGVudCB1 c2luZzoiOwogbG9jYWxpemVkU3RyaW5nc1siUHJlc2VydmUgTG9nIl0gPSAiUHJlc2VydmUgTG9n IjsKIGxvY2FsaXplZFN0cmluZ3NbIlByZXNzICVzIHRvIGltcG9ydCBhIHRlc3Qgb3IgcmVzdWx0 IGZpbGUiXSA9ICJQcmVzcyAlcyB0byBpbXBvcnQgYSB0ZXN0IG9yIHJlc3VsdCBmaWxlIjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0RPTU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9ET01NYW5hZ2VyLmpzCmluZGV4IGY2OGQ4OTQwOWMwNDExNTdlODk5OWVmMzYxYjgy NDM2ZTI4M2UxYTcuLjdhOTFiM2ZlYTM3Mzg1ZWFiMmRjMWY4MGNiMWYxMzRjZGM5MWJiODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0RPTU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwpAQCAtMTY2LDcgKzE2Niw3IEBAIFdJLkRPTU1hbmFn ZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIG5vZGUuZGlk RmlyZUV2ZW50KGV2ZW50TmFtZSwgdGltZXN0YW1wLCBkYXRhKTsKICAgICB9CiAKLSAgICB2aWRl b0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXNMb3dQb3dlcikKKyAgICBwb3dl ckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1wLCBpc1Bvd2Vy RWZmaWNpZW50KQogICAgIHsKICAgICAgICAgLy8gQ2FsbGVkIGZyb20gV0kuRE9NT2JzZXJ2ZXIu CiAKQEAgLTE3NCw3ICsxNzQsNyBAQCBXSS5ET01NYW5hZ2VyID0gY2xhc3MgRE9NTWFuYWdlciBl eHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoIW5vZGUpCiAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgbm9kZS52aWRlb0xvd1Bvd2VyQ2hhbmdlZCh0aW1lc3RhbXAsIGlzTG93UG93 ZXIpOworICAgICAgICBub2RlLnBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQodGlt ZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50KTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9U aW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggZmU1MTRjNzU1YTc2ODlmMWY4NjA4 ZmNmMzg5YmIwYzlhZGM3NWE1ZC4uYTA0Mzg2ZWQxN2QwZWNkN2Y1ZTRlZDRjNDlmMDVmNmJhZmZj NGM1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAtMzY1LDcgKzM2 NSw3IEBAIFdJLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICBXSS5tZW1vcnlNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0ku TWVtb3J5TWFuYWdlci5FdmVudC5NZW1vcnlQcmVzc3VyZSwgdGhpcy5fbWVtb3J5UHJlc3N1cmUs IHRoaXMpOwogCiAgICAgICAgIFdJLkRPTU5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2Rl LkV2ZW50LkRpZEZpcmVFdmVudCwgdGhpcy5faGFuZGxlRE9NTm9kZURpZEZpcmVFdmVudCwgdGhp cyk7Ci0gICAgICAgIFdJLkRPTU5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50 Lkxvd1Bvd2VyQ2hhbmdlZCwgdGhpcy5faGFuZGxlRE9NTm9kZUxvd1Bvd2VyQ2hhbmdlZCwgdGhp cyk7CisgICAgICAgIFdJLkRPTU5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50 LlBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVQ b3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB0aGlzKTsKIAogICAgICAgICB0aGlz Ll91cGRhdGVDYXB0dXJpbmdTdGF0ZShUaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3RhdGUuQWN0 aXZlLCB7c3RhcnRUaW1lOiB0aGlzLl9jYXB0dXJpbmdTdGFydFRpbWV9KTsKICAgICB9CkBAIC0x MjQ4LDEzICsxMjQ4LDEzIEBAIFdJLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFu YWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9KSk7CiAgICAgfQogCi0gICAgX2hhbmRs ZURPTU5vZGVMb3dQb3dlckNoYW5nZWQoZXZlbnQpCisgICAgX2hhbmRsZURPTU5vZGVQb3dlckVm ZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKGV2ZW50KQogICAgIHsKLSAgICAgICAgbGV0IHt0 aW1lc3RhbXAsIGlzTG93UG93ZXJ9ID0gZXZlbnQuZGF0YTsKKyAgICAgICAgbGV0IHt0aW1lc3Rh bXAsIGlzUG93ZXJFZmZpY2llbnR9ID0gZXZlbnQuZGF0YTsKIAotICAgICAgICB0aGlzLl9hZGRS ZWNvcmQobmV3IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQoV0kuTWVkaWFUaW1lbGluZVJlY29yZC5F dmVudFR5cGUuTG93UG93ZXIsIHRpbWVzdGFtcCwgeworICAgICAgICB0aGlzLl9hZGRSZWNvcmQo bmV3IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQoV0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5 cGUuUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZCwgdGltZXN0YW1wLCB7CiAgICAg ICAgICAgICBkb21Ob2RlOiBldmVudC50YXJnZXQsCi0gICAgICAgICAgICBpc0xvd1Bvd2VyLAor ICAgICAgICAgICAgaXNQb3dlckVmZmljaWVudCwKICAgICAgICAgfSkpOwogICAgIH0KIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTG93 UG93ZXIuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xv d1Bvd2VyLnN2ZwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMWI2ZTM4MjA4MDZmNzlj ZDI5ZDAwODIzNWY2Njc5ZGZiNGU3YmZmYy4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFn ZXMvTG93UG93ZXIuc3ZnCisrKyAvZGV2L251bGwKQEAgLTEsOCArMCwwIEBACi08P3htbCB2ZXJz aW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgotPCEtLSBDb3B5cmlnaHQgwqkgMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgotPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53 My5vcmcvMjAwMC9zdmciIGlkPSJyb290IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAxNiAx NiI+Ci0gICAgPHBhdGggZmlsbD0icmdiKDE0OCwgMTkwLCAxNjQpIiBkPSJNIDEzIDEgTCAzIDEg QyAxLjg5ODQzOCAxIDEgMS44OTg0MzggMSAzIEwgMSAxMyBDIDEgMTQuMTAxNTYyIDEuODk4NDM4 IDE1IDMgMTUgTCAxMyAxNSBDIDE0LjEwMTU2MiAxNSAxNSAxNC4xMDE1NjIgMTUgMTMgTCAxNSAz IEMgMTUgMS44OTg0MzggMTQuMTAxNTYyIDEgMTMgMSBaIi8+Ci0gICAgPHBhdGggZmlsbD0icmdi KDEwMSwgMTYxLCAxMzQpIiBkPSJNIDEzIDEgTCAzIDEgQyAxLjg5ODQzOCAxIDEgMS44OTg0Mzgg MSAzIEwgMSAxMyBDIDEgMTQuMTAxNTYyIDEuODk4NDM4IDE1IDMgMTUgTCAxMyAxNSBDIDE0LjEw MTU2MiAxNSAxNSAxNC4xMDE1NjIgMTUgMTMgTCAxNSAzIEMgMTUgMS44OTg0MzggMTQuMTAxNTYy IDEgMTMgMSBNIDEzIDIgQyAxMy41NTA3ODEgMiAxNCAyLjQ0OTIxOSAxNCAzIEwgMTQgMTMgQyAx NCAxMy41NTA3ODEgMTMuNTUwNzgxIDE0IDEzIDE0IEwgMyAxNCBDIDIuNDQ5MjE5IDE0IDIgMTMu NTUwNzgxIDIgMTMgTCAyIDMgQyAyIDIuNDQ5MjE5IDIuNDQ5MjE5IDIgMyAyIEwgMTMgMiIvPgot ICAgIDxwYXRoIGZpbGw9InJnYigxMDEsIDE2MSwgMTM0KSIgZD0iTSA1IDEzIEwgNiAxMyBMIDEx IDEzIEwgMTIgMTMgTCAxMiAxMiBMIDEyIDEwLjg2NDg2NDkgTCAxMiA5Ljg2NDg2NDg2IEwgMTEg OS44NjQ4NjQ4NiBMIDguNTc5NDg3MDkgOS44NjQ4NjQ4MyBMIDguNTc5NDg3MTggNCBMIDguNTc5 NDg3MTggMyBMIDcuNTc5NDg3MTggMyBMIDYgMyBMIDUgMyBMIDUgNCBMIDUgMTIgTCA1IDEzIFog TSA1IDEzIi8+Ci0gICAgPHBhdGggZmlsbD0id2hpdGUiIGQ9Ik0gNiA0IEwgNy41Nzk0ODcxOCA0 IEwgNy41Nzk0ODcxOCAxMC44NjQ4NjQ5IEwgMTEgMTAuODY0ODY0OSBMIDExIDEyIEwgNiAxMiBM IDYgNCBaIE0gNiA0Ii8+Ci08L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2Vk LnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Qb3dlckVm ZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43OTNhZGYwZTQzYTNm YTEzNWU1ZjM5ODkzNGM3Mjc0N2JmZTUzMzU4Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1Bvd2VyRWZmaWNpZW50UGxheWJhY2tT dGF0ZUNoYW5nZWQuc3ZnCkBAIC0wLDAgKzEsOCBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNv ZGluZz0idXRmLTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLiAtLT4KKzxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3Zn IiBpZD0icm9vdCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiPgorICAgIDxwYXRo IGZpbGw9InJnYigxNDgsIDE5MCwgMTY0KSIgZD0iTSAxMyAxIEwgMyAxIEMgMS44OTg0MzggMSAx IDEuODk4NDM4IDEgMyBMIDEgMTMgQyAxIDE0LjEwMTU2MiAxLjg5ODQzOCAxNSAzIDE1IEwgMTMg MTUgQyAxNC4xMDE1NjIgMTUgMTUgMTQuMTAxNTYyIDE1IDEzIEwgMTUgMyBDIDE1IDEuODk4NDM4 IDE0LjEwMTU2MiAxIDEzIDEgWiIvPgorICAgIDxwYXRoIGZpbGw9InJnYigxMDEsIDE2MSwgMTM0 KSIgZD0iTSAxMyAxIEwgMyAxIEMgMS44OTg0MzggMSAxIDEuODk4NDM4IDEgMyBMIDEgMTMgQyAx IDE0LjEwMTU2MiAxLjg5ODQzOCAxNSAzIDE1IEwgMTMgMTUgQyAxNC4xMDE1NjIgMTUgMTUgMTQu MTAxNTYyIDE1IDEzIEwgMTUgMyBDIDE1IDEuODk4NDM4IDE0LjEwMTU2MiAxIDEzIDEgTSAxMyAy IEMgMTMuNTUwNzgxIDIgMTQgMi40NDkyMTkgMTQgMyBMIDE0IDEzIEMgMTQgMTMuNTUwNzgxIDEz LjU1MDc4MSAxNCAxMyAxNCBMIDMgMTQgQyAyLjQ0OTIxOSAxNCAyIDEzLjU1MDc4MSAyIDEzIEwg MiAzIEMgMiAyLjQ0OTIxOSAyLjQ0OTIxOSAyIDMgMiBMIDEzIDIiLz4KKyAgICA8cGF0aCBmaWxs PSJ3aGl0ZSIgZD0iTSA2Ljc4MTI1IDcuNzY5NTMxIEwgNy4xMzY3MTkgNy43Njk1MzEgQyA3Ljc1 NzgxMiA3Ljc2OTUzMSA4LjI0NjA5NCA3LjYzNjcxOSA4LjYwNTQ2OSA3LjM3MTA5NCBDIDguOTY4 NzUgNy4xMDU0NjkgOS4xNDg0MzggNi43NDYwOTQgOS4xNDg0MzggNi4yOTI5NjkgQyA5LjE0ODQz OCA1LjQ5NjA5NCA4LjU5Mzc1IDUuMDk3NjU2IDcuNDg4MjgxIDUuMDk3NjU2IEwgNi43ODEyNSA1 LjA5NzY1NiBaIE0gNSAxMiBMIDUgNCBMIDguMDQyOTY5IDQgQyA5LjEwNTQ2OSA0IDkuODYzMjgx IDQuMTY0MDYyIDEwLjMxNjQwNiA0LjQ4ODI4MSBDIDEwLjc3MzQzOCA0LjgxNjQwNiAxMSA1LjM1 OTM3NSAxMSA2LjEyNSBDIDExIDYuOTg4MjgxIDEwLjY5NTMxMiA3LjY2MDE1NiAxMC4wODU5Mzgg OC4xNDQ1MzEgQyA5LjQ4MDQ2OSA4LjYyNSA4LjYyODkwNiA4Ljg2MzI4MSA3LjUzNTE1NiA4Ljg2 MzI4MSBMIDYuNzgxMjUgOC44NjMyODEgTCA2Ljc4MTI1IDEyIFoiLz4KKyAgICA8cGF0aCBmaWxs PSJyZ2IoMTAxLCAxNjEsIDEzNCkiIGQ9Ik0gNy43ODEyNSA2LjY3OTY4OCBMIDcuNzgxMjUgNi4x MTMyODEgQyA4LjAxOTUzMSA2LjEzNjcxOSA4LjExNzE4OCA2LjE4NzUgOC4xNDQ1MzEgNi4yMDMx MjUgQyA4LjE0MDYyNSA2LjIxMDkzOCA4LjE0ODQzOCA2LjI0MjE4OCA4LjE0ODQzOCA2LjI5Mjk2 OSBDIDguMTQ4NDM4IDYuNDQxNDA2IDguMTA1NDY5IDYuNDk2MDk0IDguMDE1NjI1IDYuNTY2NDA2 IEMgNy45NTMxMjUgNi42MTMyODEgNy44NzUgNi42NDg0MzggNy43ODEyNSA2LjY3OTY4OCBNIDgu MDQyOTY5IDMgTCA0IDMgTCA0IDEzIEwgNy43ODEyNSAxMyBMIDcuNzgxMjUgOS44NjMyODEgQyA4 Ljk4ODI4MSA5LjgyNDIxOSA5Ljk2ODc1IDkuNTA3ODEyIDEwLjcwNzAzMSA4LjkyNTc4MSBDIDEx LjU1MDc4MSA4LjI1NzgxMiAxMiA3LjI4OTA2MiAxMiA2LjEyNSBDIDEyIDQuNzUzOTA2IDExLjQw MjM0NCA0LjAzNTE1NiAxMC45MDIzNDQgMy42NzU3ODEgQyAxMC4yNjU2MjUgMy4yMjI2NTYgOS4z MzIwMzEgMyA4LjA0Mjk2OSAzIE0gNi43ODEyNSA3Ljc2OTUzMSBMIDcuMTM2NzE5IDcuNzY5NTMx IEMgNy43NTc4MTIgNy43Njk1MzEgOC4yNDYwOTQgNy42MzY3MTkgOC42MDU0NjkgNy4zNzEwOTQg QyA4Ljk2ODc1IDcuMTA1NDY5IDkuMTQ4NDM4IDYuNzQ2MDk0IDkuMTQ4NDM4IDYuMjkyOTY5IEMg OS4xNDg0MzggNS40OTYwOTQgOC41OTM3NSA1LjA5NzY1NiA3LjQ4ODI4MSA1LjA5NzY1NiBMIDYu NzgxMjUgNS4wOTc2NTYgTCA2Ljc4MTI1IDcuNzY5NTMxIE0gOC4wNDI5NjkgNCBDIDkuMTA1NDY5 IDQgOS44NjMyODEgNC4xNjQwNjIgMTAuMzE2NDA2IDQuNDg4MjgxIEMgMTAuNzczNDM4IDQuODE2 NDA2IDExIDUuMzU5Mzc1IDExIDYuMTI1IEMgMTEgNi45ODgyODEgMTAuNjk1MzEyIDcuNjYwMTU2 IDEwLjA4NTkzOCA4LjE0NDUzMSBDIDkuNDgwNDY5IDguNjI1IDguNjI4OTA2IDguODYzMjgxIDcu NTM1MTU2IDguODYzMjgxIEwgNi43ODEyNSA4Ljg2MzI4MSBMIDYuNzgxMjUgMTIgTCA1IDEyIEwg NSA0IEwgOC4wNDI5NjkgNCIvPgorPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCmluZGV4IDE4YjdlMTVmZGNiODE1 OTU5NWRlNDFlNDY4Yjk2MGM3MmNkYmE1MjMuLmNhYTdlOWEwNzgxOTBkY2E2NjhlOWY0NDEyNDQ3 N2M5ODNmMDI4ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC0xNDcsNyArMTQ3LDcgQEAgV0kuRE9NTm9kZSA9 IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfQogCiAgICAgICAgIHRo aXMuX2RvbUV2ZW50cyA9IFtdOwotICAgICAgICB0aGlzLl9sb3dQb3dlclJhbmdlcyA9IFtdOwor ICAgICAgICB0aGlzLl9wb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VzID0gW107CiAKICAgICAg ICAgaWYgKHRoaXMuX3Nob3VsZExpc3RlbkZvckV2ZW50TGlzdGVuZXJzKCkpCiAgICAgICAgICAg ICBXSS5ET01Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTm9kZS5FdmVudC5EaWRGaXJlRXZl bnQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaWRGaXJlRXZlbnQsIHRoaXMpOwpAQCAtMTg4LDcgKzE4 OCw3IEBAIFdJLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAg ICBnZXQgZnJhbWUoKSB7IHJldHVybiB0aGlzLl9mcmFtZTsgfQogICAgIGdldCBkb21FdmVudHMo KSB7IHJldHVybiB0aGlzLl9kb21FdmVudHM7IH0KLSAgICBnZXQgbG93UG93ZXJSYW5nZXMoKSB7 IHJldHVybiB0aGlzLl9sb3dQb3dlclJhbmdlczsgfQorICAgIGdldCBwb3dlckVmZmljaWVudFBs YXliYWNrUmFuZ2VzKCkgeyByZXR1cm4gdGhpcy5fcG93ZXJFZmZpY2llbnRQbGF5YmFja1Jhbmdl czsgfQogCiAgICAgZ2V0IGF0dGFjaGVkKCkKICAgICB7CkBAIC03NTcsMzAgKzc1NywzMCBAQCBX SS5ET01Ob2RlID0gY2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9KTsK ICAgICB9CiAKLSAgICB2aWRlb0xvd1Bvd2VyQ2hhbmdlZCh0aW1lc3RhbXAsIGlzTG93UG93ZXIp CisgICAgcG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZCh0aW1lc3RhbXAsIGlzUG93 ZXJFZmZpY2llbnQpCiAgICAgewogICAgICAgICAvLyBDYWxsZWQgZnJvbSBXSS5ET01NYW5hZ2Vy LgogCi0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuY2FuRW50ZXJMb3dQb3dlck1vZGUoKSk7 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuY2FuRW50ZXJQb3dlckVmZmljaWVudFBsYXli YWNrU3RhdGUoKSk7CiAKLSAgICAgICAgbGV0IGxhc3RWYWx1ZSA9IHRoaXMuX2xvd1Bvd2VyUmFu Z2VzLmxhc3RWYWx1ZTsKKyAgICAgICAgbGV0IGxhc3RWYWx1ZSA9IHRoaXMuX3Bvd2VyRWZmaWNp ZW50UGxheWJhY2tSYW5nZXMubGFzdFZhbHVlOwogCi0gICAgICAgIGlmIChpc0xvd1Bvd2VyKSB7 CisgICAgICAgIGlmIChpc1Bvd2VyRWZmaWNpZW50KSB7CiAgICAgICAgICAgICBjb25zb2xlLmFz c2VydCghbGFzdFZhbHVlIHx8IGxhc3RWYWx1ZS5lbmRUaW1lc3RhbXApOwogICAgICAgICAgICAg aWYgKCFsYXN0VmFsdWUgfHwgbGFzdFZhbHVlLmVuZFRpbWVzdGFtcCkKLSAgICAgICAgICAgICAg ICB0aGlzLl9sb3dQb3dlclJhbmdlcy5wdXNoKHtzdGFydFRpbWVzdGFtcDogdGltZXN0YW1wfSk7 CisgICAgICAgICAgICAgICAgdGhpcy5fcG93ZXJFZmZpY2llbnRQbGF5YmFja1Jhbmdlcy5wdXNo KHtzdGFydFRpbWVzdGFtcDogdGltZXN0YW1wfSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydCghbGFzdFZhbHVlIHx8IGxhc3RWYWx1ZS5zdGFydFRpbWVzdGFt cCk7CiAgICAgICAgICAgICBpZiAoIWxhc3RWYWx1ZSkKLSAgICAgICAgICAgICAgICB0aGlzLl9s b3dQb3dlclJhbmdlcy5wdXNoKHtlbmRUaW1lc3RhbXA6IHRpbWVzdGFtcH0pOworICAgICAgICAg ICAgICAgIHRoaXMuX3Bvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZXMucHVzaCh7ZW5kVGltZXN0 YW1wOiB0aW1lc3RhbXB9KTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxhc3RWYWx1ZS5zdGFydFRp bWVzdGFtcCkKICAgICAgICAgICAgICAgICBsYXN0VmFsdWUuZW5kVGltZXN0YW1wID0gdGltZXN0 YW1wOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V0kuRE9NTm9kZS5FdmVudC5Mb3dQb3dlckNoYW5nZWQsIHtpc0xvd1Bvd2VyLCB0aW1lc3RhbXB9 KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoRE9NTm9kZS5FdmVudC5Q b3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB7aXNQb3dlckVmZmljaWVudCwgdGlt ZXN0YW1wfSk7CiAgICAgfQogCi0gICAgY2FuRW50ZXJMb3dQb3dlck1vZGUoKQorICAgIGNhbkVu dGVyUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLmxvY2FsTmFtZSgpID09PSAidmlkZW8iIHx8IHRoaXMubm9kZU5hbWUoKS50b0xvd2VyQ2Fz ZSgpID09PSAidmlkZW8iOwogICAgIH0KQEAgLTk1Nyw3ICs5NTcsNyBAQCBXSS5ET01Ob2RlLkV2 ZW50ID0gewogICAgIEF0dHJpYnV0ZVJlbW92ZWQ6ICJkb20tbm9kZS1hdHRyaWJ1dGUtcmVtb3Zl ZCIsCiAgICAgRXZlbnRMaXN0ZW5lcnNDaGFuZ2VkOiAiZG9tLW5vZGUtZXZlbnQtbGlzdGVuZXJz LWNoYW5nZWQiLAogICAgIERpZEZpcmVFdmVudDogImRvbS1ub2RlLWRpZC1maXJlLWV2ZW50IiwK LSAgICBMb3dQb3dlckNoYW5nZWQ6ICJkb20tbm9kZS12aWRlby1sb3ctcG93ZXItY2hhbmdlZCIs CisgICAgUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZDogImRvbS1ub2RlLXBvd2Vy LWVmZmljaWVudC1wbGF5YmFjay1zdGF0ZS1jaGFuZ2VkIiwKIH07CiAKIFdJLkRPTU5vZGUuUHNl dWRvRWxlbWVudFR5cGUgPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlhSW5zdHJ1bWVudC5qcwppbmRleCAyMGJmNmQ5 ZjU5OGE4MDlkZTRmNTEzYzkzYmZlNmMzZjFmYTMzYjIwLi45Y2JjMDZmNWEwMzUzMzhjOGFkNDA3 MTc3NTk0M2QxMGQ2ZjdhNTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvTWVkaWFJbnN0cnVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9NZWRpYUluc3RydW1lbnQuanMKQEAgLTM2LDgg KzM2LDggQEAgV0kuTWVkaWFJbnN0cnVtZW50ID0gY2xhc3MgTWVkaWFJbnN0cnVtZW50IGV4dGVu ZHMgV0kuSW5zdHJ1bWVudAogCiAgICAgc3RhdGljIHN1cHBvcnRlZCgpCiAgICAgewotICAgICAg ICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTIpOiBET00uZGlkRmlyZUV2ZW50IGFuZCBET00udmlk ZW9Mb3dQb3dlckNoYW5nZWQgZGlkIG5vdCBleGlzdC4KLSAgICAgICAgcmV0dXJuIHdpbmRvdy5E T01BZ2VudCAmJiBET01BZ2VudC5oYXNFdmVudCgiZGlkRmlyZUV2ZW50IikgJiYgRE9NQWdlbnQu aGFzRXZlbnQoInZpZGVvTG93UG93ZXJDaGFuZ2VkIik7CisgICAgICAgIC8vIENPTVBBVElCSUxJ VFkgKGlPUyAxMik6IERPTS5kaWRGaXJlRXZlbnQuCisgICAgICAgIHJldHVybiBJbnNwZWN0b3JC YWNrZW5kLmRvbWFpbnMuRE9NICYmIEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5ET00uaGFzRXZl bnQoImRpZEZpcmVFdmVudCIpOwogICAgIH0KIAogICAgIC8vIFByb3RlY3RlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lZGlhVGltZWxp bmVSZWNvcmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv TWVkaWFUaW1lbGluZVJlY29yZC5qcwppbmRleCBlZDM3MDcwNGQ1ZWI5Y2VhNjA0MmQwZDQ2YWE3 YTJiMGQ2OWEzMjJiLi5kNTM0NzMyNDZkMDYyYzI1NWI0OTdlZGJhZGRjZTgwMDExZTdhYzljIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVk aWFUaW1lbGluZVJlY29yZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvTWVkaWFUaW1lbGluZVJlY29yZC5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBX SS5NZWRpYVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRlbmRz IFdJLlRpbWVsaW5lUmVjb3JkCiB7Ci0gICAgY29uc3RydWN0b3IoZXZlbnRUeXBlLCB0aW1lc3Rh bXAsIHtkb21Ob2RlLCBkb21FdmVudCwgaXNMb3dQb3dlcn0gPSB7fSkKKyAgICBjb25zdHJ1Y3Rv cihldmVudFR5cGUsIHRpbWVzdGFtcCwge2RvbU5vZGUsIGRvbUV2ZW50LCBpc1Bvd2VyRWZmaWNp ZW50fSA9IHt9KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoT2JqZWN0LnZhbHVlcyhX SS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZSkuaW5jbHVkZXMoZXZlbnRUeXBlKSk7CiAK QEAgLTM0LDcgKzM0LDcgQEAgV0kuTWVkaWFUaW1lbGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGlt ZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29yZAogICAgICAgICB0aGlzLl9ldmVu dFR5cGUgPSBldmVudFR5cGU7CiAgICAgICAgIHRoaXMuX2RvbU5vZGUgPSBkb21Ob2RlIHx8IG51 bGw7CiAgICAgICAgIHRoaXMuX2RvbUV2ZW50ID0gZG9tRXZlbnQgfHwgbnVsbDsKLSAgICAgICAg dGhpcy5faXNMb3dQb3dlciA9IGlzTG93UG93ZXIgfHwgZmFsc2U7CisgICAgICAgIHRoaXMuX2lz UG93ZXJFZmZpY2llbnQgPSBpc1Bvd2VyRWZmaWNpZW50IHx8IGZhbHNlOwogICAgIH0KIAogICAg IC8vIEltcG9ydCAvIEV4cG9ydApAQCAtNDIsNiArNDIsMTEgQEAgV0kuTWVkaWFUaW1lbGluZVJl Y29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29y ZAogICAgIHN0YXRpYyBmcm9tSlNPTihqc29uKQogICAgIHsKICAgICAgICAgbGV0IHtldmVudFR5 cGUsIHRpbWVzdGFtcH0gPSBqc29uOworCisgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAx Mi4yKTogaXNMb3dQb3dlciB3YXMgcmVuYW1lZCB0byBpc1Bvd2VyRWZmaWNpZW50LgorICAgICAg ICBpZiAoImlzTG93UG93ZXIiIGluIGpzb24gJiYgISgiaXNQb3dlckVmZmljaWVudCIgaW4ganNv bikpCisgICAgICAgICAgICBqc29uLmlzUG93ZXJFZmZpY2llbnQgPSBqc29uLmlzTG93UG93ZXI7 CisKICAgICAgICAgcmV0dXJuIG5ldyBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkKGV2ZW50VHlwZSwg dGltZXN0YW1wLCBqc29uKTsKICAgICB9CiAKQEAgLTYxLDcgKzY2LDcgQEAgV0kuTWVkaWFUaW1l bGluZVJlY29yZCA9IGNsYXNzIE1lZGlhVGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGlu ZVJlY29yZAogICAgICAgICAgICAgZXZlbnRUeXBlOiB0aGlzLl9ldmVudFR5cGUsCiAgICAgICAg ICAgICB0aW1lc3RhbXA6IHRoaXMuc3RhcnRUaW1lLAogICAgICAgICAgICAgZG9tRXZlbnQsCi0g ICAgICAgICAgICBpc0xvd1Bvd2VyOiB0aGlzLl9pc0xvd1Bvd2VyLAorICAgICAgICAgICAgaXNQ b3dlckVmZmljaWVudDogdGhpcy5faXNQb3dlckVmZmljaWVudCwKICAgICAgICAgfTsKICAgICB9 CiAKQEAgLTcwLDcgKzc1LDcgQEAgV0kuTWVkaWFUaW1lbGluZVJlY29yZCA9IGNsYXNzIE1lZGlh VGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29yZAogICAgIGdldCBldmVudFR5 cGUoKSB7IHJldHVybiB0aGlzLl9ldmVudFR5cGU7IH0KICAgICBnZXQgZG9tTm9kZSgpIHsgcmV0 dXJuIHRoaXMuX2RvbU5vZGU7IH0KICAgICBnZXQgZG9tRXZlbnQoKSB7IHJldHVybiB0aGlzLl9k b21FdmVudDsgfQotICAgIGdldCBpc0xvd1Bvd2VyKCkgeyByZXR1cm4gdGhpcy5faXNMb3dQb3dl cjsgfQorICAgIGdldCBpc1Bvd2VyRWZmaWNpZW50KCkgeyByZXR1cm4gdGhpcy5faXNQb3dlckVm ZmljaWVudDsgfQogCiAgICAgZ2V0IGRpc3BsYXlOYW1lKCkKICAgICB7CkBAIC04MSw4ICs4Niw4 IEBAIFdJLk1lZGlhVGltZWxpbmVSZWNvcmQgPSBjbGFzcyBNZWRpYVRpbWVsaW5lUmVjb3JkIGV4 dGVuZHMgV0kuVGltZWxpbmVSZWNvcmQKICAgICAgICAgICAgIHJldHVybiBldmVudE5hbWU7CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy5fZXZlbnRUeXBlID09PSBXSS5NZWRpYVRpbWVs aW5lUmVjb3JkLkV2ZW50VHlwZS5Mb3dQb3dlcikKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9p c0xvd1Bvd2VyID8gV0kuVUlTdHJpbmcoIkVudGVyZWQgTG93LVBvd2VyIE1vZGUiKSA6IFdJLlVJ U3RyaW5nKCJFeGl0ZWQgTG93LVBvd2VyIE1vZGUiKTsKKyAgICAgICAgaWYgKHRoaXMuX2V2ZW50 VHlwZSA9PT0gTWVkaWFUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUG93ZXJFZmZpY2llbnRQbGF5 YmFja1N0YXRlQ2hhbmdlZCkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9pc1Bvd2VyRWZmaWNp ZW50ID8gV0kuVUlTdHJpbmcoIlBvd2VyIEVmZmljaWVudCBQbGF5YmFjayBTdGFydGVkIikgOiBX SS5VSVN0cmluZygiUG93ZXIgRWZmaWNpZW50IFBsYXliYWNrIFN0b3BwZWQiKTsKIAogICAgICAg ICBpZiAodGhpcy5fZG9tTm9kZSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9kb21Ob2RlLmRp c3BsYXlOYW1lOwpAQCAtOTYsMTYgKzEwMSwxOSBAQCBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkID0g Y2xhc3MgTWVkaWFUaW1lbGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5lUmVjb3JkCiAgICAg ICAgIHN1cGVyLnNhdmVJZGVudGl0eVRvQ29va2llKGNvb2tpZSk7CiAKICAgICAgICAgY29va2ll WyJtZWRpYS10aW1lbGluZS1yZWNvcmQtZXZlbnQtdHlwZSJdID0gdGhpcy5fZXZlbnRUeXBlOwor ICAgICAgICBpZiAodGhpcy5fZXZlbnRUeXBlID09PSBNZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50 VHlwZS5Qb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKQorICAgICAgICAgICAgY29v a2llWyJtZWRpYS10aW1lbGluZS1yZWNvcmQtcG93ZXItZWZmaWNpZW50LXBsYXliYWNrIl0gPSB0 aGlzLl9pc1Bvd2VyRWZmaWNpZW50OwogICAgICAgICBpZiAodGhpcy5fZG9tTm9kZSkKICAgICAg ICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxpbmUtcmVjb3JkLWRvbS1ub2RlIl0gPSB0aGlzLl9k b21Ob2RlLnBhdGgoKTsKLSAgICAgICAgaWYgKHRoaXMuX2RvbUV2ZW50KQorICAgICAgICBpZiAo dGhpcy5fZG9tRXZlbnQpIHsKICAgICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxpbmUtcmVj b3JkLWRvbS1ldmVudCJdID0gdGhpcy5fZG9tRXZlbnQuZXZlbnROYW1lOwotICAgICAgICBpZiAo dGhpcy5faXNMb3dQb3dlciB8fCAodGhpcy5fZG9tRXZlbnQgJiYgdGhpcy5fZG9tRXZlbnQuZGF0 YSAmJiB0aGlzLl9kb21FdmVudC5kYXRhLmVuYWJsZWQpKQotICAgICAgICAgICAgY29va2llWyJt ZWRpYS10aW1lbGluZS1yZWNvcmQtYWN0aXZlIl0gPSB0cnVlOworICAgICAgICAgICAgaWYgKHRo aXMuX2RvbUV2ZW50LmRhdGEgJiYgdGhpcy5fZG9tRXZlbnQuZGF0YS5lbmFibGVkKQorICAgICAg ICAgICAgICAgIGNvb2tpZVsibWVkaWEtdGltZWxpbmUtcmVjb3JkLWRvbS1ldmVudC1hY3RpdmUi XSA9IHRydWU7CisgICAgICAgIH0KICAgICB9CiB9OwogCiBXSS5NZWRpYVRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZSA9IHsKICAgICBET01FdmVudDogImRvbS1ldmVudCIsCi0gICAgTG93UG93ZXI6 ICJsb3ctcG93ZXIiLAorICAgIFBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQ6ICJw b3dlci1lZmZpY2llbnQtcGxheWJhY2stc3RhdGUtY2hhbmdlZCIsCiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3Jk aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVs aW5lUmVjb3JkaW5nLmpzCmluZGV4IGQwOWZhNjYxZTQ3YWE4MGZmM2MyNTE4N2UxNGMyMDk1YjQ2 MGE3MjMuLjk3NDQwOWNkZjNhZDVjZDg1MWJiNGMzYmZjMzVhM2FiNDcwNDA3ZTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJl Y29yZGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvVGltZWxpbmVSZWNvcmRpbmcuanMKQEAgLTQ2Nyw4ICs0NjcsOCBAQCBXSS5UaW1lbGluZVJl Y29yZGluZyA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkaW5nIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAg ICAgICAgICBpZiAocmVjb3JkLmV2ZW50VHlwZSA9PT0gV0kuTWVkaWFUaW1lbGluZVJlY29yZC5F dmVudFR5cGUuRE9NRXZlbnQpIHsKICAgICAgICAgICAgICAgICBpZiAocmVjb3JkLmRvbUV2ZW50 ICYmIHJlY29yZC5kb21FdmVudC5ldmVudE5hbWUpCiAgICAgICAgICAgICAgICAgICAgIGtleSAr PSAiOiIgKyByZWNvcmQuZG9tRXZlbnQuZXZlbnROYW1lOwotICAgICAgICAgICAgfSBlbHNlIGlm IChyZWNvcmQuZXZlbnRUeXBlID09PSBXSS5NZWRpYVRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5M b3dQb3dlcikKLSAgICAgICAgICAgICAgICBrZXkgKz0gIjoiICsgKHJlY29yZC5pc0xvd1Bvd2Vy ID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHJlY29y ZC5ldmVudFR5cGUgPT09IFdJLk1lZGlhVGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlBvd2VyRWZm aWNpZW50UGxheWJhY2tTdGF0ZUNoYW5nZWQpCisgICAgICAgICAgICAgICAga2V5ICs9ICI6IiAr IChyZWNvcmQuaXNQb3dlckVmZmljaWVudCA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOwogICAg ICAgICB9CiAgICAgICAgIGlmIChyZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uKQogICAgICAgICAg ICAga2V5ICs9ICI6IiArIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24ubGluZU51bWJlciArICI6 IiArIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24uY29sdW1uTnVtYmVyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvRE9NT2JzZXJ2ZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNl cnZlci5qcwppbmRleCBlZWRkYjI4ZjAxMDlhYThmNmM3YmQ0ZDE3YmI4ZjM1OGE3NmRmYzFmLi43 M2NiZWYzMjYwZDA4YTdiNmE1ZThjNmMzZGU0MmUzNTQ0NGNhNjFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNlcnZlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9ET01PYnNl cnZlci5qcwpAQCAtMTE5LDYgKzExOSwxMiBAQCBXSS5ET01PYnNlcnZlciA9IGNsYXNzIERPTU9i c2VydmVyCiAKICAgICB2aWRlb0xvd1Bvd2VyQ2hhbmdlZChub2RlSWQsIHRpbWVzdGFtcCwgaXNM b3dQb3dlcikKICAgICB7Ci0gICAgICAgIFdJLmRvbU1hbmFnZXIudmlkZW9Mb3dQb3dlckNoYW5n ZWQobm9kZUlkLCB0aW1lc3RhbXAsIGlzTG93UG93ZXIpOworICAgICAgICAvLyBDT01QQVRJQklM SVRZIChpT1MgMTIuMik6IERPTS52aWRlb0xvd1Bvd2VyQ2hhbmdlZCB3YXMgcmVuYW1lZCB0byBE T00ucG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZC4KKyAgICAgICAgV0kuZG9tTWFu YWdlci5wb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1w LCBpc0xvd1Bvd2VyKTsKKyAgICB9CisKKyAgICBwb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVD aGFuZ2VkKG5vZGVJZCwgdGltZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50KQorICAgIHsKKyAgICAg ICAgV0kuZG9tTWFuYWdlci5wb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKG5vZGVJ ZCwgdGltZXN0YW1wLCBpc1Bvd2VyRWZmaWNpZW50KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRXZlbnRzQnJlYWtk b3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01FdmVudHNCcmVha2Rvd25WaWV3LmNzcwppbmRleCA2NGFlYTI0YjFkNDViYjcxZTA4ZTRlZThh YTU0ZmQ5ZDdiZmMwMTJhLi43OGZiMTk2YzcyZmIxNzQ2N2M4NTY5MzdjMjFkNDNlYjc3Mzk3M2Yz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01FdmVudHNCcmVha2Rvd25WaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmNzcwpAQCAtNzYsNyArNzYs NyBAQAogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbGEoMCwgMCUsIDc1JSwgMC4yNSk7CiB9CiAK LS5kb20tZXZlbnRzLWJyZWFrZG93biAuZ3JhcGggPiAuYXJlYS5sb3ctcG93ZXIgeworLmRvbS1l dmVudHMtYnJlYWtkb3duIC5ncmFwaCA+IC5hcmVhLnBvd2VyLWVmZmljaWVudC1wbGF5YmFjayB7 CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsYSg4MywgMTAwJSwgNDglLCAwLjQpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01F dmVudHNCcmVha2Rvd25WaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NRXZlbnRzQnJlYWtkb3duVmlldy5qcwppbmRleCA4OWZmNWZmYTgzYmQwNWFh YmY5MzI3NjQ0MzRkYjQ3MjI5ODhiYTU2Li4yNWZmM2Q2Njk1ZDRiZTg0MmFmYTY0ZjQ5MmMzNzNk ZjJkZGYwZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9ET01FdmVudHNCcmVha2Rvd25WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTUV2ZW50c0JyZWFrZG93blZpZXcuanMKQEAgLTM0 LDE0ICszNCwxMyBAQCBXSS5ET01FdmVudHNCcmVha2Rvd25WaWV3ID0gY2xhc3MgRE9NRXZlbnRz QnJlYWtkb3duVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgaWYgKGRvbU5vZGVPckV2ZW50 cyBpbnN0YW5jZW9mIFdJLkRPTU5vZGUpIHsKICAgICAgICAgICAgIHRoaXMuX2RvbU5vZGUgPSBk b21Ob2RlT3JFdmVudHM7CiAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVu ZXIoV0kuRE9NTm9kZS5FdmVudC5EaWRGaXJlRXZlbnQsIHRoaXMuX2hhbmRsZURPTU5vZGVEaWRG aXJlRXZlbnQsIHRoaXMpOwotICAgICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUuY2FuRW50ZXJM b3dQb3dlck1vZGUoKSkKLSAgICAgICAgICAgICAgICB0aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlz dGVuZXIoV0kuRE9NTm9kZS5FdmVudC5Mb3dQb3dlckNoYW5nZWQsIHRoaXMuX2hhbmRsZURPTU5v ZGVMb3dQb3dlckNoYW5nZWQsIHRoaXMpOworICAgICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUu Y2FuRW50ZXJQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGUoKSkKKyAgICAgICAgICAgICAgICB0 aGlzLl9kb21Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTm9kZS5FdmVudC5Qb3dlckVmZmlj aWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkLCB0aGlzLl9oYW5kbGVET01Ob2RlUG93ZXJFZmZpY2ll bnRQbGF5YmFja1N0YXRlQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgICAgIHRoaXMuX2RvbUV2 ZW50cyA9IG51bGw7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLl9kb21Ob2Rl ID0gbnVsbDsKICAgICAgICAgICAgIHRoaXMuX2RvbUV2ZW50cyA9IGRvbU5vZGVPckV2ZW50czsK LSAgICAgICAgICAgIHRoaXMuX2xvd1Bvd2VyUmFuZ2VzID0gW107CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLl9pbmNsdWRlR3JhcGggPSBpbmNsdWRlR3JhcGggfHwgZmFsc2U7CkBAIC0xMTIs NyArMTExLDcgQEAgV0kuRE9NRXZlbnRzQnJlYWtkb3duVmlldyA9IGNsYXNzIERPTUV2ZW50c0Jy ZWFrZG93blZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICAgICAgZnVsbHNjcmVlblJh bmdlcy5sYXN0VmFsdWUub3JpZ2luYXRvciA9IGZ1bGxzY3JlZW5ET01FdmVudC5vcmlnaW5hdG9y OwogICAgICAgICB9CiAKLSAgICAgICAgbGV0IGxvd1Bvd2VyUmFuZ2VzID0gdGhpcy5fZG9tTm9k ZSA/IHRoaXMuX2RvbU5vZGUubG93UG93ZXJSYW5nZXMgOiBbXTsKKyAgICAgICAgbGV0IHBvd2Vy RWZmaWNpZW50UGxheWJhY2tSYW5nZXMgPSB0aGlzLl9kb21Ob2RlID8gdGhpcy5fZG9tTm9kZS5w b3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VzIDogW107CiAKICAgICAgICAgZm9yIChsZXQgZG9t RXZlbnQgb2YgZG9tRXZlbnRzKSB7CiAgICAgICAgICAgICBsZXQgcm93RWxlbWVudCA9IHRoaXMu X3RhYmxlQm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidHIi KSk7CkBAIC0xMzgsMTMgKzEzNywxMyBAQCBXSS5ET01FdmVudHNCcmVha2Rvd25WaWV3ID0gY2xh c3MgRE9NRXZlbnRzQnJlYWtkb3duVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgICAgICAg ICAgICAgICAgIGZ1bGxzY3JlZW5BcmVhLnRpdGxlID0gV0kuVUlTdHJpbmcoIkZ1bGwtU2NyZWVu Iik7CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgbGV0IGxvd1Bvd2VyUmFu Z2UgPSBsb3dQb3dlclJhbmdlcy5maW5kKChyYW5nZSkgPT4gZG9tRXZlbnQudGltZXN0YW1wID49 IHJhbmdlLnN0YXJ0VGltZXN0YW1wICYmIGRvbUV2ZW50LnRpbWVzdGFtcCA8PSByYW5nZS5lbmRU aW1lc3RhbXApOwotICAgICAgICAgICAgICAgIGlmIChsb3dQb3dlclJhbmdlKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGxldCBsb3dQb3dlckFyZWEgPSBncmFwaENlbGwuYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwotICAgICAgICAgICAgICAgICAgICBsb3dQb3dl ckFyZWEuY2xhc3NMaXN0LmFkZCgiYXJlYSIsICJsb3ctcG93ZXIiKTsKLSAgICAgICAgICAgICAg ICAgICAgbG93UG93ZXJBcmVhLnRpdGxlID0gV0kuVUlTdHJpbmcoIkxvdy1Qb3dlciBNb2RlIik7 Ci0gICAgICAgICAgICAgICAgICAgIGxvd1Bvd2VyQXJlYS5zdHlsZS5zZXRQcm9wZXJ0eShzdHls ZUF0dHJpYnV0ZSwgcGVyY2VudE9mVG90YWxUaW1lKGxvd1Bvd2VyUmFuZ2Uuc3RhcnRUaW1lc3Rh bXAgLSBzdGFydFRpbWVzdGFtcCkgKyAiJSIpOwotICAgICAgICAgICAgICAgICAgICBsb3dQb3dl ckFyZWEuc3R5bGUuc2V0UHJvcGVydHkoIndpZHRoIiwgcGVyY2VudE9mVG90YWxUaW1lKGxvd1Bv d2VyUmFuZ2UuZW5kVGltZXN0YW1wIC0gbG93UG93ZXJSYW5nZS5zdGFydFRpbWVzdGFtcCkgKyAi JSIpOworICAgICAgICAgICAgICAgIGxldCBwb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2UgPSBw b3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VzLmZpbmQoKHJhbmdlKSA9PiBkb21FdmVudC50aW1l c3RhbXAgPj0gcmFuZ2Uuc3RhcnRUaW1lc3RhbXAgJiYgZG9tRXZlbnQudGltZXN0YW1wIDw9IHJh bmdlLmVuZFRpbWVzdGFtcCk7CisgICAgICAgICAgICAgICAgaWYgKHBvd2VyRWZmaWNpZW50UGxh eWJhY2tSYW5nZSkgeworICAgICAgICAgICAgICAgICAgICBsZXQgcG93ZXJFZmZpY2llbnRQbGF5 YmFja0FyZWEgPSBncmFwaENlbGwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2IikpOworICAgICAgICAgICAgICAgICAgICBwb3dlckVmZmljaWVudFBsYXliYWNrQXJlYS5j bGFzc0xpc3QuYWRkKCJhcmVhIiwgInBvd2VyLWVmZmljaWVudC1wbGF5YmFjayIpOworICAgICAg ICAgICAgICAgICAgICBwb3dlckVmZmljaWVudFBsYXliYWNrQXJlYS50aXRsZSA9IFdJLlVJU3Ry aW5nKCJQb3dlciBFZmZpY2llbnQgUGxheWJhY2siKTsKKyAgICAgICAgICAgICAgICAgICAgcG93 ZXJFZmZpY2llbnRQbGF5YmFja0FyZWEuc3R5bGUuc2V0UHJvcGVydHkoc3R5bGVBdHRyaWJ1dGUs IHBlcmNlbnRPZlRvdGFsVGltZShwb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2Uuc3RhcnRUaW1l c3RhbXAgLSBzdGFydFRpbWVzdGFtcCkgKyAiJSIpOworICAgICAgICAgICAgICAgICAgICBwb3dl ckVmZmljaWVudFBsYXliYWNrQXJlYS5zdHlsZS5zZXRQcm9wZXJ0eSgid2lkdGgiLCBwZXJjZW50 T2ZUb3RhbFRpbWUocG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlLmVuZFRpbWVzdGFtcCAtIHBv d2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZS5zdGFydFRpbWVzdGFtcCkgKyAiJSIpOwogICAgICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGxldCBncmFwaEltYWdlID0gZ3JhcGhDZWxs LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpKTsKQEAgLTE4Myw3ICsx ODIsNyBAQCBXSS5ET01FdmVudHNCcmVha2Rvd25WaWV3ID0gY2xhc3MgRE9NRXZlbnRzQnJlYWtk b3duVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5uZWVkc0xheW91dCgpOwogICAg IH0KIAotICAgIF9oYW5kbGVET01Ob2RlTG93UG93ZXJDaGFuZ2VkKGV2ZW50KQorICAgIF9oYW5k bGVET01Ob2RlUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZChldmVudCkKICAgICB7 CiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmll dy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3Jr VGFibGVDb250ZW50Vmlldy5jc3MKaW5kZXggNmUzZGQxZTQ1YjhjNmQ4N2MzODVmZDhlMTBjNWRi MjYyZDI3Njk2Ny4uMDlhMDAyY2U1YzhmYTNiMGNiMTlmNTIyNmRiZjgwNjY3OGYxMWZhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1RhYmxlQ29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzcwpAQCAtMjExLDcgKzIxMSw3 IEBAIGJvZHlbZGlyPXJ0bF0gLm5ldHdvcmstdGFibGUgLmNlbGwubmFtZSA+IC5zdGF0dXMgewog ICAgIGJhY2tncm91bmQtY29sb3I6IGhzbGEoMCwgMCUsIDc1JSwgMC43NSk7CiB9CiAKLS5uZXR3 b3JrLXRhYmxlIDpub3QoLmhlYWRlcikgLmNlbGwud2F0ZXJmYWxsIC53YXRlcmZhbGwtY29udGFp bmVyID4gLmFyZWEubG93LXBvd2VyIHsKKy5uZXR3b3JrLXRhYmxlIDpub3QoLmhlYWRlcikgLmNl bGwud2F0ZXJmYWxsIC53YXRlcmZhbGwtY29udGFpbmVyID4gLmFyZWEucG93ZXItZWZmaWNpZW50 LXBsYXliYWNrIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1uZXR3b3JrLXJlcXVlc3Qt Y29sb3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4 IGE3YTlmYzdiYjI1ZjIxN2UyMzE2Y2IzZWM4NmFiYjA2NmIyYmY0MDcuLjMzYjkxNjNjNzYwYTYw NzlhZGY1YjhlNGM0MWM1NGZmYzE1ZTBmYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNv bnRlbnRWaWV3LmpzCkBAIC04MjIsMTUgKzgyMiwxNSBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50 VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZp ZQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZm9yIChs ZXQgbG93UG93ZXJSYW5nZSBvZiBkb21Ob2RlLmxvd1Bvd2VyUmFuZ2VzKSB7Ci0gICAgICAgICAg ICAgICAgbGV0IHN0YXJ0VGltZXN0YW1wID0gbG93UG93ZXJSYW5nZS5zdGFydFRpbWVzdGFtcCB8 fCBncmFwaFN0YXJ0VGltZTsKLSAgICAgICAgICAgICAgICBsZXQgZW5kVGltZXN0YW1wID0gbG93 UG93ZXJSYW5nZS5lbmRUaW1lc3RhbXAgfHwgY29sbGVjdGlvbi53YXRlcmZhbGxFbmRUaW1lOwor ICAgICAgICAgICAgZm9yIChsZXQgcG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlIG9mIGRvbU5v ZGUucG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlcykgeworICAgICAgICAgICAgICAgIGxldCBz dGFydFRpbWVzdGFtcCA9IHBvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZS5zdGFydFRpbWVzdGFt cCB8fCBncmFwaFN0YXJ0VGltZTsKKyAgICAgICAgICAgICAgICBsZXQgZW5kVGltZXN0YW1wID0g cG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlLmVuZFRpbWVzdGFtcCB8fCBjb2xsZWN0aW9uLndh dGVyZmFsbEVuZFRpbWU7CiAKLSAgICAgICAgICAgICAgICBsZXQgbG93UG93ZXJFbGVtZW50ID0g Y29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAg ICAgICAgICAgICAgICBsb3dQb3dlckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiYXJlYSIsICJsb3ct cG93ZXIiKTsKLSAgICAgICAgICAgICAgICBsb3dQb3dlckVsZW1lbnQudGl0bGUgPSBXSS5VSVN0 cmluZygiTG93LVBvd2VyIE1vZGUiKTsKLSAgICAgICAgICAgICAgICBwb3NpdGlvbkJ5U3RhcnRP ZmZzZXQobG93UG93ZXJFbGVtZW50LCBzdGFydFRpbWVzdGFtcCk7Ci0gICAgICAgICAgICAgICAg c2V0V2lkdGhGb3JEdXJhdGlvbihsb3dQb3dlckVsZW1lbnQsIHN0YXJ0VGltZXN0YW1wLCBlbmRU aW1lc3RhbXApOworICAgICAgICAgICAgICAgIGxldCBwb3dlckVmZmljaWVudFBsYXliYWNrUmFu Z2VFbGVtZW50ID0gY29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpKTsKKyAgICAgICAgICAgICAgICBwb3dlckVmZmljaWVudFBsYXliYWNrUmFuZ2VFbGVt ZW50LmNsYXNzTGlzdC5hZGQoImFyZWEiLCAicG93ZXItZWZmaWNpZW50LXBsYXliYWNrIik7Cisg ICAgICAgICAgICAgICAgcG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlRWxlbWVudC50aXRsZSA9 IFdJLlVJU3RyaW5nKCJQb3dlciBFZmZpY2llbnQgUGxheWJhY2siKTsKKyAgICAgICAgICAgICAg ICBwb3NpdGlvbkJ5U3RhcnRPZmZzZXQocG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlRWxlbWVu dCwgc3RhcnRUaW1lc3RhbXApOworICAgICAgICAgICAgICAgIHNldFdpZHRoRm9yRHVyYXRpb24o cG93ZXJFZmZpY2llbnRQbGF5YmFja1JhbmdlRWxlbWVudCwgc3RhcnRUaW1lc3RhbXAsIGVuZFRp bWVzdGFtcCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGxldCBwbGF5aW5nID0gZmFs c2U7CkBAIC0xODE5LDggKzE4MTksOCBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNs YXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAg ICAgICAgdGhpcy5fZG9tTm9kZUVudHJpZXMuc2V0KHJlc291cmNlLmluaXRpYXRvck5vZGUsIG5v ZGVFbnRyeSk7CiAKICAgICAgICAgICAgIHJlc291cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRM aXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LkRpZEZpcmVFdmVudCwgdGhpcy5faGFuZGxlTm9kZURp ZEZpcmVFdmVudCwgdGhpcyk7Ci0gICAgICAgICAgICBpZiAocmVzb3VyY2UuaW5pdGlhdG9yTm9k ZS5jYW5FbnRlckxvd1Bvd2VyTW9kZSgpKQotICAgICAgICAgICAgICAgIHJlc291cmNlLmluaXRp YXRvck5vZGUuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50Lkxvd1Bvd2VyQ2hhbmdl ZCwgdGhpcy5faGFuZGxlTm9kZUxvd1Bvd2VyQ2hhbmdlZCwgdGhpcyk7CisgICAgICAgICAgICBp ZiAocmVzb3VyY2UuaW5pdGlhdG9yTm9kZS5jYW5FbnRlclBvd2VyRWZmaWNpZW50UGxheWJhY2tT dGF0ZSgpKQorICAgICAgICAgICAgICAgIHJlc291cmNlLmluaXRpYXRvck5vZGUuYWRkRXZlbnRM aXN0ZW5lcihXSS5ET01Ob2RlLkV2ZW50LlBvd2VyRWZmaWNpZW50UGxheWJhY2tTdGF0ZUNoYW5n ZWQsIHRoaXMuX2hhbmRsZURPTU5vZGVQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2Vk LCB0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghdGhpcy5fZW50cmllc1NvcnRDb21w YXJhdG9yKQpAQCAtMTg1OCw3ICsxODU4LDcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcg PSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAg ICAgICAgfSk7CiAgICAgfQogCi0gICAgX2hhbmRsZU5vZGVMb3dQb3dlckNoYW5nZWQoZXZlbnQp CisgICAgX2hhbmRsZURPTU5vZGVQb3dlckVmZmljaWVudFBsYXliYWNrU3RhdGVDaGFuZ2VkKGV2 ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fcnVuRm9yTWFpbkNvbGxlY3Rpb24oKGNvbGxlY3Rp b24sIHdhc01haW4pID0+IHsKICAgICAgICAgICAgIGxldCBkb21Ob2RlID0gZXZlbnQudGFyZ2V0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVJY29ucy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZUljb25zLmNzcwppbmRleCBjYThlODkzMzkzZjc0NmUzOGI4NDg2NTExNjdl M2Y2ODBmOTViZjAyLi43ZTQxMjQ1ZGMwZmMyMjk0ZDhmMjdkYzgzY2FjN2UwYzBhMThmYzQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZUljb25zLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZUljb25zLmNzcwpAQCAtMTMzLDggKzEzMyw4IEBACiAgICAgY29udGVudDog dXJsKC4uL0ltYWdlcy9ET01FdmVudEZ1bGxzY3JlZW4uc3ZnKTsKIH0KIAotLmxvdy1wb3dlci1y ZWNvcmQgLmljb24gewotICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvTG93UG93ZXIuc3ZnKTsK Ky5wb3dlci1lZmZpY2llbnQtcGxheWJhY2stc3RhdGUtY2hhbmdlZC1yZWNvcmQgLmljb24gewor ICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hh bmdlZC5zdmcpOwogfQogCiBAbWVkaWEgKHByZWZlcnMtY29sb3Itc2NoZW1lOiBkYXJrKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwppbmRleCBhZWQ1ZWNmMDgzYTlmZmVl YWMxODRjNDUzYTQ1YzU1MmI5YzQwMWFiLi4zMmQ5MjE1YWZlMjRiYzFkNjJlZGI0MGZlOTAwMmZk NDdlN2ViNzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKQEAgLTI1 MSw4ICsyNTEsOCBAQCBXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICAgICAgc3dpdGNo ICh0aW1lbGluZVJlY29yZC5ldmVudFR5cGUpIHsKICAgICAgICAgICAgIGNhc2UgV0kuTWVkaWFU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuRE9NRXZlbnQ6CiAgICAgICAgICAgICAgICAgcmV0dXJu ICJkb20tZXZlbnQtcmVjb3JkIjsKLSAgICAgICAgICAgIGNhc2UgV0kuTWVkaWFUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuTG93UG93ZXI6Ci0gICAgICAgICAgICAgICAgcmV0dXJuICJsb3ctcG93 ZXItcmVjb3JkIjsKKyAgICAgICAgICAgIGNhc2UgV0kuTWVkaWFUaW1lbGluZVJlY29yZC5FdmVu dFR5cGUuUG93ZXJFZmZpY2llbnRQbGF5YmFja1N0YXRlQ2hhbmdlZDoKKyAgICAgICAgICAgICAg ICByZXR1cm4gInBvd2VyLWVmZmljaWVudC1wbGF5YmFjay1zdGF0ZS1jaGFuZ2VkLXJlY29yZCI7 CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVu a25vd24gTWVkaWFUaW1lbGluZVJlY29yZCBldmVudFR5cGU6ICIgKyB0aW1lbGluZVJlY29yZC5l dmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkKTsKICAgICAgICAgICAgIH0K