193158 2019-01-04 14:12:52 -0800 Web Inspector: Audit: disable breakpoints when running Audit 2019-01-04 16:29:08 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 190754 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1491887 0 hi 2019-01-04 14:12:52 -0800 . 1491889 1 webkit-bug-importer 2019-01-04 14:13:27 -0800 <rdar://problem/47057083> 1491896 2 358367 hi 2019-01-04 14:19:03 -0800 Created attachment 358367 Patch 1491908 3 358367 joepeck 2019-01-04 14:38:54 -0800 Comment on attachment 358367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358367&action=review r=me > Source/WebInspectorUI/ChangeLog:3 > + Web Inspector: Audit: disable breakpoints when running Audit Should we include a test that a `debugger` statement doesn't cause a pause when the audit runs? > Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js:1162 > + _handleAuditManagerTestScheduled(event) > + { > + this._startDisablingBreakpointsTemporarily(); > + > + if (this.paused) > + this.resume(); > + } > + > + _handleAuditManagerTestCompleted(event) > + { > + this._stopDisablingBreakpointsTemporarily(); > + } > + We may need start/stop to be counters / enums. Someone could technically attempt to start/stop a Timeline profile during audits and then the debugger would be enabled during any remaining audits. 1491920 4 358367 hi 2019-01-04 15:16:22 -0800 Comment on attachment 358367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358367&action=review >> Source/WebInspectorUI/ChangeLog:3 >> + Web Inspector: Audit: disable breakpoints when running Audit > > Should we include a test that a `debugger` statement doesn't cause a pause when the audit runs? Ooooooo, I like it! >> Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js:1162 >> + > > We may need start/stop to be counters / enums. Someone could technically attempt to start/stop a Timeline profile during audits and then the debugger would be enabled during any remaining audits. Another thing I noticed is that we dispatch `WI.AuditManager.Event.TestCompleted` whenever a test result is imported as well, meaning that if we started a Timeline recording and imported an audit result, we'd re-enable breakpoints. That would need to change as well. 1491956 5 358391 hi 2019-01-04 16:12:25 -0800 Created attachment 358391 Patch 1491963 6 358391 commit-queue 2019-01-04 16:29:06 -0800 Comment on attachment 358391 Patch Clearing flags on attachment: 358391 Committed r239646: <https://trac.webkit.org/changeset/239646> 1491964 7 commit-queue 2019-01-04 16:29:08 -0800 All reviewed patches have been landed. Closing bug. 358367 2019-01-04 14:19:03 -0800 2019-01-04 16:12:22 -0800 Patch bug-193158-20190104151902.patch text/plain 10785 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZDRlZmY0NWYzZmFlZGI1NTFkOGFlNTJjMTU0 YzZlYTM5YzExNDkuLjMwNzdhNTEzODA0MmU5MGZjZjRiN2FkM2QwMDM3NWU1OTRkM2NmMGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAxLTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB dWRpdDogZGlzYWJsZSBicmVha3BvaW50cyB3aGVuIHJ1bm5pbmcgQXVkaXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzE1OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDcwNTcwODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdl ci5qczoKKyAgICAgICAgKFdJLkRlYnVnZ2VyTWFuYWdlcik6CisgICAgICAgIChXSS5EZWJ1Z2dl ck1hbmFnZXIucHJvdG90eXBlLl9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0U2NoZWR1bGVkKTogQWRk ZWQuCisgICAgICAgIChXSS5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLl9oYW5kbGVBdWRpdE1h bmFnZXJUZXN0Q29tcGxldGVkKTogQWRkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuRGVidWdnZXJTaWRlYmFy UGFuZWwucHJvdG90eXBlLl9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0U2NoZWR1bGVkKTogQWRkZWQu CisgICAgICAgIChXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZUF1ZGl0 TWFuYWdlclRlc3RDb21wbGV0ZWQpOiBBZGRlZC4KKyAgICAgICAgKFdJLkRlYnVnZ2VyU2lkZWJh clBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQnJlYWtwb2ludHNEaXNhYmxlZEJhbm5lcik6CisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLmxvYWRlZCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanM6CisgICAgICAgIChXSS5sb2Fk ZWQpOgorICAgICAgICBNb3ZlIGBXSS5hdWRpdE1hbmFnZXJgIGhpZ2hlciBpbiB0aGUgbWFuYWdl cnMgbGlzdCBzbyB0aGF0IGl0IGNhbiBiZSB1c2VkIGluCisgICAgICAgIGBXSS5EZWJ1Z2dlck1h bmFnZXJgJ3MgY29uc3RydWN0b3IuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanM6CisKIDIwMTktMDEtMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbmNsdWRlIGBnbG9i YWxUaGlzYCBpbiBkZWZhdWx0IEphdmFTY3JpcHQgY29tcGxldGlvbnMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCmluZGV4IGFhNzhlZWIwNWZiM2UwOWQyNjM0MmY3YjQyZmJlYmVmNGEw ZDUzNmQuLmVhMTU0MGNkNDkyZjc2OTZmZGJkOTg2NzMzNWU3ZGViYWZlMjdmN2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMjc2LDYgKzI3Niw3IEBAIGxvY2FsaXplZFN0 cmluZ3NbIkRlYnVnOiAiXSA9ICJEZWJ1ZzogIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2Vy Il0gPSAiRGVidWdnZXIiOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIgUGF1c2VkIl0gPSAi RGVidWdnZXIgUGF1c2VkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2VyIFN0YXRlbWVudCJd ID0gIkRlYnVnZ2VyIFN0YXRlbWVudCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciBkaXNh YmxlZCBkdXJpbmcgQXVkaXQiXSA9ICJEZWJ1Z2dlciBkaXNhYmxlZCBkdXJpbmcgQXVkaXQiOwog bG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIgZGlzYWJsZWQgZHVyaW5nIFRpbWVsaW5lIHJlY29y ZGluZyJdID0gIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBUaW1lbGluZSByZWNvcmRpbmciOwog bG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXI6Il0gPSAiRGVidWdnZXI6IjsKIGxvY2FsaXplZFN0 cmluZ3NbIkRlYnVncyJdID0gIkRlYnVncyI7CkBAIC04OTQsNiArODk1LDcgQEAgbG9jYWxpemVk U3RyaW5nc1siU3RlcCBvdXQgKCVzIG9yICVzKSJdID0gIlN0ZXAgb3V0ICglcyBvciAlcykiOwog bG9jYWxpemVkU3RyaW5nc1siU3RlcCBvdmVyICglcyBvciAlcykiXSA9ICJTdGVwIG92ZXIgKCVz IG9yICVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdGlmZm5lc3MiXSA9ICJTdGlmZm5lc3MiOwog bG9jYWxpemVkU3RyaW5nc1siU3RvcCJdID0gIlN0b3AiOworbG9jYWxpemVkU3RyaW5nc1siU3Rv cCBBdWRpdCJdID0gIlN0b3AgQXVkaXQiOwogbG9jYWxpemVkU3RyaW5nc1siU3RvcCBSZWNvcmRp bmciXSA9ICJTdG9wIFJlY29yZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIGVsZW1lbnQg c2VsZWN0aW9uICglcykiXSA9ICJTdG9wIGVsZW1lbnQgc2VsZWN0aW9uICglcykiOwogbG9jYWxp emVkU3RyaW5nc1siU3RvcCByZWNvcmRpbmciXSA9ICJTdG9wIHJlY29yZGluZyI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMjUx Y2VmN2M0MzQzNDQ0OGJhNmM5NzJlYTI3ZmFhMGNjYTc4ODRiNi4uODFiMDZkZDUwMmU4YWU1Nzkz Y2EyNmNjMTc0NWYwN2ZjMmViM2U2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTE0LDEyICsxMTQsMTIgQEAgV0kubG9hZGVk ID0gZnVuY3Rpb24oKQogICAgICAgICBXSS5tZW1vcnlNYW5hZ2VyID0gbmV3IFdJLk1lbW9yeU1h bmFnZXIsCiAgICAgICAgIFdJLmFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyID0gbmV3IFdJLkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyLAogICAgICAgICBXSS50aW1lbGluZU1hbmFnZXIgPSBuZXcgV0ku VGltZWxpbmVNYW5hZ2VyLAorICAgICAgICBXSS5hdWRpdE1hbmFnZXIgPSBuZXcgV0kuQXVkaXRN YW5hZ2VyLAogICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIgPSBuZXcgV0kuRGVidWdnZXJNYW5h Z2VyLAogICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyID0gbmV3IFdJLkxheWVyVHJlZU1hbmFn ZXIsCiAgICAgICAgIFdJLndvcmtlck1hbmFnZXIgPSBuZXcgV0kuV29ya2VyTWFuYWdlciwKICAg ICAgICAgV0kuZG9tRGVidWdnZXJNYW5hZ2VyID0gbmV3IFdJLkRPTURlYnVnZ2VyTWFuYWdlciwK ICAgICAgICAgV0kuY2FudmFzTWFuYWdlciA9IG5ldyBXSS5DYW52YXNNYW5hZ2VyLAotICAgICAg ICBXSS5hdWRpdE1hbmFnZXIgPSBuZXcgV0kuQXVkaXRNYW5hZ2VyLAogICAgIF07CiAKICAgICAv LyBSZWdpc3RlciBmb3IgZXZlbnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpz CmluZGV4IGU5OTQ1NTYxMjhkMDAwZTc5NDM5ODU4MmU4MjIyNDEzMjcxYjQyODQuLjdmODQ1NTQ3 MDZlYmNlNjY4YzM2ZDM4YTBiOTU4NzRjYWQzNjI3MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1 Z2dlck1hbmFnZXIuanMKQEAgLTQxLDYgKzQxLDkgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xh c3MgRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIFdJLnRpbWVsaW5l TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLlRpbWVsaW5lTWFuYWdlci5FdmVudC5DYXB0dXJp bmdXaWxsU3RhcnQsIHRoaXMuX3RpbWVsaW5lQ2FwdHVyaW5nV2lsbFN0YXJ0LCB0aGlzKTsKICAg ICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVNYW5h Z2VyLkV2ZW50LkNhcHR1cmluZ1N0b3BwZWQsIHRoaXMuX3RpbWVsaW5lQ2FwdHVyaW5nU3RvcHBl ZCwgdGhpcyk7CiAKKyAgICAgICAgV0kuYXVkaXRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0ku QXVkaXRNYW5hZ2VyLkV2ZW50LlRlc3RTY2hlZHVsZWQsIHRoaXMuX2hhbmRsZUF1ZGl0TWFuYWdl clRlc3RTY2hlZHVsZWQsIHRoaXMpOworICAgICAgICBXSS5hdWRpdE1hbmFnZXIuYWRkRXZlbnRM aXN0ZW5lcihXSS5BdWRpdE1hbmFnZXIuRXZlbnQuVGVzdENvbXBsZXRlZCwgdGhpcy5faGFuZGxl QXVkaXRNYW5hZ2VyVGVzdENvbXBsZXRlZCwgdGhpcyk7CisKICAgICAgICAgV0kudGFyZ2V0TWFu YWdlci5hZGRFdmVudExpc3RlbmVyKFdJLlRhcmdldE1hbmFnZXIuRXZlbnQuVGFyZ2V0UmVtb3Zl ZCwgdGhpcy5fdGFyZ2V0UmVtb3ZlZCwgdGhpcyk7CiAKICAgICAgICAgV0kuc2V0dGluZ3MucGF1 c2VGb3JJbnRlcm5hbFNjcmlwdHMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNo YW5nZWQsIHRoaXMuX3BhdXNlRm9ySW50ZXJuYWxTY3JpcHRzRGlkQ2hhbmdlLCB0aGlzKTsKQEAg LTExNDQsNiArMTE0NywxOSBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1h bmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fc3RvcERpc2FibGluZ0JyZWFr cG9pbnRzVGVtcG9yYXJpbHkoKTsKICAgICB9CiAKKyAgICBfaGFuZGxlQXVkaXRNYW5hZ2VyVGVz dFNjaGVkdWxlZChldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3N0YXJ0RGlzYWJsaW5nQnJl YWtwb2ludHNUZW1wb3JhcmlseSgpOworCisgICAgICAgIGlmICh0aGlzLnBhdXNlZCkKKyAgICAg ICAgICAgIHRoaXMucmVzdW1lKCk7CisgICAgfQorCisgICAgX2hhbmRsZUF1ZGl0TWFuYWdlclRl c3RDb21wbGV0ZWQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9zdG9wRGlzYWJsaW5nQnJl YWtwb2ludHNUZW1wb3JhcmlseSgpOworICAgIH0KKwogICAgIF90YXJnZXRSZW1vdmVkKGV2ZW50 KQogICAgIHsKICAgICAgICAgbGV0IHdhc1BhdXNlZCA9IHRoaXMucGF1c2VkOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCmluZGV4IGY4YWRk ZTgxNGEzMTE5OTIyMmI4MDcwODFiYTNkYWNhZWIyN2I1ZGUuLjE5NWZiYzIxMjIyMjM5ZGRhNTAz Nzg0OGZiZjI0MzUyNDllZDc5MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UZXN0L1Rlc3QuanMKQEAgLTU3LDEyICs1NywxMiBAQCBXSS5sb2FkZWQgPSBm dW5jdGlvbigpCiAgICAgICAgIFdJLmhlYXBNYW5hZ2VyID0gbmV3IFdJLkhlYXBNYW5hZ2VyLAog ICAgICAgICBXSS5tZW1vcnlNYW5hZ2VyID0gbmV3IFdJLk1lbW9yeU1hbmFnZXIsCiAgICAgICAg IFdJLnRpbWVsaW5lTWFuYWdlciA9IG5ldyBXSS5UaW1lbGluZU1hbmFnZXIsCisgICAgICAgIFdJ LmF1ZGl0TWFuYWdlciA9IG5ldyBXSS5BdWRpdE1hbmFnZXIsCiAgICAgICAgIFdJLmRlYnVnZ2Vy TWFuYWdlciA9IG5ldyBXSS5EZWJ1Z2dlck1hbmFnZXIsCiAgICAgICAgIFdJLmxheWVyVHJlZU1h bmFnZXIgPSBuZXcgV0kuTGF5ZXJUcmVlTWFuYWdlciwKICAgICAgICAgV0kud29ya2VyTWFuYWdl ciA9IG5ldyBXSS5Xb3JrZXJNYW5hZ2VyLAogICAgICAgICBXSS5kb21EZWJ1Z2dlck1hbmFnZXIg PSBuZXcgV0kuRE9NRGVidWdnZXJNYW5hZ2VyLAogICAgICAgICBXSS5jYW52YXNNYW5hZ2VyID0g bmV3IFdJLkNhbnZhc01hbmFnZXIsCi0gICAgICAgIFdJLmF1ZGl0TWFuYWdlciA9IG5ldyBXSS5B dWRpdE1hbmFnZXIsCiAgICAgXTsKIAogICAgIC8vIFJlZ2lzdGVyIGZvciBldmVudHMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dl clNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IDkwYWI4NmQyYWY0N2U2MjM0OTFmMDkx NDU5NmQ0YmJlNjZiNDllNjcuLmFhZGRiMzRjNmNhMDFlYzc4YmFlODkyOTEwYWIxOTdjOGE2ZTc4 ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCkBAIC01OCwxNSArNTgsMjUg QEAgV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLmFk ZEV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LkNhcHR1cmluZ1dpbGxTdGFy dCwgdGhpcy5fdGltZWxpbmVDYXB0dXJpbmdXaWxsU3RhcnQsIHRoaXMpOwogICAgICAgICBXSS50 aW1lbGluZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZU1hbmFnZXIuRXZlbnQu Q2FwdHVyaW5nU3RvcHBlZCwgdGhpcy5fdGltZWxpbmVDYXB0dXJpbmdTdG9wcGVkLCB0aGlzKTsK IAorICAgICAgICBXSS5hdWRpdE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5BdWRpdE1hbmFn ZXIuRXZlbnQuVGVzdFNjaGVkdWxlZCwgdGhpcy5faGFuZGxlQXVkaXRNYW5hZ2VyVGVzdFNjaGVk dWxlZCwgdGhpcyk7CisgICAgICAgIFdJLmF1ZGl0TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJ LkF1ZGl0TWFuYWdlci5FdmVudC5UZXN0Q29tcGxldGVkLCB0aGlzLl9oYW5kbGVBdWRpdE1hbmFn ZXJUZXN0Q29tcGxldGVkLCB0aGlzKTsKKwogICAgICAgICBXSS50YXJnZXRNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV0kuVGFyZ2V0TWFuYWdlci5FdmVudC5UYXJnZXRBZGRlZCwgdGhpcy5fdGFy Z2V0QWRkZWQsIHRoaXMpOwogICAgICAgICBXSS50YXJnZXRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVu ZXIoV0kuVGFyZ2V0TWFuYWdlci5FdmVudC5UYXJnZXRSZW1vdmVkLCB0aGlzLl90YXJnZXRSZW1v dmVkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl90aW1lbGluZVJlY29yZGluZ1dhcm5pbmdFbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX3RpbWVs aW5lUmVjb3JkaW5nV2FybmluZ0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgid2FybmluZy1iYW5uZXIi KTsKICAgICAgICAgdGhpcy5fdGltZWxpbmVSZWNvcmRpbmdXYXJuaW5nRWxlbWVudC5hcHBlbmQo V0kuVUlTdHJpbmcoIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBUaW1lbGluZSByZWNvcmRpbmci KSwgIiAiKTsKLSAgICAgICAgbGV0IHN0b3BSZWNvcmRpbmdMaW5rID0gdGhpcy5fdGltZWxpbmVS ZWNvcmRpbmdXYXJuaW5nRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJhIikpOwotICAgICAgICBzdG9wUmVjb3JkaW5nTGluay50ZXh0Q29udGVudCA9IFdJLlVJU3Ry aW5nKCJTdG9wIHJlY29yZGluZyIpOwotICAgICAgICBzdG9wUmVjb3JkaW5nTGluay5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsICgpID0+IHsgV0kudGltZWxpbmVNYW5hZ2VyLnN0b3BDYXB0dXJp bmcoKTsgfSk7CisgICAgICAgIGxldCB0aW1lbGluZVN0b3BSZWNvcmRpbmdMaW5rID0gdGhpcy5f dGltZWxpbmVSZWNvcmRpbmdXYXJuaW5nRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJhIikpOworICAgICAgICB0aW1lbGluZVN0b3BSZWNvcmRpbmdMaW5rLnRleHRD b250ZW50ID0gV0kuVUlTdHJpbmcoIlN0b3AgcmVjb3JkaW5nIik7CisgICAgICAgIHRpbWVsaW5l U3RvcFJlY29yZGluZ0xpbmsuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoKSA9PiB7IFdJLnRp bWVsaW5lTWFuYWdlci5zdG9wQ2FwdHVyaW5nKCk7IH0pOworCisgICAgICAgIHRoaXMuX2F1ZGl0 VGVzdFJlY29yZGluZ1dhcm5pbmdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CisgICAgICAgIHRoaXMuX2F1ZGl0VGVzdFJlY29yZGluZ1dhcm5pbmdFbGVtZW50LmNsYXNz TGlzdC5hZGQoIndhcm5pbmctYmFubmVyIik7CisgICAgICAgIHRoaXMuX2F1ZGl0VGVzdFJlY29y ZGluZ1dhcm5pbmdFbGVtZW50LmFwcGVuZChXSS5VSVN0cmluZygiRGVidWdnZXIgZGlzYWJsZWQg ZHVyaW5nIEF1ZGl0IiksICIgIik7CisgICAgICAgIGxldCBhdWRpdFN0b3BSZWNvcmRpbmdMaW5r ID0gdGhpcy5fYXVkaXRUZXN0UmVjb3JkaW5nV2FybmluZ0VsZW1lbnQuYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpKTsKKyAgICAgICAgYXVkaXRTdG9wUmVjb3JkaW5nTGlu ay50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJTdG9wIEF1ZGl0Iik7CisgICAgICAgIGF1ZGl0 U3RvcFJlY29yZGluZ0xpbmsuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoKSA9PiB7IFdJLmF1 ZGl0TWFuYWdlci5zdG9wKCk7IH0pOwogCiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzRGlzYWJs ZWRXYXJuaW5nRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAg ICB0aGlzLl9icmVha3BvaW50c0Rpc2FibGVkV2FybmluZ0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgi d2FybmluZy1iYW5uZXIiKTsKQEAgLTYzOCwxMiArNjQ4LDMxIEBAIFdJLkRlYnVnZ2VyU2lkZWJh clBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9u U2lkZWJhCiAgICAgICAgIHRoaXMuX3VwZGF0ZUJyZWFrcG9pbnRzRGlzYWJsZWRCYW5uZXIoKTsK ICAgICB9CiAKKyAgICBfaGFuZGxlQXVkaXRNYW5hZ2VyVGVzdFNjaGVkdWxlZChldmVudCkKKyAg ICB7CisgICAgICAgIHRoaXMuX2RlYnVnZ2VyQnJlYWtwb2ludHNCdXR0b25JdGVtLmVuYWJsZWQg PSBmYWxzZTsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZVJlc3VtZUJ1dHRvbkl0ZW0uZW5h YmxlZCA9IGZhbHNlOworCisgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5pbnNlcnRC ZWZvcmUodGhpcy5fYXVkaXRUZXN0UmVjb3JkaW5nV2FybmluZ0VsZW1lbnQsIHRoaXMuY29udGVu dFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQnJlYWtwb2lu dHNEaXNhYmxlZEJhbm5lcigpOworICAgIH0KKworICAgIF9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0 Q29tcGxldGVkKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJCcmVha3BvaW50 c0J1dHRvbkl0ZW0uZW5hYmxlZCA9IHRydWU7CisgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VS ZXN1bWVCdXR0b25JdGVtLmVuYWJsZWQgPSB0cnVlOworCisgICAgICAgIHRoaXMuX2F1ZGl0VGVz dFJlY29yZGluZ1dhcm5pbmdFbGVtZW50LnJlbW92ZSgpOworICAgICAgICB0aGlzLl91cGRhdGVC cmVha3BvaW50c0Rpc2FibGVkQmFubmVyKCk7CisgICAgfQorCiAgICAgX3VwZGF0ZUJyZWFrcG9p bnRzRGlzYWJsZWRCYW5uZXIoKQogICAgIHsKICAgICAgICAgbGV0IGJyZWFrcG9pbnRzRW5hYmxl ZCA9IFdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0VuYWJsZWQ7CiAgICAgICAgIGxldCB0 aW1lbGluZVdhcm5pbmdTaG93aW5nID0gISF0aGlzLl90aW1lbGluZVJlY29yZGluZ1dhcm5pbmdF bGVtZW50LnBhcmVudEVsZW1lbnQ7CisgICAgICAgIGxldCBhdWRpdFdhcm5pbmdTaG93aW5nID0g ISF0aGlzLl9hdWRpdFRlc3RSZWNvcmRpbmdXYXJuaW5nRWxlbWVudC5wYXJlbnRFbGVtZW50Owog Ci0gICAgICAgIGlmICghYnJlYWtwb2ludHNFbmFibGVkICYmICF0aW1lbGluZVdhcm5pbmdTaG93 aW5nKQorICAgICAgICBpZiAoIWJyZWFrcG9pbnRzRW5hYmxlZCAmJiAhdGltZWxpbmVXYXJuaW5n U2hvd2luZyAmJiAhYXVkaXRXYXJuaW5nU2hvd2luZykKICAgICAgICAgICAgIHRoaXMuY29udGVu dFZpZXcuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fYnJlYWtwb2ludHNEaXNhYmxlZFdhcm5p bmdFbGVtZW50LCB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzRGlzYWJsZWRXYXJuaW5nRWxlbWVu dC5yZW1vdmUoKTsK 358391 2019-01-04 16:12:25 -0800 2019-01-04 16:29:06 -0800 Patch bug-193158-20190104171224.patch text/plain 18902 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQwOWRkNjc1YjIzZmZjOWYwMzgzZDUzYzk2YTEz MmY1OWE5MTZlM2MuLjcxMGNlNzVlZDQxNmZhZThiNDg5OWZlY2RlNzg1YjgwODFhYjM4YTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTAxLTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB dWRpdDogZGlzYWJsZSBicmVha3BvaW50cyB3aGVuIHJ1bm5pbmcgQXVkaXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzE1OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDcwNTcwODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFn ZXIuanM6CisgICAgICAgIChXSS5EZWJ1Z2dlck1hbmFnZXIpOgorICAgICAgICAoV0kuRGVidWdn ZXJNYW5hZ2VyLnByb3RvdHlwZS5fc3RhcnREaXNhYmxpbmdCcmVha3BvaW50c1RlbXBvcmFyaWx5 KToKKyAgICAgICAgKFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX3N0b3BEaXNhYmxpbmdC cmVha3BvaW50c1RlbXBvcmFyaWx5KToKKyAgICAgICAgKFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90 b3R5cGUuX2hhbmRsZUF1ZGl0TWFuYWdlclRlc3RTY2hlZHVsZWQpOiBBZGRlZC4KKyAgICAgICAg KFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX2hhbmRsZUF1ZGl0TWFuYWdlclRlc3RDb21w bGV0ZWQpOiBBZGRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJT aWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5 cGUuX3RpbWVsaW5lQ2FwdHVyaW5nV2lsbFN0YXJ0KToKKyAgICAgICAgKFdJLkRlYnVnZ2VyU2lk ZWJhclBhbmVsLnByb3RvdHlwZS5fdGltZWxpbmVDYXB0dXJpbmdTdG9wcGVkKToKKyAgICAgICAg KFdJLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faGFuZGxlQXVkaXRNYW5hZ2VyVGVz dFNjaGVkdWxlZCk6IEFkZGVkLgorICAgICAgICAoV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJv dG90eXBlLl9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0Q29tcGxldGVkKTogQWRkZWQuCisgICAgICAg IChXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZUJyZWFrcG9pbnRzRGlz YWJsZWRCYW5uZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRl YmFyUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5kZWJ1 Z2dlciAud2FybmluZy1iYW5uZXIgKyAud2FybmluZy1iYW5uZXIpOiBBZGRlZC4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV0kubG9hZGVkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qczoKKyAgICAgICAgKFdJLmxvYWRlZCk6 CisgICAgICAgIE1vdmUgYFdJLmF1ZGl0TWFuYWdlcmAgaGlnaGVyIGluIHRoZSBtYW5hZ2VycyBs aXN0IHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgaW4KKyAgICAgICAgYFdJLkRlYnVnZ2VyTWFuYWdl cmAncyBjb25zdHJ1Y3Rvci4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKwogMjAxOS0wMS0wNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBhIFNldHRpbmcgVG9n Z2xlIGZvciBTb3VyY2UgTWFwcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXgg MDcyMWMwOTU4OTk5ZTJjMjE4NzI1Nzc2NjEwNzVhYWIxYjQ0N2VhMS4uZGI0ZDUxODU4NzQyZWJj ODMyMWVkZWY5MWJjM2I0ODU1ZjY0YzhjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzCkBAIC0yNzYsNiArMjc2LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siRGVidWc6ICJdID0gIkRl YnVnOiAiOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIiXSA9ICJEZWJ1Z2dlciI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciBQYXVzZWQiXSA9ICJEZWJ1Z2dlciBQYXVzZWQiOwogbG9j YWxpemVkU3RyaW5nc1siRGVidWdnZXIgU3RhdGVtZW50Il0gPSAiRGVidWdnZXIgU3RhdGVtZW50 IjsKK2xvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBBdWRpdCJdID0g IkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBBdWRpdCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1 Z2dlciBkaXNhYmxlZCBkdXJpbmcgVGltZWxpbmUgcmVjb3JkaW5nIl0gPSAiRGVidWdnZXIgZGlz YWJsZWQgZHVyaW5nIFRpbWVsaW5lIHJlY29yZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1 Z2dlcjoiXSA9ICJEZWJ1Z2dlcjoiOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdzIl0gPSAiRGVi dWdzIjsKQEAgLTg5Niw2ICs4OTcsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTdGVwIG91dCAoJXMg b3IgJXMpIl0gPSAiU3RlcCBvdXQgKCVzIG9yICVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdGVw IG92ZXIgKCVzIG9yICVzKSJdID0gIlN0ZXAgb3ZlciAoJXMgb3IgJXMpIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlN0aWZmbmVzcyJdID0gIlN0aWZmbmVzcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9w Il0gPSAiU3RvcCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIEF1ZGl0Il0gPSAiU3RvcCBBdWRp dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIFJlY29yZGluZyJdID0gIlN0b3AgUmVjb3JkaW5n IjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0b3AgZWxlbWVudCBzZWxlY3Rpb24gKCVzKSJdID0gIlN0 b3AgZWxlbWVudCBzZWxlY3Rpb24gKCVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wIHJlY29y ZGluZyJdID0gIlN0b3AgcmVjb3JkaW5nIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCAyNTFjZWY3YzQzNDM0NDQ4YmE2Yzk3MmVh MjdmYWEwY2NhNzg4NGI2Li44MWIwNmRkNTAyZThhZTU3OTNjYTI2Y2MxNzQ1ZjA3ZmMyZWIzZTZh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCkBAIC0xMTQsMTIgKzExNCwxMiBAQCBXSS5sb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgICAg IFdJLm1lbW9yeU1hbmFnZXIgPSBuZXcgV0kuTWVtb3J5TWFuYWdlciwKICAgICAgICAgV0kuYXBw bGljYXRpb25DYWNoZU1hbmFnZXIgPSBuZXcgV0kuQXBwbGljYXRpb25DYWNoZU1hbmFnZXIsCiAg ICAgICAgIFdJLnRpbWVsaW5lTWFuYWdlciA9IG5ldyBXSS5UaW1lbGluZU1hbmFnZXIsCisgICAg ICAgIFdJLmF1ZGl0TWFuYWdlciA9IG5ldyBXSS5BdWRpdE1hbmFnZXIsCiAgICAgICAgIFdJLmRl YnVnZ2VyTWFuYWdlciA9IG5ldyBXSS5EZWJ1Z2dlck1hbmFnZXIsCiAgICAgICAgIFdJLmxheWVy VHJlZU1hbmFnZXIgPSBuZXcgV0kuTGF5ZXJUcmVlTWFuYWdlciwKICAgICAgICAgV0kud29ya2Vy TWFuYWdlciA9IG5ldyBXSS5Xb3JrZXJNYW5hZ2VyLAogICAgICAgICBXSS5kb21EZWJ1Z2dlck1h bmFnZXIgPSBuZXcgV0kuRE9NRGVidWdnZXJNYW5hZ2VyLAogICAgICAgICBXSS5jYW52YXNNYW5h Z2VyID0gbmV3IFdJLkNhbnZhc01hbmFnZXIsCi0gICAgICAgIFdJLmF1ZGl0TWFuYWdlciA9IG5l dyBXSS5BdWRpdE1hbmFnZXIsCiAgICAgXTsKIAogICAgIC8vIFJlZ2lzdGVyIGZvciBldmVudHMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9EZWJ1Z2dlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKaW5kZXggZTk5NDU1NjEyOGQwMDBl Nzk0Mzk4NTgyZTgyMjI0MTMyNzFiNDI4NC4uODU2MjgxNmIxZDk3MTg4ODNkYWMzMmQ4NWI0OTIx MzJmMWMxOGE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwpAQCAtNDEs NiArNDEsOSBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0 ZW5kcyBXSS5PYmplY3QKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVu ZXIoV0kuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LkNhcHR1cmluZ1dpbGxTdGFydCwgdGhpcy5fdGlt ZWxpbmVDYXB0dXJpbmdXaWxsU3RhcnQsIHRoaXMpOwogICAgICAgICBXSS50aW1lbGluZU1hbmFn ZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZU1hbmFnZXIuRXZlbnQuQ2FwdHVyaW5nU3Rv cHBlZCwgdGhpcy5fdGltZWxpbmVDYXB0dXJpbmdTdG9wcGVkLCB0aGlzKTsKIAorICAgICAgICBX SS5hdWRpdE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5BdWRpdE1hbmFnZXIuRXZlbnQuVGVz dFNjaGVkdWxlZCwgdGhpcy5faGFuZGxlQXVkaXRNYW5hZ2VyVGVzdFNjaGVkdWxlZCwgdGhpcyk7 CisgICAgICAgIFdJLmF1ZGl0TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkF1ZGl0TWFuYWdl ci5FdmVudC5UZXN0Q29tcGxldGVkLCB0aGlzLl9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0Q29tcGxl dGVkLCB0aGlzKTsKKwogICAgICAgICBXSS50YXJnZXRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V0kuVGFyZ2V0TWFuYWdlci5FdmVudC5UYXJnZXRSZW1vdmVkLCB0aGlzLl90YXJnZXRSZW1vdmVk LCB0aGlzKTsKIAogICAgICAgICBXSS5zZXR0aW5ncy5wYXVzZUZvckludGVybmFsU2NyaXB0cy5h ZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgdGhpcy5fcGF1c2VGb3JJ bnRlcm5hbFNjcmlwdHNEaWRDaGFuZ2UsIHRoaXMpOwpAQCAtOTMsNiArOTYsNyBAQCBXSS5EZWJ1 Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAg ICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzRW5hYmxlZFNldHRpbmcudmFsdWUgPSB0aGlzLl90 ZW1wb3JhcmlseURpc2FibGVkQnJlYWtwb2ludHNSZXN0b3JlU2V0dGluZy52YWx1ZTsKICAgICAg ICAgICAgIHRoaXMuX3RlbXBvcmFyaWx5RGlzYWJsZWRCcmVha3BvaW50c1Jlc3RvcmVTZXR0aW5n LnZhbHVlID0gbnVsbDsKICAgICAgICAgfQorICAgICAgICB0aGlzLl90ZW1wb3JhcmlseURpc2Fi bGVCcmVha3BvaW50c1JlcXVlc3RDb3VudCA9IDA7CiAKICAgICAgICAgdGhpcy5faWdub3JlQnJl YWtwb2ludERpc3BsYXlMb2NhdGlvbkRpZENoYW5nZUV2ZW50ID0gZmFsc2U7CiAKQEAgLTExMTAs MTAgKzExMTQsMTQgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2Vy IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfc3RhcnREaXNhYmxpbmdCcmVha3BvaW50c1RlbXBv cmFyaWx5KCkKICAgICB7CisgICAgICAgIGlmICgrK3RoaXMuX3RlbXBvcmFyaWx5RGlzYWJsZUJy ZWFrcG9pbnRzUmVxdWVzdENvdW50ID4gMSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAg ICBjb25zb2xlLmFzc2VydCghdGhpcy5icmVha3BvaW50c0Rpc2FibGVkVGVtcG9yYXJpbHksICJB bHJlYWR5IHRlbXBvcmFyaWx5IGRpc2FibGluZyBicmVha3BvaW50cy4iKTsKICAgICAgICAgaWYg KHRoaXMuYnJlYWtwb2ludHNEaXNhYmxlZFRlbXBvcmFyaWx5KQogICAgICAgICAgICAgcmV0dXJu OwogCisKICAgICAgICAgdGhpcy5fdGVtcG9yYXJpbHlEaXNhYmxlZEJyZWFrcG9pbnRzUmVzdG9y ZVNldHRpbmcudmFsdWUgPSB0aGlzLl9icmVha3BvaW50c0VuYWJsZWRTZXR0aW5nLnZhbHVlOwog CiAgICAgICAgIHRoaXMuYnJlYWtwb2ludHNFbmFibGVkID0gZmFsc2U7CkBAIC0xMTIxLDYgKzEx MjksMTAgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2VyIGV4dGVu ZHMgV0kuT2JqZWN0CiAKICAgICBfc3RvcERpc2FibGluZ0JyZWFrcG9pbnRzVGVtcG9yYXJpbHko KQogICAgIHsKKyAgICAgICAgdGhpcy5fdGVtcG9yYXJpbHlEaXNhYmxlQnJlYWtwb2ludHNSZXF1 ZXN0Q291bnQgPSBNYXRoLm1heCgwLCB0aGlzLl90ZW1wb3JhcmlseURpc2FibGVCcmVha3BvaW50 c1JlcXVlc3RDb3VudCAtIDEpOworICAgICAgICBpZiAodGhpcy5fdGVtcG9yYXJpbHlEaXNhYmxl QnJlYWtwb2ludHNSZXF1ZXN0Q291bnQgPiAwKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuYnJlYWtwb2ludHNEaXNhYmxlZFRlbXBvcmFyaWx5LCAi V2FzIG5vdCB0ZW1wb3JhcmlseSBkaXNhYmxpbmcgYnJlYWtwb2ludHMuIik7CiAgICAgICAgIGlm ICghdGhpcy5icmVha3BvaW50c0Rpc2FibGVkVGVtcG9yYXJpbHkpCiAgICAgICAgICAgICByZXR1 cm47CkBAIC0xMTQ0LDYgKzExNTYsMTkgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVi dWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX3N0b3BEaXNhYmxp bmdCcmVha3BvaW50c1RlbXBvcmFyaWx5KCk7CiAgICAgfQogCisgICAgX2hhbmRsZUF1ZGl0TWFu YWdlclRlc3RTY2hlZHVsZWQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9zdGFydERpc2Fi bGluZ0JyZWFrcG9pbnRzVGVtcG9yYXJpbHkoKTsKKworICAgICAgICBpZiAodGhpcy5wYXVzZWQp CisgICAgICAgICAgICB0aGlzLnJlc3VtZSgpOworICAgIH0KKworICAgIF9oYW5kbGVBdWRpdE1h bmFnZXJUZXN0Q29tcGxldGVkKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fc3RvcERpc2Fi bGluZ0JyZWFrcG9pbnRzVGVtcG9yYXJpbHkoKTsKKyAgICB9CisKICAgICBfdGFyZ2V0UmVtb3Zl ZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCB3YXNQYXVzZWQgPSB0aGlzLnBhdXNlZDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcwppbmRl eCBmOGFkZGU4MTRhMzExOTkyMjJiODA3MDgxYmEzZGFjYWViMjdiNWRlLi4xOTVmYmMyMTIyMjIz OWRkYTUwMzc4NDhmYmYyNDM1MjQ5ZWQ3OTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCkBAIC01NywxMiArNTcsMTIgQEAgV0kubG9h ZGVkID0gZnVuY3Rpb24oKQogICAgICAgICBXSS5oZWFwTWFuYWdlciA9IG5ldyBXSS5IZWFwTWFu YWdlciwKICAgICAgICAgV0kubWVtb3J5TWFuYWdlciA9IG5ldyBXSS5NZW1vcnlNYW5hZ2VyLAog ICAgICAgICBXSS50aW1lbGluZU1hbmFnZXIgPSBuZXcgV0kuVGltZWxpbmVNYW5hZ2VyLAorICAg ICAgICBXSS5hdWRpdE1hbmFnZXIgPSBuZXcgV0kuQXVkaXRNYW5hZ2VyLAogICAgICAgICBXSS5k ZWJ1Z2dlck1hbmFnZXIgPSBuZXcgV0kuRGVidWdnZXJNYW5hZ2VyLAogICAgICAgICBXSS5sYXll clRyZWVNYW5hZ2VyID0gbmV3IFdJLkxheWVyVHJlZU1hbmFnZXIsCiAgICAgICAgIFdJLndvcmtl ck1hbmFnZXIgPSBuZXcgV0kuV29ya2VyTWFuYWdlciwKICAgICAgICAgV0kuZG9tRGVidWdnZXJN YW5hZ2VyID0gbmV3IFdJLkRPTURlYnVnZ2VyTWFuYWdlciwKICAgICAgICAgV0kuY2FudmFzTWFu YWdlciA9IG5ldyBXSS5DYW52YXNNYW5hZ2VyLAotICAgICAgICBXSS5hdWRpdE1hbmFnZXIgPSBu ZXcgV0kuQXVkaXRNYW5hZ2VyLAogICAgIF07CiAKICAgICAvLyBSZWdpc3RlciBmb3IgZXZlbnRz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGVidWdnZXJTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuY3NzCmluZGV4IGY3NDQ4ZTEzNmMyODA1 MTI1NzczZTA2YzMzOWZkOTk2OWI2NDBmZGEuLjQ4ZjUzZWQ1MWU5MGNkYzFiOWMyZGY1MTVkOGU0 YjJiNDM2MzBlZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5jc3MKQEAgLTYy LDYgKzYyLDEwIEBACiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDUwLCAxMDAlLCA5NCUpOwog fQogCisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmRlYnVnZ2VyIC53YXJuaW5nLWJhbm5l ciArIC53YXJuaW5nLWJhbm5lciB7CisgICAgZGlzcGxheTogbm9uZTsKK30KKwogLnNpZGViYXIg PiAucGFuZWwubmF2aWdhdGlvbi5kZWJ1Z2dlciAudHJlZS1vdXRsaW5lLnNpbmdsZS10aHJlYWQg PiAuaXRlbS50aHJlYWQgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5l bC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2Vy U2lkZWJhclBhbmVsLmpzCmluZGV4IDkwYWI4NmQyYWY0N2U2MjM0OTFmMDkxNDU5NmQ0YmJlNjZi NDllNjcuLmU3YjNkYjkyZGQyYjgzOTQwNmM3ODcwYTc1MzE1ODBjYWVkZTNhMTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCkBAIC01OCwxNSArNTgsMjUgQEAgV0kuRGVidWdn ZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5h dmlnYXRpb25TaWRlYmEKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVu ZXIoV0kuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LkNhcHR1cmluZ1dpbGxTdGFydCwgdGhpcy5fdGlt ZWxpbmVDYXB0dXJpbmdXaWxsU3RhcnQsIHRoaXMpOwogICAgICAgICBXSS50aW1lbGluZU1hbmFn ZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZU1hbmFnZXIuRXZlbnQuQ2FwdHVyaW5nU3Rv cHBlZCwgdGhpcy5fdGltZWxpbmVDYXB0dXJpbmdTdG9wcGVkLCB0aGlzKTsKIAorICAgICAgICBX SS5hdWRpdE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5BdWRpdE1hbmFnZXIuRXZlbnQuVGVz dFNjaGVkdWxlZCwgdGhpcy5faGFuZGxlQXVkaXRNYW5hZ2VyVGVzdFNjaGVkdWxlZCwgdGhpcyk7 CisgICAgICAgIFdJLmF1ZGl0TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkF1ZGl0TWFuYWdl ci5FdmVudC5UZXN0Q29tcGxldGVkLCB0aGlzLl9oYW5kbGVBdWRpdE1hbmFnZXJUZXN0Q29tcGxl dGVkLCB0aGlzKTsKKwogICAgICAgICBXSS50YXJnZXRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V0kuVGFyZ2V0TWFuYWdlci5FdmVudC5UYXJnZXRBZGRlZCwgdGhpcy5fdGFyZ2V0QWRkZWQsIHRo aXMpOwogICAgICAgICBXSS50YXJnZXRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuVGFyZ2V0 TWFuYWdlci5FdmVudC5UYXJnZXRSZW1vdmVkLCB0aGlzLl90YXJnZXRSZW1vdmVkLCB0aGlzKTsK IAogICAgICAgICB0aGlzLl90aW1lbGluZVJlY29yZGluZ1dhcm5pbmdFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lUmVjb3JkaW5n V2FybmluZ0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgid2FybmluZy1iYW5uZXIiKTsKLSAgICAgICAg dGhpcy5fdGltZWxpbmVSZWNvcmRpbmdXYXJuaW5nRWxlbWVudC5hcHBlbmQoV0kuVUlTdHJpbmco IkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBUaW1lbGluZSByZWNvcmRpbmciKSwgIiAiKTsKLSAg ICAgICAgbGV0IHN0b3BSZWNvcmRpbmdMaW5rID0gdGhpcy5fdGltZWxpbmVSZWNvcmRpbmdXYXJu aW5nRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhIikpOwotICAg ICAgICBzdG9wUmVjb3JkaW5nTGluay50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJTdG9wIHJl Y29yZGluZyIpOwotICAgICAgICBzdG9wUmVjb3JkaW5nTGluay5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsICgpID0+IHsgV0kudGltZWxpbmVNYW5hZ2VyLnN0b3BDYXB0dXJpbmcoKTsgfSk7Cisg ICAgICAgIHRoaXMuX3RpbWVsaW5lUmVjb3JkaW5nV2FybmluZ0VsZW1lbnQuYXBwZW5kKFdJLlVJ U3RyaW5nKCJEZWJ1Z2dlciBkaXNhYmxlZCBkdXJpbmcgVGltZWxpbmUgcmVjb3JkaW5nIiksIGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImJyIikpOworICAgICAgICBsZXQgdGltZWxpbmVTdG9wUmVj b3JkaW5nTGluayA9IHRoaXMuX3RpbWVsaW5lUmVjb3JkaW5nV2FybmluZ0VsZW1lbnQuYXBwZW5k Q2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpKTsKKyAgICAgICAgdGltZWxpbmVTdG9w UmVjb3JkaW5nTGluay50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJTdG9wIHJlY29yZGluZyIp OworICAgICAgICB0aW1lbGluZVN0b3BSZWNvcmRpbmdMaW5rLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgKCkgPT4geyBXSS50aW1lbGluZU1hbmFnZXIuc3RvcENhcHR1cmluZygpOyB9KTsKKwor ICAgICAgICB0aGlzLl9hdWRpdFRlc3RXYXJuaW5nRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOworICAgICAgICB0aGlzLl9hdWRpdFRlc3RXYXJuaW5nRWxlbWVudC5jbGFz c0xpc3QuYWRkKCJ3YXJuaW5nLWJhbm5lciIpOworICAgICAgICB0aGlzLl9hdWRpdFRlc3RXYXJu aW5nRWxlbWVudC5hcHBlbmQoV0kuVUlTdHJpbmcoIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBB dWRpdCIpLCBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJiciIpKTsKKyAgICAgICAgbGV0IGF1ZGl0 U3RvcFJlY29yZGluZ0xpbmsgPSB0aGlzLl9hdWRpdFRlc3RXYXJuaW5nRWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhIikpOworICAgICAgICBhdWRpdFN0b3BSZWNv cmRpbmdMaW5rLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlN0b3AgQXVkaXQiKTsKKyAgICAg ICAgYXVkaXRTdG9wUmVjb3JkaW5nTGluay5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsICgpID0+ IHsgV0kuYXVkaXRNYW5hZ2VyLnN0b3AoKTsgfSk7CiAKICAgICAgICAgdGhpcy5fYnJlYWtwb2lu dHNEaXNhYmxlZFdhcm5pbmdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzRGlzYWJsZWRXYXJuaW5nRWxlbWVudC5jbGFzc0xp c3QuYWRkKCJ3YXJuaW5nLWJhbm5lciIpOwpAQCAtNjIyLDggKzYzMiw3IEBAIFdJLkRlYnVnZ2Vy U2lkZWJhclBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZp Z2F0aW9uU2lkZWJhCiAKICAgICBfdGltZWxpbmVDYXB0dXJpbmdXaWxsU3RhcnQoZXZlbnQpCiAg ICAgewotICAgICAgICB0aGlzLl9kZWJ1Z2dlckJyZWFrcG9pbnRzQnV0dG9uSXRlbS5lbmFibGVk ID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VSZXN1bWVCdXR0b25JdGVtLmVu YWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fdXBkYXRlVGVtcG9yYXJpbHlEaXNhYmxlZEJy ZWFrcG9pbnRzQnV0dG9ucygpOwogCiAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5p bnNlcnRCZWZvcmUodGhpcy5fdGltZWxpbmVSZWNvcmRpbmdXYXJuaW5nRWxlbWVudCwgdGhpcy5j b250ZW50Vmlldy5lbGVtZW50LmZpcnN0Q2hpbGQpOwogICAgICAgICB0aGlzLl91cGRhdGVCcmVh a3BvaW50c0Rpc2FibGVkQmFubmVyKCk7CkBAIC02MzEsMTkgKzY0MCw0MiBAQCBXSS5EZWJ1Z2dl clNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2 aWdhdGlvblNpZGViYQogCiAgICAgX3RpbWVsaW5lQ2FwdHVyaW5nU3RvcHBlZChldmVudCkKICAg ICB7Ci0gICAgICAgIHRoaXMuX2RlYnVnZ2VyQnJlYWtwb2ludHNCdXR0b25JdGVtLmVuYWJsZWQg PSB0cnVlOwotICAgICAgICB0aGlzLl9kZWJ1Z2dlclBhdXNlUmVzdW1lQnV0dG9uSXRlbS5lbmFi bGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fdXBkYXRlVGVtcG9yYXJpbHlEaXNhYmxlZEJyZWFr cG9pbnRzQnV0dG9ucygpOwogCiAgICAgICAgIHRoaXMuX3RpbWVsaW5lUmVjb3JkaW5nV2Fybmlu Z0VsZW1lbnQucmVtb3ZlKCk7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUJyZWFrcG9pbnRzRGlzYWJs ZWRCYW5uZXIoKTsKICAgICB9CiAKKyAgICBfaGFuZGxlQXVkaXRNYW5hZ2VyVGVzdFNjaGVkdWxl ZChldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRlbXBvcmFyaWx5RGlzYWJsZWRC cmVha3BvaW50c0J1dHRvbnMoKTsKKworICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQu aW5zZXJ0QmVmb3JlKHRoaXMuX2F1ZGl0VGVzdFdhcm5pbmdFbGVtZW50LCB0aGlzLmNvbnRlbnRW aWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CisgICAgICAgIHRoaXMuX3VwZGF0ZUJyZWFrcG9pbnRz RGlzYWJsZWRCYW5uZXIoKTsKKyAgICB9CisKKyAgICBfaGFuZGxlQXVkaXRNYW5hZ2VyVGVzdENv bXBsZXRlZChldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRlbXBvcmFyaWx5RGlz YWJsZWRCcmVha3BvaW50c0J1dHRvbnMoKTsKKworICAgICAgICB0aGlzLl9hdWRpdFRlc3RXYXJu aW5nRWxlbWVudC5yZW1vdmUoKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQnJlYWtwb2ludHNEaXNh YmxlZEJhbm5lcigpOworICAgIH0KKworICAgIF91cGRhdGVUZW1wb3JhcmlseURpc2FibGVkQnJl YWtwb2ludHNCdXR0b25zKCkKKyAgICB7CisgICAgICAgIGxldCBicmVha3BvaW50c0Rpc2FibGVk VGVtcG9yYXJpbHkgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNEaXNhYmxlZFRlbXBv cmFyaWx5OworICAgICAgICB0aGlzLl9kZWJ1Z2dlckJyZWFrcG9pbnRzQnV0dG9uSXRlbS5lbmFi bGVkID0gIWJyZWFrcG9pbnRzRGlzYWJsZWRUZW1wb3JhcmlseTsKKyAgICAgICAgdGhpcy5fZGVi dWdnZXJQYXVzZVJlc3VtZUJ1dHRvbkl0ZW0uZW5hYmxlZCA9ICFicmVha3BvaW50c0Rpc2FibGVk VGVtcG9yYXJpbHk7CisgICAgfQorCiAgICAgX3VwZGF0ZUJyZWFrcG9pbnRzRGlzYWJsZWRCYW5u ZXIoKQogICAgIHsKICAgICAgICAgbGV0IGJyZWFrcG9pbnRzRW5hYmxlZCA9IFdJLmRlYnVnZ2Vy TWFuYWdlci5icmVha3BvaW50c0VuYWJsZWQ7CiAgICAgICAgIGxldCB0aW1lbGluZVdhcm5pbmdT aG93aW5nID0gISF0aGlzLl90aW1lbGluZVJlY29yZGluZ1dhcm5pbmdFbGVtZW50LnBhcmVudEVs ZW1lbnQ7CisgICAgICAgIGxldCBhdWRpdFdhcm5pbmdTaG93aW5nID0gISF0aGlzLl9hdWRpdFRl c3RXYXJuaW5nRWxlbWVudC5wYXJlbnRFbGVtZW50OwogCi0gICAgICAgIGlmICghYnJlYWtwb2lu dHNFbmFibGVkICYmICF0aW1lbGluZVdhcm5pbmdTaG93aW5nKQorICAgICAgICBpZiAoIWJyZWFr cG9pbnRzRW5hYmxlZCAmJiAhdGltZWxpbmVXYXJuaW5nU2hvd2luZyAmJiAhYXVkaXRXYXJuaW5n U2hvd2luZykKICAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5pbnNlcnRCZWZv cmUodGhpcy5fYnJlYWtwb2ludHNEaXNhYmxlZFdhcm5pbmdFbGVtZW50LCB0aGlzLmNvbnRlbnRW aWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMu X2JyZWFrcG9pbnRzRGlzYWJsZWRXYXJuaW5nRWxlbWVudC5yZW1vdmUoKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNjJi ZDBiMGVjZjNkMWEwY2UzZDI3M2E1YzhhYTI4ZTQxYzk4ZjcxLi41MjlmMjFjMzNkNTgzMjQ3OGU1 ZGJjMmUzODM1ODgwOGYzMjk2ZmEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMDQg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEF1ZGl0OiBkaXNhYmxlIGJyZWFrcG9pbnRzIHdoZW4gcnVubmluZyBBdWRpdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMTU4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NzA1NzA4Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGgg UGVjb3Jhcm8uCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYXVkaXQvYmFzaWMuaHRtbDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvYXVkaXQvYmFzaWMtZXhwZWN0ZWQudHh0OgorCisgICAgICAgICogaW5z cGVjdG9yL2F1ZGl0L3Jlc291cmNlcy9hdWRpdC11dGlsaXRpZXMuanM6CisgICAgICAgIChUZXN0 UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLkluc3BlY3RvclRlc3QuQXVkaXQuYWRkVGVzdCk6CisK IDIwMTktMDEtMDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIENvbnRlbnQgcHJvY2VzcyBtYWluIHRocmVhZCBibG9ja2VkIGJlbmVhdGggSW1hZ2VEZWNv ZGVyQVZGT2JqQzo6cmVhZFNhbXBsZXMgZm9yIG1hbnkgc2Vjb25kcyBvbiBpbWd1ci5jb20KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdC9iYXNpYy1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvYXVkaXQvYmFzaWMtZXhwZWN0ZWQudHh0CmluZGV4IGIx YTA1NDkxODMxOTQyMzI0NWEwM2VhZjIyODE4MzlkODIwZjI0ZDguLjc5YTI5NjUxNTVjMTI2YjYx ZjUyMmQyNTIwZjMyOTgxOGZjOGE4ZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9hdWRpdC9iYXNpYy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1 ZGl0L2Jhc2ljLWV4cGVjdGVkLnR4dApAQCAtMTI2LDMgKzEyNiw4IEBAIFBBU1M6IFJlc3VsdCBz aG91bGQgYmUgImVycm9yIi4KICAgZXJyb3JzOgogICAgLSByZWplY3RlZAogCistLSBSdW5uaW5n IHRlc3QgY2FzZTogQXVkaXQuQmFzaWMuRGVidWdnZXIKK1Rlc3RpbmcgYGRlYnVnZ2VyYC4uLgor UEFTUzogU2hvdWxkIG5vdCBwYXVzZSBvbiB0aGUgZGVidWdnZXIgc3RhdGVtZW50LgorUEFTUzog UmVzdWx0IHNob3VsZCBiZSAicGFzcyIuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9hdWRpdC9iYXNpYy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0L2Jhc2lj Lmh0bWwKaW5kZXggZjMxZWJmNDRkZTE4MDY2YTlmMjBjOGM0OGM0YzRlOWNmZjRiZjg2Yy4uOTIx YTc0MTA3MzQzMjhmMzYwNmM0NzZkOWM0ODZjOGVhYTc1OGRjYiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2F1ZGl0L2Jhc2ljLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2F1ZGl0L2Jhc2ljLmh0bWwKQEAgLTQ1LDYgKzQ1LDQzIEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgIEluc3BlY3RvclRlc3QuQXVkaXQuYWRkUHJvbWlzZVRlc3QoIkF1ZGl0LkJhc2ljLkVycm9y LlByb21pc2UuUmVzb2x2ZWQiLCBgc2V0VGltZW91dChyZXNvbHZlLCAwKWAsIFdJLkF1ZGl0VGVz dENhc2VSZXN1bHQuTGV2ZWwuRXJyb3IpOwogICAgIEluc3BlY3RvclRlc3QuQXVkaXQuYWRkUHJv bWlzZVRlc3QoIkF1ZGl0LkJhc2ljLkVycm9yLlByb21pc2UuUmVqZWN0ZWQiLCBgc2V0VGltZW91 dChyZWplY3QsIDAsICJyZWplY3RlZCIpYCwgV0kuQXVkaXRUZXN0Q2FzZVJlc3VsdC5MZXZlbC5F cnJvcik7CiAKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJBdWRpdC5C YXNpYy5EZWJ1Z2dlciIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiVGVzdCB0aGF0IGEgZGVidWdn ZXIgc3RhdGVtZW50IGRvZXNuJ3QgcGF1c2Ugd2hlbiBydW5uaW5nIGFuIGF1ZGl0LiIsCisgICAg ICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBjb25zdCBsZXZlbCA9ICJw YXNzIjsKKyAgICAgICAgICAgIGxldCBhdWRpdCA9IG5ldyBXSS5BdWRpdFRlc3RDYXNlKCJBdWRp dC5CYXNpYy5EZWJ1Z2dlciIsIGBmdW5jdGlvbigpIHsgZGVidWdnZXI7IHJldHVybiAiJHtsZXZl bH0iOyB9YCk7CisKKyAgICAgICAgICAgIGxldCBwYXVzZWQgPSBmYWxzZTsKKyAgICAgICAgICAg IGxldCBwYXVzZWRMaXN0ZW5lciA9IFdJLmRlYnVnZ2VyTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRM aXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCAoZXZlbnQpID0+IHsKKyAg ICAgICAgICAgICAgICBwYXVzZWQgPSB0cnVlOworCisgICAgICAgICAgICAgICAgV0kuZGVidWdn ZXJNYW5hZ2VyLnJlc3VtZSgpOworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIFdJLmF1 ZGl0TWFuYWdlci5hd2FpdEV2ZW50KFdJLkF1ZGl0TWFuYWdlci5FdmVudC5UZXN0Q29tcGxldGVk KS50aGVuKChldmVudCkgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 RmFsc2UocGF1c2VkLCAiU2hvdWxkIG5vdCBwYXVzZSBvbiB0aGUgZGVidWdnZXIgc3RhdGVtZW50 LiIpOworCisgICAgICAgICAgICAgICAgbGV0IHJlc3VsdHMgPSBXSS5hdWRpdE1hbmFnZXIucmVz dWx0cy5sYXN0VmFsdWU7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQocmVz dWx0cy5sZW5ndGggPT09IDEsICJUaGVyZSBzaG91bGQgYmUgMSByZXN1bHQuIik7CisKKyAgICAg ICAgICAgICAgICBsZXQgcmVzdWx0ID0gcmVzdWx0c1swXTsKKyAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFzc2VydChyZXN1bHQgaW5zdGFuY2VvZiBXSS5BdWRpdFRlc3RDYXNlUmVzdWx0 LCAiUmVzdWx0IHNob3VsZCBiZSBhIFdJLkF1ZGl0VGVzdENhc2VSZXN1bHQuIik7CisgICAgICAg ICAgICAgICAgaWYgKCFyZXN1bHQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocmVzdWx0LmxldmVsLCBsZXZl bCwgYFJlc3VsdCBzaG91bGQgYmUgIiR7bGV2ZWx9Ii5gKTsKKworICAgICAgICAgICAgICAgIFdJ LmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5F dmVudC5QYXVzZWQsIHBhdXNlZExpc3RlbmVyKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmxvZygiVGVzdGluZyBgZGVidWdnZXJgLi4uIik7CisKKyAgICAg ICAgICAgIFdJLmF1ZGl0TWFuYWdlci5zdGFydChbYXVkaXRdKQorICAgICAgICAgICAgLnRoZW4o cmVzb2x2ZSwgcmVqZWN0KTsKKyAgICAgICAgfSwKKyAgICB9KTsKKwogICAgIHN1aXRlLnJ1blRl c3RDYXNlc0FuZEZpbmlzaCgpOwogfQogPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvYXVkaXQvcmVzb3VyY2VzL2F1ZGl0LXV0aWxpdGllcy5qcyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9hdWRpdC9yZXNvdXJjZXMvYXVkaXQtdXRpbGl0aWVzLmpzCmluZGV4IDEw ZjExNGM4MmUwMDU5NzIwNWE1N2NmYjVlNWJmZmU0YWQyMThmZGQuLjgyNzk0NjRlZjUxMTA1N2Yw ZWYzZWIwYzc3M2IwYjIxZWIzNDJiMTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9hdWRpdC9yZXNvdXJjZXMvYXVkaXQtdXRpbGl0aWVzLmpzCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9hdWRpdC9yZXNvdXJjZXMvYXVkaXQtdXRpbGl0aWVzLmpzCkBAIC01OCw4ICs1OCw3 IEBAIFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIoKCkgPT4gewogICAgICAgICAgICAgICAg ICAgICAgICAgbG9nQXJyYXkoImRvbUF0dHJpYnV0ZXMiLCBkYXRhLmRvbUF0dHJpYnV0ZXMpOwog ICAgICAgICAgICAgICAgICAgICBpZiAoZGF0YS5lcnJvcnMpCiAgICAgICAgICAgICAgICAgICAg ICAgICBsb2dBcnJheSgiZXJyb3JzIiwgZGF0YS5lcnJvcnMpOwotICAgICAgICAgICAgICAgIH0p Ci0gICAgICAgICAgICAgICAgLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKKyAgICAgICAgICAgICAg ICB9KTsKIAogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJUZXN0aW5nIiArIChs b2dzLmJlZm9yZVN0YXJ0IHx8ICIiKSArICIuLi4iKTsKIAo=