73024 2011-11-23 09:14:27 -0800 Web Inspector: get rid of the WebInspector.mainResource, use WebInspector.inspectedPageURL instead. 2011-11-24 00:11:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 508181 0 pfeldman 2011-11-23 09:14:27 -0800 We use it for the URL mostly, no need to create artificial resource for that upon attaching to the existing page. 508182 1 116373 pfeldman 2011-11-23 09:17:09 -0800 Created attachment 116373 Patch 508191 2 116373 yurys 2011-11-23 09:26:01 -0800 Comment on attachment 116373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116373&action=review > Source/WebCore/inspector/front-end/AuditsPanel.js:135 > + var mainResourceURL = WebInspector.inspectedPageURL; I don't think inspectedPageUrl is a good name, it will be confusing in case of worker inspector, could you rename it to mainResourceURL or something like that? Same for inspectedPageDomain 508525 3 116373 vsevik 2011-11-23 17:35:28 -0800 Comment on attachment 116373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116373&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:986 > + InspectorFrontendHost.saveAs(WebInspector.inspectedPageURL.asParsedURL().host + ".har", JSON.stringify(harArchive)); s/WebInspector.inspectedPageURL.asParsedURL().host/WebInspector.inspectedPageDomain/ 508656 4 pfeldman 2011-11-24 00:11:26 -0800 Committed r101126: <http://trac.webkit.org/changeset/101126> 116373 2011-11-23 09:17:09 -0800 2011-11-23 17:35:28 -0800 Patch bug-73024-20111123211707.patch text/plain 25805 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGMwYzRmODBmZTRhZTdh NzYyYTkwOTMyNWYyOTczNzJlNTMwMjEwZi4uMDE3MmZkMjc5ZDBiMGFmYzE1ZWU2YTQ5MmU4YTAx YjQyYTdiMzI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDExLTExLTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBnZXQgcmlkIG9mIHRoZSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLCB1c2UgV2ViSW5zcGVj dG9yLmluc3BlY3RlZFBhZ2VVUkwgaW5zdGVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTczMDI0CisKKyAgICAgICAgV2UgdXNlIGl0IGZvciB0aGUg VVJMIG1vc3RseSwgbm8gbmVlZCB0byBjcmVhdGUgYXJ0aWZpY2lhbCByZXNvdXJjZSBmb3IgdGhh dCB1cG9uCisgICAgICAgIGF0dGFjaGluZyB0byB0aGUgZXhpc3RpbmcgcGFnZS4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvQXVkaXRzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJF bnRyeS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLl9idWlsZFBh Z2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLl9wYWdlRXZlbnRU aW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuX3VwZGF0ZVN1bW1h cnlCYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5f ZXhwb3J0QWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgdXJsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGRpc3BsYXlOYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGRpc3BsYXlEb21haW4p OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9wcm9jZXNz Q2FjaGVkUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bC5wcm90b3R5cGUuX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9hZGRGcmFt ZXNSZWN1cnNpdmVseSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0 aWxzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJMKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5faW5pdERlZmF1bHRTZWxlY3Rpb24p OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fYWRkUmVjb3JkVG9UaW1l bGluZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisgICAg ICAgIChTdHJpbmcucHJvdG90eXBlLmFzUGFyc2VkVVJMKToKKwogMjAxMS0xMS0yMyAgWXVyeSBT ZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBC dWlsZCBmaXguIEFkZGVkIG1pc3NpbmcgRU5BQkxFKFdPUktFUlMpIGd1YXJkcy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1BhbmVsLmpzCmluZGV4IDgz MjIwMDIyOWE5ZGIyOWY0NmU5YWY3Y2VkMzUzYzMzNTVlMzI1ZTguLmM3MzYxNTZhMWUyODc5MjM4 OWM3MDFhYWM5NDRkNjFjMWQ0Mjc5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwpAQCAtMTMyLDcgKzEzMiw3IEBAIFdlYkluc3Bl Y3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBydWxlc1JlbWFpbmlu ZyArPSBjYXRlZ29yaWVzW2ldLnJ1bGVDb3VudDsKIAogICAgICAgICB2YXIgcmVzdWx0cyA9IFtd OwotICAgICAgICB2YXIgbWFpblJlc291cmNlVVJMID0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJj ZS51cmw7CisgICAgICAgIHZhciBtYWluUmVzb3VyY2VVUkwgPSBXZWJJbnNwZWN0b3IuaW5zcGVj dGVkUGFnZVVSTDsKIAogICAgICAgICBmdW5jdGlvbiBydWxlUmVzdWx0UmVhZHlDYWxsYmFjayhj YXRlZ29yeVJlc3VsdCwgcnVsZVJlc3VsdCkKICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKaW5kZXggMDgwMjM5ZjNmYjNlY2Y1MjNi NDZkODdlNWFlNzYwMTAwNGIzNWY5NC4uMWQ5ZjIwMTM1MzIzOTY3MDYwODgyNDk5NGZlNGU2YmVl NmFkY2FhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9I QVJFbnRyeS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVu dHJ5LmpzCkBAIC0yMzcsOCArMjM3LDggQEAgV2ViSW5zcGVjdG9yLkhBUkxvZy5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICByZXR1cm4gWwogICAgICAgICAgICAgewotICAgICAgICAgICAg ICAgIHN0YXJ0ZWREYXRlVGltZTogbmV3IERhdGUoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5z dGFydFRpbWUgKiAxMDAwKSwKLSAgICAgICAgICAgICAgICBpZDogV2ViSW5zcGVjdG9yLm1haW5S ZXNvdXJjZS5kb2N1bWVudFVSTCwKKyAgICAgICAgICAgICAgICBzdGFydGVkRGF0ZVRpbWU6IG5l dyBEYXRlKFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2VTdGFydFRpbWUgKiAxMDAwKSwKKyAgICAg ICAgICAgICAgICBpZDogV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwsCiAgICAgICAgICAg ICAgICAgdGl0bGU6ICIiLAogICAgICAgICAgICAgICAgIHBhZ2VUaW1pbmdzOiB0aGlzLmJ1aWxk TWFpblJlc291cmNlVGltaW5ncygpCiAgICAgICAgICAgICB9CkBAIC0yNjAsNyArMjYwLDcgQEAg V2ViSW5zcGVjdG9yLkhBUkxvZy5wcm90b3R5cGUgPSB7CiAKICAgICBfcGFnZUV2ZW50VGltZTog ZnVuY3Rpb24odGltZSkKICAgICB7Ci0gICAgICAgIHZhciBzdGFydFRpbWUgPSBXZWJJbnNwZWN0 b3IubWFpblJlc291cmNlLnN0YXJ0VGltZTsKKyAgICAgICAgdmFyIHN0YXJ0VGltZSA9IFdlYklu c3BlY3Rvci5tYWluUmVzb3VyY2VTdGFydFRpbWU7CiAgICAgICAgIGlmICh0aW1lID09PSAtMSB8 fCBzdGFydFRpbWUgPT09IC0xKQogICAgICAgICAgICAgcmV0dXJuIC0xOwogICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyh0aW1lIC0gc3RhcnRUaW1l KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFu ZWwuanMKaW5kZXggYjkyNWRhOWU4Nzk0YTE5YWFkYmJkNzNmNDE1MGU0ZTMxMjEwMzJmNy4uNDE3 N2QyZDBkODg0YmE1ZmE4ZDY0MTMyYzk1MTI5MWYxMGJmZDUwMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTM5Miw4ICsz OTIsMTAgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICBzZWxlY3RlZFJlcXVlc3RzTnVtYmVyKys7CiAgICAgICAgICAgICAgICAgc2Vs ZWN0ZWRUcmFuc2ZlclNpemUgKz0gcmVzb3VyY2VUcmFuc2ZlclNpemU7CiAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICBpZiAocmVzb3VyY2UgPT09IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Up CisgICAgICAgICAgICBpZiAocmVzb3VyY2UudXJsID09PSBXZWJJbnNwZWN0b3IuaW5zcGVjdGVk UGFnZVVSTCkgewogICAgICAgICAgICAgICAgIGJhc2VUaW1lID0gcmVzb3VyY2Uuc3RhcnRUaW1l OworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2VTdGFydFRpbWUgPSBy ZXNvdXJjZS5zdGFydFRpbWU7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAocmVzb3Vy Y2UuZW5kVGltZSA+IG1heFRpbWUpCiAgICAgICAgICAgICAgICAgbWF4VGltZSA9IHJlc291cmNl LmVuZFRpbWU7CiAgICAgICAgIH0KQEAgLTk4MCw3ICs5ODIsOCBAQCBXZWJJbnNwZWN0b3IuTmV0 d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgaGFyQXJjaGl2ZSA9IHsKICAg ICAgICAgICAgIGxvZzogKG5ldyBXZWJJbnNwZWN0b3IuSEFSTG9nKHRoaXMuX3Jlc291cmNlcykp LmJ1aWxkKCkKICAgICAgICAgfTsKLSAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVB cyhXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLmRvbWFpbiArICIuaGFyIiwgSlNPTi5zdHJpbmdp ZnkoaGFyQXJjaGl2ZSkpOworICAgICAgICAKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LnNhdmVBcyhXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTC5hc1BhcnNlZFVSTCgpLmhvc3Qg KyAiLmhhciIsIEpTT04uc3RyaW5naWZ5KGhhckFyY2hpdmUpKTsKICAgICB9LAogCiAgICAgX2V4 cG9ydFJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IGZiZWIyOGFkYjc4YzE5NTI2NjhiMGIw ZWE5MzJlNDY2MzlkN2EzOGIuLmRiMDgwNjM5ZWY4Zjg5OWUxMDlkMGUwMzU0NGI4ZWMwNTNlMDll NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cwpAQCAtMjcwLDE5ICsyNzAsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLmRvbWFpbiA9IHBhcnNlZFVSTCA/IHBhcnNlZFVSTC5ob3N0IDogIiI7 CiAgICAgICAgIHRoaXMucGF0aCA9IHBhcnNlZFVSTCA/IHBhcnNlZFVSTC5wYXRoIDogIiI7CiAg ICAgICAgIHRoaXMudXJsRnJhZ21lbnQgPSBwYXJzZWRVUkwgPyBwYXJzZWRVUkwuZnJhZ21lbnQg OiAiIjsKLSAgICAgICAgdGhpcy5sYXN0UGF0aENvbXBvbmVudCA9ICIiOwotICAgICAgICBpZiAo cGFyc2VkVVJMICYmIHBhcnNlZFVSTC5wYXRoKSB7Ci0gICAgICAgICAgICAvLyBGaXJzdCBjdXQg dGhlIHF1ZXJ5IHBhcmFtcy4KLSAgICAgICAgICAgIHZhciBwYXRoID0gcGFyc2VkVVJMLnBhdGg7 Ci0gICAgICAgICAgICB2YXIgaW5kZXhPZlF1ZXJ5ID0gcGF0aC5pbmRleE9mKCI/Iik7Ci0gICAg ICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ICE9PSAtMSkKLSAgICAgICAgICAgICAgICBwYXRoID0g cGF0aC5zdWJzdHJpbmcoMCwgaW5kZXhPZlF1ZXJ5KTsKLQotICAgICAgICAgICAgLy8gVGhlbiB0 YWtlIGxhc3QgcGF0aCBjb21wb25lbnQuCi0gICAgICAgICAgICB2YXIgbGFzdFNsYXNoSW5kZXgg PSBwYXRoLmxhc3RJbmRleE9mKCIvIik7Ci0gICAgICAgICAgICBpZiAobGFzdFNsYXNoSW5kZXgg IT09IC0xKQotICAgICAgICAgICAgICAgIHRoaXMubGFzdFBhdGhDb21wb25lbnQgPSBwYXRoLnN1 YnN0cmluZyhsYXN0U2xhc2hJbmRleCArIDEpOwotICAgICAgICB9CisgICAgICAgIHRoaXMubGFz dFBhdGhDb21wb25lbnQgPSBwYXJzZWRVUkwgPyBwYXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQg OiAiIjsKICAgICAgICAgdGhpcy5sYXN0UGF0aENvbXBvbmVudExvd2VyQ2FzZSA9IHRoaXMubGFz dFBhdGhDb21wb25lbnQudG9Mb3dlckNhc2UoKTsKICAgICB9LAogCkBAIC0zMDQsNyArMjkyLDcg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlz Ll9kaXNwbGF5TmFtZSkKICAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy5kaXNw bGF5RG9tYWluOwogICAgICAgICBpZiAoIXRoaXMuX2Rpc3BsYXlOYW1lICYmIHRoaXMudXJsKQot ICAgICAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0aGlzLnVybC50cmltVVJMKFdlYkluc3Bl Y3Rvci5tYWluUmVzb3VyY2UgPyBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLmRvbWFpbiA6ICIi KTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmwudHJpbVVSTChXZWJJ bnNwZWN0b3IuaW5zcGVjdGVkUGFnZURvbWFpbiA/IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdl RG9tYWluIDogIiIpOwogICAgICAgICBpZiAodGhpcy5fZGlzcGxheU5hbWUgPT09ICIvIikKICAg ICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmw7CiAgICAgICAgIHJldHVybiB0 aGlzLl9kaXNwbGF5TmFtZTsKQEAgLTMyMyw3ICszMTEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UucHJvdG90eXBlID0gewogICAgIGdldCBkaXNwbGF5RG9tYWluKCkKICAgICB7CiAgICAgICAg IC8vIFdlYkluc3BlY3Rvci5EYXRhYmFzZSBjYWxscyB0aGlzLCBzbyBkb24ndCBhY2Nlc3MgbW9y ZSB0aGFuIHRoaXMuZG9tYWluLgotICAgICAgICBpZiAodGhpcy5kb21haW4gJiYgKCFXZWJJbnNw ZWN0b3IubWFpblJlc291cmNlIHx8IChXZWJJbnNwZWN0b3IubWFpblJlc291cmNlICYmIHRoaXMu ZG9tYWluICE9PSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLmRvbWFpbikpKQorICAgICAgICBp ZiAodGhpcy5kb21haW4gJiYgKCFXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZURvbWFpbiB8fCAo V2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VEb21haW4gJiYgdGhpcy5kb21haW4gIT09IFdlYklu c3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWluKSkpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5k b21haW47CiAgICAgICAgIHJldHVybiAiIjsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggYmUz ZjQ5NTFmMzczN2RkMDdjMTQ3MzJmMGFkNzViYzI3MzliYWNmOS4uYjRmNzQwNGJjMjMwZWY3ZjA3 Y2QyYWQyZTI5MTIyZjkxODViNWU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC04NCwxNyArODQsMjEg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5XaWxsTG9hZENhY2hlZFJlc291cmNlcyk7CiAgICAgICAgIHRoaXMu X2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KG1haW5GcmFtZVBheWxvYWQpOwotICAgICAgICB0aGlzLl9k aXNwYXRjaEluc3BlY3RlZFVSTENoYW5nZWQoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwp OworCisgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMID0gbWFpbkZyYW1lUGF5 bG9hZC5mcmFtZS51cmw7CisgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWlu ID0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwuYXNQYXJzZWRVUkwoKS5ob3N0OworCisg ICAgICAgIHRoaXMuX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZCgpOwogICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwu RXZlbnRUeXBlcy5DYWNoZWRSZXNvdXJjZXNMb2FkZWQpOwogICAgICAgICBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UucmVzdG9yZVJldmlzaW9ucygpOwogCiAgICAgICAgIHRoaXMuX2NhY2hlZFJlc291 cmNlc1Byb2Nlc3NlZCA9IHRydWU7CiAgICAgfSwKIAotICAgIF9kaXNwYXRjaEluc3BlY3RlZFVS TENoYW5nZWQ6IGZ1bmN0aW9uKHVybCkKKyAgICBfZGlzcGF0Y2hJbnNwZWN0ZWRVUkxDaGFuZ2Vk OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuaW5zcGVj dGVkVVJMQ2hhbmdlZCh1cmwpOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0ZWRVUkxD aGFuZ2VkLCB1cmwpOworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuaW5zcGVjdGVkVVJM Q2hhbmdlZChXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCk7CisgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVu dFR5cGVzLkluc3BlY3RlZFVSTENoYW5nZWQsIFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJM KTsKICAgICB9LAogCiAgICAgX2FkZEZyYW1lOiBmdW5jdGlvbihmcmFtZSkKQEAgLTEzNiw4ICsx NDAsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKIAog ICAgICAgICBpZiAoaXNNYWluRnJhbWUpIHsKICAgICAgICAgICAgIHRoaXMuX2NsZWFudXBGcmFt ZXNBZnRlck5hdmlnYXRpb24oZnJhbWUpOwotICAgICAgICAgICAgaWYgKHRoaXMucmVzb3VyY2VG b3JVUkwoZnJhbWUudXJsKSkKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291 cmNlID0gdGhpcy5yZXNvdXJjZUZvclVSTChmcmFtZS51cmwpOworICAgICAgICAgICAgaWYgKHRo aXMucmVzb3VyY2VGb3JVUkwoZnJhbWUudXJsKSkgeworICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5pbnNwZWN0ZWRQYWdlVVJMID0gZnJhbWUudXJsOworICAgICAgICAgICAgICAgIFdlYklu c3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWluID0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VV UkwuYXNQYXJzZWRVUkwoKS5ob3N0OworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAg IC8vIERvIG5vdGhpbmcgdW5sZXNzIGNhY2hlZCByZXNvdXJjZSB0cmVlIGlzIHByb2Nlc3NlZCAt IGl0IHdpbGwgb3ZlcndyaXRlIGV2ZXJ5dGhpbmcuCiAgICAgICAgIGlmICghdGhpcy5fY2FjaGVk UmVzb3VyY2VzUHJvY2Vzc2VkKQpAQCAtMTY0LDcgKzE3MCw3IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoaXNN YWluRnJhbWUpCi0gICAgICAgICAgICB0aGlzLl9kaXNwYXRjaEluc3BlY3RlZFVSTENoYW5nZWQo ZnJhbWUudXJsKTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdl ZCgpOwogICAgIH0sCiAKICAgICBfY2xlYW51cEZyYW1lc0FmdGVyTmF2aWdhdGlvbjogZnVuY3Rp b24obmV3TWFpbkZyYW1lKQpAQCAtMzczLDcgKzM3OSw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZyYW1lUmVzb3VyY2UuZmluaXNoZWQg PSB0cnVlOwogCiAgICAgICAgIGlmICghZnJhbWVQYXlsb2FkLnBhcmVudElkKSB7Ci0gICAgICAg ICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlID0gZnJhbWVSZXNvdXJjZTsKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMID0gZnJhbWVSZXNvdXJjZS51cmw7Cisg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZURvbWFpbiA9IFdlYkluc3BlY3Rv ci5pbnNwZWN0ZWRQYWdlVVJMLmFzUGFyc2VkVVJMKCkuaG9zdDsKICAgICAgICAgICAgIHRoaXMu X2N1cnJlbnRNYWluRnJhbWVJZCA9IGZyYW1lUGF5bG9hZC5pZDsKICAgICAgICAgfQogICAgICAg ICB0aGlzLl9hZGRGcmFtZShmcmFtZVBheWxvYWQpOwpAQCAtNDUyLDggKzQ1OSwzIEBAIFdlYklu c3BlY3Rvci5QYWdlRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgKiBAdHlwZSB7V2ViSW5zcGVj dG9yLlJlc291cmNlVHJlZU1vZGVsfQogICovCiBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9k ZWwgPSBudWxsOwotCi0vKioKLSAqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9Ci0gKi8K LVdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCmluZGV4IDMwNTU0NzE3ODdh NWY0YzA2ZjIzY2E3OThjZTViNWFkN2Q0MjFhZjcuLmQ3ZTM2OTZjOGM1MTNiYzc5MjQwN2NlMTcx YzI1NWM1NGNlOTM2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VVdGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVXRpbHMuanMKQEAgLTU4LDE4ICs1OCwxOSBAQCBXZWJJbnNwZWN0b3Iu ZGlzcGxheU5hbWVGb3JVUkwgPSBmdW5jdGlvbih1cmwpCiAgICAgaWYgKHJlc291cmNlKQogICAg ICAgICByZXR1cm4gcmVzb3VyY2UuZGlzcGxheU5hbWU7CiAKLSAgICBpZiAoIVdlYkluc3BlY3Rv ci5tYWluUmVzb3VyY2UpCisgICAgaWYgKCFXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCkK ICAgICAgICAgcmV0dXJuIHVybC50cmltVVJMKCIiKTsKIAotICAgIHZhciBsYXN0UGF0aENvbXBv bmVudCA9IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UubGFzdFBhdGhDb21wb25lbnQ7Ci0gICAg dmFyIGluZGV4ID0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwuaW5kZXhPZihsYXN0UGF0 aENvbXBvbmVudCk7Ci0gICAgaWYgKGluZGV4ICE9PSAtMSAmJiBpbmRleCArIGxhc3RQYXRoQ29t cG9uZW50Lmxlbmd0aCA9PT0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwubGVuZ3RoKSB7 Ci0gICAgICAgIHZhciBiYXNlVVJMID0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwuc3Vi c3RyaW5nKDAsIGluZGV4KTsKKyAgICB2YXIgcGFyc2VkVVJMID0gV2ViSW5zcGVjdG9yLmluc3Bl Y3RlZFBhZ2VVUkwuYXNQYXJzZWRVUkwoKTsKKyAgICB2YXIgbGFzdFBhdGhDb21wb25lbnQgPSBw YXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQ7CisgICAgdmFyIGluZGV4ID0gV2ViSW5zcGVjdG9y Lmluc3BlY3RlZFBhZ2VVUkwuaW5kZXhPZihsYXN0UGF0aENvbXBvbmVudCk7CisgICAgaWYgKGlu ZGV4ICE9PSAtMSAmJiBpbmRleCArIGxhc3RQYXRoQ29tcG9uZW50Lmxlbmd0aCA9PT0gV2ViSW5z cGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwubGVuZ3RoKSB7CisgICAgICAgIHZhciBiYXNlVVJMID0g V2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwuc3Vic3RyaW5nKDAsIGluZGV4KTsKICAgICAg ICAgaWYgKHVybC5pbmRleE9mKGJhc2VVUkwpID09PSAwKQogICAgICAgICAgICAgcmV0dXJuIHVy bC5zdWJzdHJpbmcoaW5kZXgpOwogICAgIH0KIAotICAgIHJldHVybiB1cmwudHJpbVVSTChXZWJJ bnNwZWN0b3IubWFpblJlc291cmNlLmRvbWFpbik7CisgICAgcmV0dXJuIHVybC50cmltVVJMKHBh cnNlZFVSTC5ob3N0KTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCA3M2YyMmM0ZDVlZDgyZWQyM2U1 ZTA4MjQ5YmFiODZjYjYyZjc5NTUzLi5kMTkwMzQ2MTNlMWYyNDdiY2RlZTk5ZWJiZjBhNDAwNDc5 ZTNmYzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMKQEAgLTEzMSw4ICsxMzEsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UgJiYgdGhpcy5yZXNvdXJjZXNMaXN0VHJl ZUVsZW1lbnQgJiYgdGhpcy5yZXNvdXJjZXNMaXN0VHJlZUVsZW1lbnQuZXhwYW5kZWQpCi0gICAg ICAgICAgICB0aGlzLnNob3dSZXNvdXJjZShXZWJJbnNwZWN0b3IubWFpblJlc291cmNlKTsKKyAg ICAgICAgdmFyIG1haW5SZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMICYm IHRoaXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50ICYmIHRoaXMucmVzb3VyY2VzTGlzdFRyZWVF bGVtZW50LmV4cGFuZGVkICYmIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5yZXNvdXJj ZUZvclVSTChXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCk7CisgICAgICAgIGlmIChtYWlu UmVzb3VyY2UpCisgICAgICAgICAgICB0aGlzLnNob3dSZXNvdXJjZShtYWluUmVzb3VyY2UpOwog ICAgIH0sCiAKICAgICBfcmVzZXQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCBkNDZjODJiNDhkZWU4 MDAzMjY1NGIwNWFiZDdhYzhhZWI3ZTVmYjNjLi4wM2Q5MmU0MGJjZWJiYzJkMmM1ZjQ5YTc2N2Y2 NDgwOGY1YjhmZjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC0zODgsMTYgKzM4OCw2IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9hZGRSZWNvcmRUb1RpbWVsaW5lOiBm dW5jdGlvbihyZWNvcmQpCiAgICAgewotICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IFdlYklu c3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuUmVzb3VyY2VTZW5kUmVxdWVzdCkgewot ICAgICAgICAgICAgdmFyIGlzTWFpblJlc291cmNlID0gKHJlY29yZC5kYXRhWyJyZXF1ZXN0SWQi XSA9PT0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5yZXF1ZXN0SWQpOwotICAgICAgICAgICAg aWYgKGlzTWFpblJlc291cmNlICYmIHRoaXMuX21haW5SZXF1ZXN0SWQgIT09IHJlY29yZC5kYXRh WyJyZXF1ZXN0SWQiXSkgewotICAgICAgICAgICAgICAgIC8vIFdlIGFyZSBsb2FkaW5nIG5ldyBt YWluIHJlc291cmNlIC0+IGNsZWFyIHRoZSBwYW5lbC4gQ2hlY2sgYWJvdmUgaXMgbmVjZXNzYXJ5 IHNpbmNlCi0gICAgICAgICAgICAgICAgLy8gdGhlcmUgbWF5IGJlIHNldmVyYWwgcmVzb3VyY2Ug bG9hZHMgd2l0aCBtYWluIHJlc291cmNlIG1hcmtlciB1cG9uIHJlZGlyZWN0cywgcmVkaXJlY3Rz IGFyZSByZXBvcnRlZCB3aXRoCi0gICAgICAgICAgICAgICAgLy8gdGhlIG9yaWdpbmFsIHJlcXVl c3QgaWQuCi0gICAgICAgICAgICAgICAgdGhpcy5fbWFpblJlcXVlc3RJZCA9IHJlY29yZC5kYXRh WyJyZXF1ZXN0SWQiXTsKLSAgICAgICAgICAgICAgICB0aGlzLl9jbGVhclBhbmVsKCk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0KICAgICAgICAgdGhpcy5fbW9kZWwuX2FkZFJlY29yZChyZWNv cmQpOwogICAgICAgICB0aGlzLl9pbm5lckFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLCB0aGlz Ll9yb290UmVjb3JkKTsKICAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKGZhbHNlKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5kZXgg NTBmMjg2OTEyZDFmYjU1MmU4MmExZTE5MGFmY2VhNTk3NTZiMDJhNC4uNDRlNWY1MjY0Y2EwZTYy YzBkNTM4MmQwYWM3ZTIwYTMxODUxOWIzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKQEAgLTQ1Myw2ICs0NTMsMjAgQEAgU3RyaW5nLnBy b3RvdHlwZS5hc1BhcnNlZFVSTCA9IGZ1bmN0aW9uKCkKICAgICByZXN1bHQucG9ydCA9IG1hdGNo WzNdOwogICAgIHJlc3VsdC5wYXRoID0gbWF0Y2hbNF0gfHwgIi8iOwogICAgIHJlc3VsdC5mcmFn bWVudCA9IG1hdGNoWzVdOworCisgICAgcmVzdWx0Lmxhc3RQYXRoQ29tcG9uZW50ID0gIiI7Cisg ICAgaWYgKHJlc3VsdC5wYXRoKSB7CisgICAgICAgIC8vIEZpcnN0IGN1dCB0aGUgcXVlcnkgcGFy YW1zLgorICAgICAgICB2YXIgcGF0aCA9IHJlc3VsdC5wYXRoOworICAgICAgICB2YXIgaW5kZXhP ZlF1ZXJ5ID0gcGF0aC5pbmRleE9mKCI/Iik7CisgICAgICAgIGlmIChpbmRleE9mUXVlcnkgIT09 IC0xKQorICAgICAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7 CisKKyAgICAgICAgLy8gVGhlbiB0YWtlIGxhc3QgcGF0aCBjb21wb25lbnQuCisgICAgICAgIHZh ciBsYXN0U2xhc2hJbmRleCA9IHBhdGgubGFzdEluZGV4T2YoIi8iKTsKKyAgICAgICAgaWYgKGxh c3RTbGFzaEluZGV4ICE9PSAtMSkKKyAgICAgICAgICAgIHJlc3VsdC5sYXN0UGF0aENvbXBvbmVu dCA9IHBhdGguc3Vic3RyaW5nKGxhc3RTbGFzaEluZGV4ICsgMSk7CisgICAgfSAKICAgICByZXR1 cm4gcmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzQ5ZjBhYTJiMmIzNjJlM2IzMmZlMTEyMjZiMzRlMjdl NDQ1YzY4Ni4uY2FkM2I4YzBlZThlODYzMDkxMDA0Njk2ODEwNjdkMTQxYjY1Zjc0ZSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIzIEBACisyMDExLTExLTIzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29v Z2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBnZXQgcmlkIG9mIHRoZSBXZWJJbnNw ZWN0b3IubWFpblJlc291cmNlLCB1c2UgV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwgaW5z dGVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz MDI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItYnJlYWtwb2ludHMtbm90LWFjdGl2YXRlZC1vbi1y ZWxvYWQuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItc2NyaXB0 cy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIuaHRtbDoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2VsZWN0ZWQtY2FsbC1mcmFtZS1hZnRlci1mb3Jt YXR0aW5nLXNvdXJjZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci93YXRjaC1l eHByZXNzaW9ucy1wYW5lbC1zd2l0Y2guaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0ZW5z aW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9wZXJmb3Jt YW5jZS9yZXNvdXJjZXMvZmlyc3Qtb3Blbi1yZXNvdXJjZXMuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvcGVyZm9ybWFuY2UvcmVzb3VyY2VzL3BlcmZvcm1hbmNlLXRlc3QuanM6CisgICAgICAg IChpbml0aWFsaXplX1RpbWVUcmFja2VyLkluc3BlY3RvclRlc3QucnVuUGVyZm9ybWFuY2VUZXN0 LlRpbWVyLnByb3RvdHlwZS5fZHVtcCk6CisgICAgICAgIChpbml0aWFsaXplX1RpbWVUcmFja2Vy Lkluc3BlY3RvclRlc3QucnVuUGVyZm9ybWFuY2VUZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3Iv cGVyZm9ybWFuY2UvcmVzb3VyY2VzL3Nob3ctcGFuZWwuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0 b3Ivc3R5bGVzL3N0eWxlcy1oaXN0b3J5Lmh0bWw6CisKIDIwMTEtMTEtMjMgIFBoaWxpcHBlIE5v cm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHNraXAg YW5vdGhlciBzdmcgdGVzdCBvbiBHVEsgc2hvd2luZyBzaWduZWQgemVybyBpc3N1ZXMuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItYnJlYWtwb2lu dHMtbm90LWFjdGl2YXRlZC1vbi1yZWxvYWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9kZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9hZC5odG1s CmluZGV4IGJkMDYwNjJmYmRiY2ZlYjliZGYyNTVkN2UxNTFlOTEzZWEyMTQ1ZjcuLjc5ZjhiODNl ZTJmMTlhMjdhOWYyMzY0NjkzNzJkYWI4MzkwMDhjNDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9u LXJlbG9hZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dl ci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9hZC5odG1sCkBAIC0xMSw3ICsxMSw3 IEBAIGZ1bmN0aW9uIHRlc3RGdW5jdGlvbigpCiAKIHZhciB0ZXN0ID0gZnVuY3Rpb24oKQogewot ICAgIHZhciB0ZXN0TmFtZSA9IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UudXJsOworICAgIHZh ciB0ZXN0TmFtZSA9IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMOwogICAgIHRlc3ROYW1l ID0gdGVzdE5hbWUuc3Vic3RyaW5nKHRlc3ROYW1lLmxhc3RJbmRleE9mKCcvJykgKyAxKTsKIAog ICAgIEluc3BlY3RvclRlc3Quc3RhcnREZWJ1Z2dlclRlc3Qoc3RlcDEpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXNjcmlwdHMuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1zY3JpcHRzLmh0bWwKaW5kZXgg MWQyYzA5MGFhNTU5YTBlOGI1NTAyNDYwYmUzMzU4NmRhNzIwZWFiNy4uOWRlYjY5MjAzNzViZTZi YTg2YzllNGEyMjcxMzlkOTNjN2Y1NzA0MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXNjcmlwdHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvZGVidWdnZXItc2NyaXB0cy5odG1sCkBAIC0xOCw3ICsxOCw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIGZ1bmN0aW9uIHN0ZXAyKGV2ZW50KQogICAgIHsKICAgICAgICAg dmFyIHNjcmlwdCA9IGV2ZW50LmRhdGE7Ci0gICAgICAgIGlmIChzY3JpcHQuc291cmNlVVJMICE9 PSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVybCkKKyAgICAgICAgaWYgKHNjcmlwdC5zb3Vy Y2VVUkwgIT09IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMKQogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICBzY3JpcHRzLnB1c2goc2NyaXB0KTsKICAgICAgICAgaWYgKHNjcmlwdHMu bGVuZ3RoID09PSA2KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L2xpbmtpZmllci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmll ci5odG1sCmluZGV4IGJmMDRlMzQwMjM3NjNjZmFiMWVjOTYwMzViNzFiYTVkYWNhNGQzNWUuLjcy NWRkMjBhMDQ3NjgyMGM1ZWJhNmUzNTdlZjQ2MTNjOGQyY2RlMjAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKQEAgLTIxLDcgKzIxLDcgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICB2YXIg c2NyaXB0ID0gZXZlbnQuZGF0YTsKLSAgICAgICAgICAgIGlmIChzY3JpcHQuc291cmNlVVJMID09 PSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLl9kb2N1bWVudFVSTCkgeworICAgICAgICAgICAg aWYgKHNjcmlwdC5zb3VyY2VVUkwgPT09IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMKSB7 CiAgICAgICAgICAgICAgICAgY29udGludWVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBzZXRU aW1lb3V0KGRlYnVnZ2VyVGVzdCwgMCk7CiAgICAgICAgICAgICB9CkBAIC0zNCwxMCArMzQsMTAg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgZnVuY3Rpb24gZGVidWdnZXJUZXN0KCkKICAgICB7CiAg ICAgICAgIGxpbmtpZmllciA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LmNyZWF0ZUxpbmtpZmllcigpOwotICAgICAgICByYXdTb3VyY2VDb2RlID0gV2ViSW5zcGVjdG9y LmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRXaXRoVVJM KFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UuX2RvY3VtZW50VVJMKTsKKyAgICAgICAgcmF3U291 cmNlQ29kZSA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLl9yYXdTb3Vy Y2VDb2RlRm9yU2NyaXB0V2l0aFVSTChXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCk7CiAK ICAgICAgICAgdmFyIGNvdW50MSA9IGxpc3RlbmVyc0NvdW50KHJhd1NvdXJjZUNvZGUpOwotICAg ICAgICBsaW5rID0gbGlua2lmaWVyLmxpbmtpZnlMb2NhdGlvbihXZWJJbnNwZWN0b3IubWFpblJl c291cmNlLl9kb2N1bWVudFVSTCwgMjAsIDAsICJkdW1teS1jbGFzcyIpOworICAgICAgICBsaW5r ID0gbGlua2lmaWVyLmxpbmtpZnlMb2NhdGlvbihXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVS TCwgMjAsIDAsICJkdW1teS1jbGFzcyIpOwogICAgICAgICB2YXIgY291bnQyID0gbGlzdGVuZXJz Q291bnQocmF3U291cmNlQ29kZSk7CiAKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQo Imxpc3RlbmVycyBhZGRlZCBvbiByYXcgc291cmNlIGNvZGU6ICIgKyAoY291bnQyIC0gY291bnQx KSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2VsZWN0ZWQt Y2FsbC1mcmFtZS1hZnRlci1mb3JtYXR0aW5nLXNvdXJjZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyL3NlbGVjdGVkLWNhbGwtZnJhbWUtYWZ0ZXItZm9ybWF0dGluZy1zb3Vy Y2UuaHRtbAppbmRleCA0MTlmZDQ3YWNiZjYxZDVhNTFlNWJiYzQ3ZWY2NmYxN2I2Y2Y1Y2JlLi42 ZTlkZTQzZGVkNDQwNTViNjFmMmI3MjEzYTJjOWJhNjcwMTQ5NDdjIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2VsZWN0ZWQtY2FsbC1mcmFtZS1hZnRlci1mb3Jt YXR0aW5nLXNvdXJjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9z ZWxlY3RlZC1jYWxsLWZyYW1lLWFmdGVyLWZvcm1hdHRpbmctc291cmNlLmh0bWwKQEAgLTIzLDcg KzIzLDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAg ICAgewotICAgICAgICB2YXIgdGVzdE5hbWUgPSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVy bDsKKyAgICAgICAgdmFyIHRlc3ROYW1lID0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkw7 CiAgICAgICAgIHRlc3ROYW1lID0gdGVzdE5hbWUuc3Vic3RyaW5nKHRlc3ROYW1lLmxhc3RJbmRl eE9mKCcvJykgKyAxKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKHRl c3ROYW1lLCBzdGVwMik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3dhdGNoLWV4cHJlc3Npb25zLXBhbmVsLXN3aXRjaC5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3dhdGNoLWV4cHJlc3Npb25zLXBhbmVsLXN3aXRjaC5odG1s CmluZGV4IGJlMWI3M2UyNTI0YmZmYzkyYTM0YzFkZjI0YjQyMzMyMWM2ZTE0NTIuLjQ3M2MzNDE1 ODliNzlhOTA3ZmU5YjUxOWFmNWIzMDc4ODM2YzlmZGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci93YXRjaC1leHByZXNzaW9ucy1wYW5lbC1zd2l0Y2guaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvd2F0Y2gtZXhwcmVzc2lvbnMtcGFu ZWwtc3dpdGNoLmh0bWwKQEAgLTI5LDcgKzI5LDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAg ICAgICAgIHdhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLndhdGNoRXhwcmVzc2lvbnMucHVzaCgid2lu ZG93YS5kb2N1bWVudCIpOwogICAgICAgICB3YXRjaEV4cHJlc3Npb25zU2VjdGlvbi51cGRhdGUo KTsKIAotICAgICAgICB2YXIgdGVzdE5hbWUgPSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVy bDsKKyAgICAgICAgdmFyIHRlc3ROYW1lID0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkw7 CiAgICAgICAgIHRlc3ROYW1lID0gdGVzdE5hbWUuc3Vic3RyaW5nKHRlc3ROYW1lLmxhc3RJbmRl eE9mKCcvJykgKyAxKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKHRl c3ROYW1lLCBkaWRTaG93U2NyaXB0U291cmNlKTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAppbmRleCBm OWZjY2I0ZjljODk4ODYzNjJhYmZlMDFlYWY2MWNlNjZkOWI5ZTJmLi4wYzJkOTBhYTNiNGZmMjI1 MGI3YjM5ZDhjMjk5NWRmOTg3YTNmYzY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLmh0bWwKQEAgLTQzLDcgKzQzLDcg QEAgZnVuY3Rpb24gZXh0ZW5zaW9uX3Rlc3RPbk5hdmlnYXRlZChuZXh0VGVzdCkKICAgICAgICAg aWYgKGxvYWRDb3VudCAhPT0gdXJscy5sZW5ndGgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIGlmIChsb2FkQ291bnQgPT09IDEpCi0gICAgICAgICAgICBldmFsdWF0ZU9uRnJvbnRlbmQo Ikluc3BlY3RvclRlc3QubmF2aWdhdGUoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwuc3Vi c3RyaW5nKDAsIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UudXJsLmluZGV4T2YoJz8nKSksIHJl cGx5KSIsIG9uTG9hZCk7CisgICAgICAgICAgICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3Rv clRlc3QubmF2aWdhdGUoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwuc3Vic3RyaW5nKDAs IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMLmluZGV4T2YoJz8nKSksIHJlcGx5KSIsIG9u TG9hZCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgd2ViSW5zcGVjdG9yLm5ldHdvcmsu b25OYXZpZ2F0ZWQucmVtb3ZlTGlzdGVuZXIob25OYXZpZ2F0ZWQpOwogICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCB1cmxzLmxlbmd0aDsgKytpKQpAQCAtNTcsNyArNTcsNyBAQCBmdW5j dGlvbiBleHRlbnNpb25fdGVzdE9uTmF2aWdhdGVkKG5leHRUZXN0KQogICAgICAgICBwcm9jZXNz RXZlbnQoKTsKICAgICB9CiAgICAgd2ViSW5zcGVjdG9yLm5ldHdvcmsub25OYXZpZ2F0ZWQuYWRk TGlzdGVuZXIob25OYXZpZ2F0ZWQpOwotICAgIGV2YWx1YXRlT25Gcm9udGVuZCgiSW5zcGVjdG9y VGVzdC5uYXZpZ2F0ZShXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVybCArICc/bmF2aWdhdGVk JywgcmVwbHkpIiwgb25Mb2FkKTsKKyAgICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3RvclRl c3QubmF2aWdhdGUoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwgKyAnP25hdmlnYXRlZCcs IHJlcGx5KSIsIG9uTG9hZCk7CiB9CiAKIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0Vmlld1Nob3dI aWRlKG5leHRUZXN0KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3BlcmZvcm1h bmNlL3Jlc291cmNlcy9maXJzdC1vcGVuLXJlc291cmNlcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3BlcmZvcm1hbmNlL3Jlc291cmNlcy9maXJzdC1vcGVuLXJlc291cmNlcy5odG1sCmlu ZGV4IDQyN2NmMWM1NTBhODE5ZjZkYzhiMTFkMzE0YzVjYWFhYmZhNzI0N2MuLjdiMTExNmQzMDc1 MzNmODRmYjBlNTdhNzUyMWJjYTA0MmVlYzMxMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wZXJmb3JtYW5jZS9yZXNvdXJjZXMvZmlyc3Qtb3Blbi1yZXNvdXJjZXMuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcGVyZm9ybWFuY2UvcmVzb3VyY2VzL2ZpcnN0LW9w ZW4tcmVzb3VyY2VzLmh0bWwKQEAgLTcsNyArNyw3IEBACiBmdW5jdGlvbiB0ZXN0KCkKIHsKICAg ICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJyZXNvdXJjZXMiKTsKLSAgICBXZWJJbnNwZWN0b3Iu c2V0dGluZ3MucmVzb3VyY2VzTGFzdFNlbGVjdGVkSXRlbS5zZXQoV2ViSW5zcGVjdG9yLm1haW5S ZXNvdXJjZS5fZG9jdW1lbnRVUkwpOworICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5yZXNvdXJj ZXNMYXN0U2VsZWN0ZWRJdGVtLnNldChXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCk7CiAK ICAgICBmdW5jdGlvbiB0ZXN0KHRpbWVyKQogICAgIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9wZXJmb3JtYW5jZS9yZXNvdXJjZXMvcGVyZm9ybWFuY2UtdGVzdC5qcyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9wZXJmb3JtYW5jZS9yZXNvdXJjZXMvcGVyZm9ybWFuY2UtdGVz dC5qcwppbmRleCAzZjAxNDY0MGMxMWQ0Njk5YzU3OWM5ZjQxNzdkMjI3MDYwZjQ2YWVmLi4zMjZm NTNhNGIzYmY2OTQ1YzczMmQ0YjhhODIyNzI5YTM3OGViZTdiIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvcGVyZm9ybWFuY2UvcmVzb3VyY2VzL3BlcmZvcm1hbmNlLXRlc3QuanMK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3BlcmZvcm1hbmNlL3Jlc291cmNlcy9wZXJmb3Jt YW5jZS10ZXN0LmpzCkBAIC03Myw3ICs3Myw3IEBAIEluc3BlY3RvclRlc3QucnVuUGVyZm9ybWFu Y2VUZXN0ID0gZnVuY3Rpb24ocGVyZlRlc3QsIGV4ZWN1dGVUaW1lLCBjYWxsYmFjaykKICAgICAg ICAgICAgIGZvciAodmFyIHRlc3ROYW1lIGluIHRoaXMuX3RpbWVzKQogICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZHVtcFRlc3RTdGF0cyh0ZXN0TmFtZSwgdGhpcy5fdGltZXNbdGVzdE5h bWVdKTsKIAotICAgICAgICAgICAgdmFyIHVybCA9IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uu X2RvY3VtZW50VVJMOworICAgICAgICAgICAgdmFyIHVybCA9IFdlYkluc3BlY3Rvci5pbnNwZWN0 ZWRQYWdlVVJMOwogICAgICAgICAgICAgdmFyIHJlZ0V4cCA9IC8oW15cL10rKVwuaHRtbC87CiAg ICAgICAgICAgICB2YXIgbWF0Y2hlcyA9IHJlZ0V4cC5leGVjKHVybCk7CiAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmR1bXBUZXN0U3RhdHMoImhlYXAtZGVsdGEta2ItIiArIG1hdGNoZXNbMV0s IHRoaXMuX2hlYXBTaXplRGVsdGFzLCAxMDI0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wZXJmb3JtYW5jZS9yZXNvdXJjZXMvc2hvdy1wYW5lbC5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3BlcmZvcm1hbmNlL3Jlc291cmNlcy9zaG93LXBhbmVsLmh0bWwKaW5kZXgg MzAzZTRmZjUxYTIzOTFkMTIyMzQxMjk2YWU5ODE3YzdiMDhmYTQ0Yy4uMjZiODRjNWJjZjFiYmM5 YzAwOWIwYTA1OTkxZDllMzA1YTllMzc3NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3BlcmZvcm1hbmNlL3Jlc291cmNlcy9zaG93LXBhbmVsLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3BlcmZvcm1hbmNlL3Jlc291cmNlcy9zaG93LXBhbmVsLmh0bWwKQEAgLTI2 LDcgKzI2LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgfQogCiAgICAgV2ViSW5zcGVjdG9yLnNo b3dQYW5lbCgicmVzb3VyY2VzIik7Ci0gICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNl c0xhc3RTZWxlY3RlZEl0ZW0uc2V0KFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UuX2RvY3VtZW50 VVJMKTsKKyAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucmVzb3VyY2VzTGFzdFNlbGVjdGVkSXRl bS5zZXQoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwpOwogCiAgICAgV2ViSW5zcGVjdG9y LnNob3dQYW5lbCgibmV0d29yayIpOwogICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2Uo Im1ha2VYSFJSZXF1ZXN0cygyMDApIiwgcnVuVGVzdCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1oaXN0b3J5Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivc3R5bGVzL3N0eWxlcy1oaXN0b3J5Lmh0bWwKaW5kZXggNWNiMTFlZDU3YTJlMjNhYjA1 ZTJlYTU1OWVjNGEwYzMzZGJjZjYzNS4uMjIwZGU2YmYyZjQwZmNiZTYyY2ZlZTRjNzRlMzczYTY3 YmJlYTgyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMt aGlzdG9yeS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWhp c3RvcnkuaHRtbApAQCAtOSw3ICs5LDcgQEAKIAogZnVuY3Rpb24gdGVzdCgpCiB7Ci0gICAgaWYg KCFXZWJJbnNwZWN0b3IubWFpblJlc291cmNlKQorICAgIGlmICghV2ViSW5zcGVjdG9yLnJlc291 cmNlVHJlZU1vZGVsLl9jYWNoZWRSZXNvdXJjZXNQcm9jZXNzZWQpCiAgICAgICAgIFdlYkluc3Bl Y3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwgcnVuVGVzdFN1 aXRlKTsKICAgICBlbHNlCiAgICAgICAgIHJ1blRlc3RTdWl0ZSgpOwo=