212852 2020-06-05 15:35:36 -0700 Web Inspector: allow multiple resources for a given URL 2020-06-09 13:45:20 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1659827 0 hi 2020-06-05 15:35:36 -0700 Rather than use a `Map`, we should use a `Multimap`. 1659831 1 401209 hi 2020-06-05 15:47:44 -0700 Created attachment 401209 Patch 1659897 2 401226 hi 2020-06-05 19:54:58 -0700 Created attachment 401226 Patch fix mistake in `WI.Frame.prototype.resourcesForURL` where the `WI.Frame` was added to the returned `Set` instead of the `WI.Frame.prototype.get mainResource` 1660822 3 401226 bburg 2020-06-09 13:20:18 -0700 Comment on attachment 401226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401226&action=review r=me > Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js:472 > + resources.addAll(this._mainFrame.resourcesForURL(url, recursivelySearchChildFrames)); NIce. 1660828 4 ews-feeder 2020-06-09 13:44:18 -0700 Committed r262806: <https://trac.webkit.org/changeset/262806> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401226. 1660829 5 webkit-bug-importer 2020-06-09 13:45:20 -0700 <rdar://problem/64178078> 401209 2020-06-05 15:47:44 -0700 2020-06-05 19:54:55 -0700 Patch bug-212852-20200605164742.patch text/plain 28672 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ3ZWY1NjA0ZWQwNDU0YTFiODZkNTA2ZWM3ZWRm NTIyMDJkNDllNzIuLjRiNjkwYWQ3MTIyZDI5Mzg5MGQxOGQxYzI5OTVkNzY2OWQ4NjU4YWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDIwLTA2LTA1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh bGxvdyBtdWx0aXBsZSByZXNvdXJjZXMgZm9yIGEgZ2l2ZW4gVVJMCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4NTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5LCB3aGVuIGEgbmV3IHJl c291cmNlIGlzIGFkZGVkIHdpdGggYSBVUkwgdGhhdCBtYXRjaGVzIGFuIGV4aXN0aW5nIHJlc291 cmNlLCBhbnkKKyAgICAgICAgYHJlc291cmNlRm9yVVJMYCBjYWxsIHdpdGggdGhhdCBVUkwgd2ls bCByZXR1cm4gdGhlIG5ldyByZXNvdXJjZSBpbnN0ZWFkIG9mIHRoZSBvbGQgb25lLiBOb3cKKyAg ICAgICAgdGhhdCB0aGVyZSBpcyBhIGBNdWx0aW1hcGAgb2YgVVJMIHRvIHJlc291cmNlLCBpdCBp cyBwb3NzaWJsZSB0byBwaWNrIHdoaWNoIHJlc291cmNlIGlzIHVzZWQKKyAgICAgICAgaW5zdGVh ZCBvZiBhbHdheXMgdXNpbmcgdGhlIG5ld2VzdCBvbmUuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9SZXNvdXJjZUNvbGxlY3Rpb24uanM6CisgICAgICAgIChXSS5SZXNvdXJjZUNv bGxlY3Rpb24pOgorICAgICAgICAoV0kuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5yZXNv dXJjZXNGb3JVUkwpOiBBZGRlZC4KKyAgICAgICAgKFdJLlJlc291cmNlQ29sbGVjdGlvbi5wcm90 b3R5cGUuX2Fzc29jaWF0ZVdpdGhSZXNvdXJjZSk6CisgICAgICAgIChXSS5SZXNvdXJjZUNvbGxl Y3Rpb24ucHJvdG90eXBlLl9kaXNhc3NvY2lhdGVXaXRoUmVzb3VyY2UpOgorICAgICAgICAoV0ku UmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5fcmVzb3VyY2VVUkxEaWRDaGFuZ2UpOgorICAg ICAgICAoV0kuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5yZXNvdXJjZUZvclVSTCk6IERl bGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRnJhbWUuanM6CisgICAgICAg IChXSS5GcmFtZS5wcm90b3R5cGUucmVzb3VyY2VzRm9yVVJMKTogQWRkZWQuCisgICAgICAgIChX SS5GcmFtZS5wcm90b3R5cGUucmVzb3VyY2VGb3JVUkwpOiBEZWxldGVkLgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXSS5O ZXR3b3JrTWFuYWdlci5wcm90b3R5cGUucmVzb3VyY2VzRm9yVVJMKTogQWRkZWQuCisgICAgICAg IChXSS5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUucmVzb3VyY2VSZXF1ZXN0RGlkUmVjZWl2ZVJl c3BvbnNlKToKKyAgICAgICAgKFdJLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5faW5pdGlhdG9y U291cmNlQ29kZUxvY2F0aW9uRnJvbVBheWxvYWQpOgorICAgICAgICAoV0kuTmV0d29ya01hbmFn ZXIucHJvdG90eXBlLnJlc291cmNlRm9yVVJMKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL1NjcmlwdC5qczoKKyAgICAgICAgKFdJLlNjcmlwdC5wcm90b3R5cGUu X3Jlc29sdmVSZXNvdXJjZSk6CisgICAgICAgIChXSS5TY3JpcHQucHJvdG90eXBlLl9yZXNvbHZl UmVzb3VyY2UuaXNTY3JpcHRSZXNvdXJjZSk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ1NTTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkNTU01hbmFnZXIucHJv dG90eXBlLl91cGRhdGVSZXNvdXJjZUNvbnRlbnQuZmV0Y2hlZFN0eWxlU2hlZXRDb250ZW50KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzOgorICAgICAgICAoU2V0 LnByb3RvdHlwZS5maW5kKTogQWRkZWQuCisgICAgICAgIEFkZCB1dGlsaXR5IGZvciBmaW5kaW5n IGFuIGl0ZW0gaW4gYSBgU2V0YCB0byBhdm9pZCBoYXZpbmcgdG8gYEFycmF5LmZyb21gLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5vcGVuVVJM KToKKyAgICAgICAgKFdJLnNvdXJjZUNvZGVGb3JVUkwpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVN YW5hZ2VyLnByb3RvdHlwZS5fcHJvY2Vzc1JlY29yZCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Nb2RlbHMvQ2FsbEZyYW1lLmpzOgorICAgICAgICAoV0kuQ2FsbEZyYW1lLmZyb21QYXlsb2Fk KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Db25zb2xlTWVzc2FnZS5qczoKKyAg ICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5nZXQgc291cmNlQ29kZUxvY2F0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzOgorICAg ICAgICAoV0kuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJlY29yZC5q czoKKyAgICAgICAgKFdJLlNjcmlwdFRpbWVsaW5lUmVjb3JkLnByb3RvdHlwZS5faW5pdGlhbGl6 ZVByb2ZpbGVGcm9tUGF5bG9hZC5wcm9maWxlTm9kZUZyb21QYXlsb2FkKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzOgorICAgICAgICAoV0ku YXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclVSTCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuRE9NRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX21vdXNlV2FzQ2xpY2tlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5TZWFyY2hT aWRlYmFyUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICBVc2UgdGhlIGBm aXJzdFZhbHVlYCBpbnN0ZWFkIG9mIHRoZSBpbXBsaWNpdCBgbGFzdFZhbHVlYCB0byBtYXRjaCBl eGlzdGluZyBuZWFyYnkgdXNhZ2Ugb2YKKyAgICAgICAgYFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90 b3R5cGUuc2NyaXB0c0ZvclVSTGAsIHdoaWNoIGV4cGxpY2l0bHkgY2hvb3NlcyB0aGUgZmlyc3Qg c2NyaXB0LgorCiAyMDIwLTA2LTA0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFdvcmsgYXJvdW5kIGJyb2tlbiBzeXN0ZW0gdmVyc2lvbiBtYWNybwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmlu ZGV4IDZlNmEwM2Y1YWJmMTFmNmEyYzg1MTQwZGZhMWRkNjg0YmI4ZGI5OTguLjM0NGFmNTIzZTU5 MDRhOWU2Y2I4Mzk0M2EzNzc3YWE3OWJiMTUzYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTExMDYsOSArMTEwNiw5IEBAIFdJ Lm9wZW5VUkwgPSBmdW5jdGlvbih1cmwsIGZyYW1lLCBvcHRpb25zID0ge30pCiAgICAgbGV0IHNp bXBsaWZpZWRVUkwgPSByZW1vdmVVUkxGcmFnbWVudCh1cmwpOwogICAgIGlmIChmcmFtZSkgewog ICAgICAgICAvLyBXSS5GcmFtZS5yZXNvdXJjZUZvclVSTCBkb2VzIG5vdCBjaGVjayB0aGUgbWFp biByZXNvdXJjZSwgb25seSBzdWItcmVzb3VyY2VzLiBTbyBjaGVjayBib3RoLgotICAgICAgICBy ZXNvdXJjZSA9IGZyYW1lLnVybCA9PT0gc2ltcGxpZmllZFVSTCA/IGZyYW1lLm1haW5SZXNvdXJj ZSA6IGZyYW1lLnJlc291cmNlRm9yVVJMKHNpbXBsaWZpZWRVUkwsIHNlYXJjaENoaWxkRnJhbWVz KTsKKyAgICAgICAgcmVzb3VyY2UgPSBmcmFtZS51cmwgPT09IHNpbXBsaWZpZWRVUkwgPyBmcmFt ZS5tYWluUmVzb3VyY2UgOiBmcmFtZS5yZXNvdXJjZXNGb3JVUkwoc2ltcGxpZmllZFVSTCwgc2Vh cmNoQ2hpbGRGcmFtZXMpLmZpcnN0VmFsdWU7CiAgICAgfSBlbHNlIGlmIChXSS5zaGFyZWRBcHAu ZGVidWdnYWJsZVR5cGUgPT09IFdJLkRlYnVnZ2FibGVUeXBlLlNlcnZpY2VXb3JrZXIpCi0gICAg ICAgIHJlc291cmNlID0gV0kubWFpblRhcmdldC5yZXNvdXJjZUNvbGxlY3Rpb24ucmVzb3VyY2VG b3JVUkwocmVtb3ZlVVJMRnJhZ21lbnQodXJsKSk7CisgICAgICAgIHJlc291cmNlID0gV0kubWFp blRhcmdldC5yZXNvdXJjZUNvbGxlY3Rpb24ucmVzb3VyY2VzRm9yVVJMKHJlbW92ZVVSTEZyYWdt ZW50KHVybCkpLmZpcnN0VmFsdWU7CiAKICAgICBpZiAocmVzb3VyY2UpIHsKICAgICAgICAgLy8g Q29udGV4dCBtZW51IHNlbGVjdGlvbnMgbWF5IGdvIHRocm91Z2ggdGhpcyBjb2RlIHBhdGg7IGRv bid0IGNsb2JiZXIgdGhlIHByZXZpb3VzbHktc2V0IGhpbnQuCkBAIC0zMDYwLDcgKzMwNjAsNyBA QCBXSS5saW5raWZ5RWxlbWVudCA9IGZ1bmN0aW9uKGxpbmtFbGVtZW50LCBzb3VyY2VDb2RlTG9j YXRpb24sIG9wdGlvbnMgPSB7fSkgewogCiBXSS5zb3VyY2VDb2RlRm9yVVJMID0gZnVuY3Rpb24o dXJsKQogewotICAgIHZhciBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VG b3JVUkwodXJsKTsKKyAgICBsZXQgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291 cmNlc0ZvclVSTCh1cmwpLmZpcnN0VmFsdWU7CiAgICAgaWYgKCFzb3VyY2VDb2RlKSB7CiAgICAg ICAgIHNvdXJjZUNvZGUgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0c0ZvclVSTCh1cmwsIFdJ LmFzc3VtaW5nTWFpblRhcmdldCgpKVswXTsKICAgICAgICAgaWYgKHNvdXJjZUNvZGUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVz LmpzCmluZGV4IGY4MWFlZTZiZmQzNmM4YjU0MmQ0ZmM4MDY3YWY4OTllNGU5ZTk2ZWQuLjdlMmJi ZGQzNWU2MGIzYThiYWY3ZGI4NGVhODFlZmIxZDQ2YjQ2YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xNDYs NiArMTQ2LDE4IEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShNYXAucHJvdG90eXBlLCAiZ2V0T3JJ bml0aWFsaXplIiwKICAgICB9CiB9KTsKIAorT2JqZWN0LmRlZmluZVByb3BlcnR5KFNldC5wcm90 b3R5cGUsICJmaW5kIiwKK3sKKyAgICB2YWx1ZShwcmVkaWNhdGUpCisgICAgeworICAgICAgICBm b3IgKGxldCBpdGVtIG9mIHRoaXMpIHsKKyAgICAgICAgICAgIGlmIChwcmVkaWNhdGUoaXRlbSwg dGhpcykpCisgICAgICAgICAgICAgICAgcmV0dXJuIGl0ZW07CisgICAgICAgIH0KKyAgICAgICAg cmV0dXJuIHVuZGVmaW5lZDsKKyAgICB9LAorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShT ZXQucHJvdG90eXBlLCAiYWRkQWxsIiwKIHsKICAgICB2YWx1ZShpdGVyYWJsZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU01h bmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9DU1NNYW5hZ2VyLmpzCmluZGV4IDkxMzg5YzQwMzliMGI4ZGM4NWUzODAxMGFkYzEwOTBlNzJk Mjc3NTAuLjY4YWVhYTk3ODcwMjhlZThkMTg1OGExZDI3MDc1MDMzNjBiZDRlOTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU01h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ1NTTWFuYWdlci5qcwpAQCAtNjE1LDEzICs2MTUsMTAgQEAgV0kuQ1NTTWFuYWdlciA9 IGNsYXNzIENTU01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgICAgIGlmICghc3R5bGVTaGVldC5pc0luc3BlY3RvclN0eWxlU2hlZXQo KSkgewotICAgICAgICAgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0ID0gcmVwcmVzZW50ZWRPYmpl Y3QucGFyZW50RnJhbWUucmVzb3VyY2VGb3JVUkwocmVwcmVzZW50ZWRPYmplY3QudXJsKTsKLSAg ICAgICAgICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQotICAgICAgICAgICAgICAgICAg ICByZXR1cm47Ci0KICAgICAgICAgICAgICAgICAvLyBPbmx5IHRyeSB0byB1cGRhdGUgc3R5bGVz aGVldCByZXNvdXJjZXMuIE90aGVyIHJlc291cmNlcywgbGlrZSBkb2N1bWVudHMsIGNhbiBjb250 YWluCiAgICAgICAgICAgICAgICAgLy8gbXVsdGlwbGUgc3R5bGVzaGVldHMgYW5kIHdlIGRvbid0 IGhhdmUgdGhlIHNvdXJjZSByYW5nZXMgdG8gdXBkYXRlIHRob3NlLgotICAgICAgICAgICAgICAg IGlmIChyZXByZXNlbnRlZE9iamVjdC50eXBlICE9PSBXSS5SZXNvdXJjZS5UeXBlLlN0eWxlU2hl ZXQpCisgICAgICAgICAgICAgICAgcmVwcmVzZW50ZWRPYmplY3QgPSByZXByZXNlbnRlZE9iamVj dC5wYXJlbnRGcmFtZS5yZXNvdXJjZXNGb3JVUkwocmVwcmVzZW50ZWRPYmplY3QudXJsKS5maW5k KChyZXNvdXJjZSkgPT4gcmVzb3VyY2UudHlwZSA9PT0gV0kuUmVzb3VyY2UuVHlwZS5TdHlsZVNo ZWV0KTsKKyAgICAgICAgICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQogICAgICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL05ldHdvcmtNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29y a01hbmFnZXIuanMKaW5kZXggOTM3NjM0OWI5ZGFiYTEwMjMzYmEwMWJkNzY0OGFmMDc5YWEyYTBm NS4uMTE2OTE0ZmE4ODc0M2E0YTNlN2NhZTY4MmE4YTE4YzRiNWZlNWU4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29ya01h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvTmV0d29ya01hbmFnZXIuanMKQEAgLTQ2MSwxNSArNDYxLDE2IEBAIFdJLk5ldHdvcmtN YW5hZ2VyID0gY2xhc3MgTmV0d29ya01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgcmVzb3VyY2VGb3JVUkwodXJsKQorICAgIHJlc291 cmNlc0ZvclVSTCh1cmwpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX21haW5GcmFtZSkKLSAg ICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICAgICAgcmV0dXJuIG5ldyBTZXQ7CiAKICAg ICAgICAgaWYgKHRoaXMuX21haW5GcmFtZS5tYWluUmVzb3VyY2UudXJsID09PSB1cmwpCi0gICAg ICAgICAgICByZXR1cm4gdGhpcy5fbWFpbkZyYW1lLm1haW5SZXNvdXJjZTsKKyAgICAgICAgICAg IHJldHVybiBuZXcgU2V0KFt0aGlzLl9tYWluRnJhbWUubWFpblJlc291cmNlXSk7CiAKLSAgICAg ICAgcmV0dXJuIHRoaXMuX21haW5GcmFtZS5yZXNvdXJjZUZvclVSTCh1cmwsIHRydWUpOworICAg ICAgICBjb25zdCByZWN1cnNpdmVseVNlYXJjaENoaWxkRnJhbWVzID0gdHJ1ZTsKKyAgICAgICAg cmV0dXJuIHRoaXMuX21haW5GcmFtZS5yZXNvdXJjZXNGb3JVUkwodXJsLCByZWN1cnNpdmVseVNl YXJjaENoaWxkRnJhbWVzKTsKICAgICB9CiAKICAgICBhZG9wdE9ycGhhbmVkUmVzb3VyY2VzRm9y VGFyZ2V0KHRhcmdldCkKQEAgLTgwOSw3ICs4MTAsNyBAQCBXSS5OZXR3b3JrTWFuYWdlciA9IGNs YXNzIE5ldHdvcmtNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmICghcmVzb3Vy Y2UpIHsKICAgICAgICAgICAgIHZhciBmcmFtZSA9IHRoaXMuZnJhbWVGb3JJZGVudGlmaWVyKGZy YW1lSWRlbnRpZmllcik7CiAgICAgICAgICAgICBpZiAoZnJhbWUpCi0gICAgICAgICAgICAgICAg cmVzb3VyY2UgPSBmcmFtZS5yZXNvdXJjZUZvclVSTChyZXNwb25zZS51cmwpOworICAgICAgICAg ICAgICAgIHJlc291cmNlID0gZnJhbWUucmVzb3VyY2VzRm9yVVJMKHJlc3BvbnNlLnVybCkuZmly c3RWYWx1ZTsKIAogICAgICAgICAgICAgLy8gSWYgd2UgZmluZCB0aGUgcmVzb3VyY2UgdGhpcyB3 YXkgd2UgaGFkIG1hcmtlZCBpdCBlYXJsaWVyIGFzIGZpbmlzaGVkIHZpYSBQYWdlLmdldFJlc291 cmNlVHJlZS4KICAgICAgICAgICAgIC8vIEFzc29jaWF0ZSB0aGUgcmVzb3VyY2Ugd2l0aCB0aGUg cmVxdWVzdElkZW50aWZpZXIgc28gaXQgY2FuIGJlIGZvdW5kIGluIGZ1dHVyZSBsb2FkaW5nIGV2 ZW50cy4KQEAgLTEwODMsNyArMTA4NCw3IEBAIFdJLk5ldHdvcmtNYW5hZ2VyID0gY2xhc3MgTmV0 d29ya01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKCF1cmwgfHwgaXNOYU4o bGluZU51bWJlcikgfHwgbGluZU51bWJlciA8IDApCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsK IAotICAgICAgICB2YXIgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlRm9y VVJMKHVybCk7CisgICAgICAgIGxldCBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVz b3VyY2VzRm9yVVJMKHVybCkuZmlyc3RWYWx1ZTsKICAgICAgICAgaWYgKCFzb3VyY2VDb2RlKQog ICAgICAgICAgICAgc291cmNlQ29kZSA9IFdJLmRlYnVnZ2VyTWFuYWdlci5zY3JpcHRzRm9yVVJM KHVybCwgV0kubWFpblRhcmdldClbMF07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdl ci5qcwppbmRleCBmMzI1ZjU5NWViODBhMzU1YmU4NWY0ZWU4ZTZhYmRmYTMyZmE5MTQ0Li41ZjVj MTg0OTE2ZGNlNWY1MmZmNWIxNTliMWQ2ZWZhZjBjYTFiNzdmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv VGltZWxpbmVNYW5hZ2VyLmpzCkBAIC04NTcsNyArODU3LDggQEAgV0kuVGltZWxpbmVNYW5hZ2Vy ID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGNhc2Ug SW5zcGVjdG9yQmFja2VuZC5FbnVtLlRpbWVsaW5lLkV2ZW50VHlwZS5FdmFsdWF0ZVNjcmlwdDoK ICAgICAgICAgICAgIGlmICghc291cmNlQ29kZUxvY2F0aW9uKSB7CiAgICAgICAgICAgICAgICAg dmFyIG1haW5GcmFtZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLm1haW5GcmFtZTsKLSAgICAgICAgICAg ICAgICB2YXIgc2NyaXB0UmVzb3VyY2UgPSBtYWluRnJhbWUudXJsID09PSByZWNvcmRQYXlsb2Fk LmRhdGEudXJsID8gbWFpbkZyYW1lLm1haW5SZXNvdXJjZSA6IG1haW5GcmFtZS5yZXNvdXJjZUZv clVSTChyZWNvcmRQYXlsb2FkLmRhdGEudXJsLCB0cnVlKTsKKyAgICAgICAgICAgICAgICBjb25z dCByZWN1cnNpdmVseVNlYXJjaENoaWxkRnJhbWVzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBs ZXQgc2NyaXB0UmVzb3VyY2UgPSBtYWluRnJhbWUudXJsID09PSByZWNvcmRQYXlsb2FkLmRhdGEu dXJsID8gbWFpbkZyYW1lLm1haW5SZXNvdXJjZSA6IG1haW5GcmFtZS5yZXNvdXJjZXNGb3JVUkwo cmVjb3JkUGF5bG9hZC5kYXRhLnVybCwgcmVjdXJzaXZlbHlTZWFyY2hDaGlsZEZyYW1lcykubGFz dFZhbHVlOwogICAgICAgICAgICAgICAgIGlmIChzY3JpcHRSZXNvdXJjZSkgewogICAgICAgICAg ICAgICAgICAgICAvLyBUaGUgbGluZU51bWJlciBpcyAxLWJhc2VkLCBidXQgd2UgZXhwZWN0IDAt YmFzZWQuCiAgICAgICAgICAgICAgICAgICAgIGxldCBsaW5lTnVtYmVyID0gcmVjb3JkUGF5bG9h ZC5kYXRhLmxpbmVOdW1iZXIgLSAxOwpAQCAtOTA3LDcgKzkwOCw4IEBAIFdJLlRpbWVsaW5lTWFu YWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAg ICAgICBpZiAoIXNvdXJjZUNvZGVMb2NhdGlvbikgewogICAgICAgICAgICAgICAgIHZhciBtYWlu RnJhbWUgPSBXSS5uZXR3b3JrTWFuYWdlci5tYWluRnJhbWU7Ci0gICAgICAgICAgICAgICAgdmFy IHNjcmlwdFJlc291cmNlID0gbWFpbkZyYW1lLnVybCA9PT0gcmVjb3JkUGF5bG9hZC5kYXRhLnNj cmlwdE5hbWUgPyBtYWluRnJhbWUubWFpblJlc291cmNlIDogbWFpbkZyYW1lLnJlc291cmNlRm9y VVJMKHJlY29yZFBheWxvYWQuZGF0YS5zY3JpcHROYW1lLCB0cnVlKTsKKyAgICAgICAgICAgICAg ICBjb25zdCByZWN1cnNpdmVseVNlYXJjaENoaWxkRnJhbWVzID0gdHJ1ZTsKKyAgICAgICAgICAg ICAgICBsZXQgc2NyaXB0UmVzb3VyY2UgPSBtYWluRnJhbWUudXJsID09PSByZWNvcmRQYXlsb2Fk LmRhdGEuc2NyaXB0TmFtZSA/IG1haW5GcmFtZS5tYWluUmVzb3VyY2UgOiBtYWluRnJhbWUucmVz b3VyY2VzRm9yVVJMKHJlY29yZFBheWxvYWQuZGF0YS5zY3JpcHROYW1lLCByZWN1cnNpdmVseVNl YXJjaENoaWxkRnJhbWVzKS5sYXN0VmFsdWU7CiAgICAgICAgICAgICAgICAgaWYgKHNjcmlwdFJl c291cmNlKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFRoZSBsaW5lTnVtYmVyIGlzIDEtYmFz ZWQsIGJ1dCB3ZSBleHBlY3QgMC1iYXNlZC4KICAgICAgICAgICAgICAgICAgICAgbGV0IGxpbmVO dW1iZXIgPSByZWNvcmRQYXlsb2FkLmRhdGEuc2NyaXB0TGluZSAtIDE7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FsbEZyYW1lLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbGxGcmFtZS5qcwpp bmRleCAxN2M2ZDg5MmIyYzM4NWZhNzU1MjFjNDcyZjNjOWFkZDIwOTkyZWQzLi5kNDUzYzU2YWU5 YTQ0MjJjNDg1MDhmMmEyNTcxODRiODExMDBlOGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FsbEZyYW1lLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DYWxsRnJhbWUuanMKQEAgLTIzMyw3 ICsyMzMsNyBAQCBXSS5DYWxsRnJhbWUgPSBjbGFzcyBDYWxsRnJhbWUKICAgICAgICAgICAgICAg ICAgICAgc291cmNlQ29kZSA9IHNvdXJjZUNvZGUucmVzb3VyY2U7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBpZiAoIXNvdXJjZUNvZGUpCi0gICAgICAgICAgICAgICAgc291cmNlQ29kZSA9 IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlRm9yVVJMKHVybCk7CisgICAgICAgICAgICAgICAg c291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlc0ZvclVSTCh1cmwpLmZpcnN0 VmFsdWU7CiAgICAgICAgICAgICBpZiAoIXNvdXJjZUNvZGUpCiAgICAgICAgICAgICAgICAgc291 cmNlQ29kZSA9IFdJLmRlYnVnZ2VyTWFuYWdlci5zY3JpcHRzRm9yVVJMKHVybCwgdGFyZ2V0KVsw XTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0NvbnNvbGVNZXNzYWdlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IGY1NDc2YjkyNDliNDcyNzJkNDc2NTNj NzIzOWQ5YjE5MDNjNDAyZTcuLmJlNzg3OGUwYjc1MzBlZjc0YmUyOTRhYmZkZjljNTA0YzE0YzE4 MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9Db25zb2xlTWVzc2FnZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvQ29uc29sZU1lc3NhZ2UuanMKQEAgLTg0LDcgKzg0LDcgQEAgV0kuQ29uc29s ZU1lc3NhZ2UgPSBjbGFzcyBDb25zb2xlTWVzc2FnZQogICAgICAgICAvLyBJZiB0aGF0IGRvZXNu J3QgZXhpc3QgdHJ5IHRvIGdldCBhIGxvY2F0aW9uIGZyb20gdGhlIHVybC9saW5lL2NvbHVtbiBp biB0aGUgQ29uc29sZU1lc3NhZ2UuCiAgICAgICAgIC8vIEZJWE1FIDxodHRwOi8vd2Via2l0Lm9y Zy9iLzc2NDA0PjogUmVtb3ZlIHRoZSBzdHJpbmcgZXF1YWxpdHkgY2hlY2tzIGZvciB1bmRlZmlu ZWQgb25jZSB3ZSBkb24ndCBnZXQgdGhhdCB2YWx1ZSBhbnltb3JlLgogICAgICAgICBpZiAodGhp cy5fdXJsICYmIHRoaXMuX3VybCAhPT0gInVuZGVmaW5lZCIpIHsKLSAgICAgICAgICAgIGxldCBz b3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VGb3JVUkwodGhpcy5fdXJsKTsK KyAgICAgICAgICAgIGxldCBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2Vz Rm9yVVJMKHRoaXMuX3VybCkuZmlyc3RWYWx1ZTsKICAgICAgICAgICAgIGlmIChzb3VyY2VDb2Rl KSB7CiAgICAgICAgICAgICAgICAgbGV0IGxpbmVOdW1iZXIgPSB0aGlzLl9saW5lID4gMCA/IHRo aXMuX2xpbmUgLSAxIDogMDsKICAgICAgICAgICAgICAgICBsZXQgY29sdW1uTnVtYmVyID0gdGhp cy5fY29sdW1uID4gMCA/IHRoaXMuX2NvbHVtbiAtIDEgOiAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5q cwppbmRleCAwYTI5MjZjMzMzNmI3Y2FhNTFiNzVhOGI3NzA0OTVkYjYwNWM4MDQxLi5iZmZiNDEz MDY1MjRiY2E3NzI4ODU2NGRkZTk3NTkyNTcwY2Q1NWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5q cwpAQCAtNzEsMTYgKzcxLDE2IEBAIFdJLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5 bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgLy8gVHJ5IHRvIHVzZSB0aGUgbm9kZSB0 byBmaW5kIHRoZSBmcmFtZSB3aGljaCBoYXMgdGhlIGNvcnJlY3QgcmVzb3VyY2UgZmlyc3QuCiAg ICAgICAgIGlmIChkb2N1bWVudE5vZGUpIHsKLSAgICAgICAgICAgIGxldCBtYWluUmVzb3VyY2Ug PSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZUZvclVSTChkb2N1bWVudE5vZGUuZG9jdW1lbnRV UkwpOworICAgICAgICAgICAgbGV0IG1haW5SZXNvdXJjZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJl c291cmNlc0ZvclVSTChkb2N1bWVudE5vZGUuZG9jdW1lbnRVUkwpLmZpcnN0VmFsdWU7CiAgICAg ICAgICAgICBpZiAobWFpblJlc291cmNlKSB7CiAgICAgICAgICAgICAgICAgbGV0IHBhcmVudEZy YW1lID0gbWFpblJlc291cmNlLnBhcmVudEZyYW1lOwotICAgICAgICAgICAgICAgIHNvdXJjZUNv ZGUgPSBwYXJlbnRGcmFtZS5yZXNvdXJjZUZvclVSTChzb3VyY2VVUkwpOworICAgICAgICAgICAg ICAgIHNvdXJjZUNvZGUgPSBwYXJlbnRGcmFtZS5yZXNvdXJjZXNGb3JVUkwoc291cmNlVVJMKS5m aXJzdFZhbHVlOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgLy8gSWYgdGhh dCBkaWRuJ3QgZmluZCB0aGUgcmVzb3VyY2UsIHRoZW4gc2VhcmNoIGFsbCBmcmFtZXMuCiAgICAg ICAgIGlmICghc291cmNlQ29kZSkKLSAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBXSS5uZXR3b3Jr TWFuYWdlci5yZXNvdXJjZUZvclVSTChzb3VyY2VVUkwpOworICAgICAgICAgICAgc291cmNlQ29k ZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlc0ZvclVSTChzb3VyY2VVUkwpLmZpcnN0VmFs dWU7CiAKICAgICAgICAgaWYgKCFzb3VyY2VDb2RlKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv RnJhbWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRnJh bWUuanMKaW5kZXggZGIxZDcyMzk4OTA4NzllOTRiMDMzZTVmOTE3ODAyMjQ4ZGE4ZDA2Zi4uZTlj YTU0ZDg2MmRiNmZhMDVmMGMwNjExYmY0MjBmYjAzZjZhZDdjMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9GcmFtZS5qcwpAQCAtMzYxLDMw ICszNjEsMjIgQEAgV0kuRnJhbWUgPSBjbGFzcyBGcmFtZSBleHRlbmRzIFdJLk9iamVjdAogICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5GcmFtZS5FdmVudC5BbGxDaGls ZEZyYW1lc1JlbW92ZWQpOwogICAgIH0KIAotICAgIHJlc291cmNlRm9yVVJMKHVybCwgcmVjdXJz aXZlbHlTZWFyY2hDaGlsZEZyYW1lcykKKyAgICByZXNvdXJjZXNGb3JVUkwodXJsLCByZWN1cnNp dmVseVNlYXJjaENoaWxkRnJhbWVzKQogICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gdGhp cy5fcmVzb3VyY2VDb2xsZWN0aW9uLnJlc291cmNlRm9yVVJMKHVybCk7Ci0gICAgICAgIGlmIChy ZXNvdXJjZSkKLSAgICAgICAgICAgIHJldHVybiByZXNvdXJjZTsKKyAgICAgICAgbGV0IHJlc291 cmNlcyA9IHRoaXMuX3Jlc291cmNlQ29sbGVjdGlvbi5yZXNvdXJjZXNGb3JVUkwodXJsKTsKIAog ICAgICAgICAvLyBDaGVjayB0aGUgbWFpbiByZXNvdXJjZXMgb2YgdGhlIGNoaWxkIGZyYW1lcyBm b3IgdGhlIHJlcXVlc3RlZCBVUkwuCiAgICAgICAgIGZvciAobGV0IGNoaWxkRnJhbWUgb2YgdGhp cy5fY2hpbGRGcmFtZUNvbGxlY3Rpb24pIHsKLSAgICAgICAgICAgIHJlc291cmNlID0gY2hpbGRG cmFtZS5tYWluUmVzb3VyY2U7Ci0gICAgICAgICAgICBpZiAocmVzb3VyY2UudXJsID09PSB1cmwp Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHJlc291cmNlOworICAgICAgICAgICAgaWYgKGNoaWxk RnJhbWUubWFpblJlc291cmNlLnVybCA9PT0gdXJsKQorICAgICAgICAgICAgICAgIHJlc291cmNl cy5hZGQoY2hpbGRGcmFtZSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXJlY3Vyc2l2ZWx5 U2VhcmNoQ2hpbGRGcmFtZXMpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLQotICAgICAgICAv LyBSZWN1cnNpdmVseSBzZWFyY2ggcmVzb3VyY2VzIG9mIGNoaWxkIGZyYW1lcy4KLSAgICAgICAg Zm9yIChsZXQgY2hpbGRGcmFtZSBvZiB0aGlzLl9jaGlsZEZyYW1lQ29sbGVjdGlvbikgewotICAg ICAgICAgICAgcmVzb3VyY2UgPSBjaGlsZEZyYW1lLnJlc291cmNlRm9yVVJMKHVybCwgdHJ1ZSk7 Ci0gICAgICAgICAgICBpZiAocmVzb3VyY2UpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHJlc291 cmNlOworICAgICAgICBpZiAocmVjdXJzaXZlbHlTZWFyY2hDaGlsZEZyYW1lcykgeworICAgICAg ICAgICAgZm9yIChsZXQgY2hpbGRGcmFtZSBvZiB0aGlzLl9jaGlsZEZyYW1lQ29sbGVjdGlvbikK KyAgICAgICAgICAgICAgICByZXNvdXJjZXMuYWRkQWxsKGNoaWxkRnJhbWUucmVzb3VyY2VzRm9y VVJMKHVybCwgcmVjdXJzaXZlbHlTZWFyY2hDaGlsZEZyYW1lcykpOwogICAgICAgICB9CiAKLSAg ICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIHJldHVybiByZXNvdXJjZXM7CiAgICAgfQogCiAg ICAgcmVzb3VyY2VDb2xsZWN0aW9uRm9yVHlwZSh0eXBlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlQ29sbGVjdGlvbi5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZUNvbGxl Y3Rpb24uanMKaW5kZXggOTZiMTU0Mzg2MTFmNjNjY2IxZmRjNmQ5NGE1NjZkYTRiYTU1ZTEzOS4u YjJlOTFiZWRmZDI5YzRkOGM2ZTUyZTQ1MjhkZGFmYjc0MDNlYjRjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlQ29sbGVjdGlv bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVz b3VyY2VDb2xsZWN0aW9uLmpzCkBAIC0zMSw3ICszMSw3IEBAIFdJLlJlc291cmNlQ29sbGVjdGlv biA9IGNsYXNzIFJlc291cmNlQ29sbGVjdGlvbiBleHRlbmRzIFdJLkNvbGxlY3Rpb24KICAgICAg ICAgc3VwZXIoKTsKIAogICAgICAgICB0aGlzLl9yZXNvdXJjZVR5cGUgPSByZXNvdXJjZVR5cGUg fHwgbnVsbDsKLSAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAgPSBuZXcgTWFwOworICAgICAg ICB0aGlzLl9yZXNvdXJjZVVSTE1hcCA9IG5ldyBNdWx0aW1hcDsKICAgICAgICAgdGhpcy5fcmVz b3VyY2VzVHlwZU1hcCA9IG5ldyBNYXA7CiAgICAgfQogCkBAIC01OSw5ICs1OSw5IEBAIFdJLlJl c291cmNlQ29sbGVjdGlvbiA9IGNsYXNzIFJlc291cmNlQ29sbGVjdGlvbiBleHRlbmRzIFdJLkNv bGxlY3Rpb24KICAgICAgICAgcmV0dXJuIG9iamVjdC50eXBlID09PSB0aGlzLl9yZXNvdXJjZVR5 cGU7CiAgICAgfQogCi0gICAgcmVzb3VyY2VGb3JVUkwodXJsKQorICAgIHJlc291cmNlc0ZvclVS TCh1cmwpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VVUkxNYXAuZ2V0KHVy bCkgfHwgbnVsbDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlVVJMTWFwLmdldCh1cmwp IHx8IG5ldyBTZXQ7CiAgICAgfQogCiAgICAgcmVzb3VyY2VDb2xsZWN0aW9uRm9yVHlwZSh0eXBl KQpAQCAtMTE0LDcgKzExNCw3IEBAIFdJLlJlc291cmNlQ29sbGVjdGlvbiA9IGNsYXNzIFJlc291 cmNlQ29sbGVjdGlvbiBleHRlbmRzIFdJLkNvbGxlY3Rpb24KIAogICAgIF9hc3NvY2lhdGVXaXRo UmVzb3VyY2UocmVzb3VyY2UpCiAgICAgewotICAgICAgICB0aGlzLl9yZXNvdXJjZVVSTE1hcC5z ZXQocmVzb3VyY2UudXJsLCByZXNvdXJjZSk7CisgICAgICAgIHRoaXMuX3Jlc291cmNlVVJMTWFw LmFkZChyZXNvdXJjZS51cmwsIHJlc291cmNlKTsKIAogICAgICAgICBpZiAoIXRoaXMuX3Jlc291 cmNlVHlwZSkgewogICAgICAgICAgICAgbGV0IHJlc291cmNlc0NvbGxlY3Rpb25Gb3JUeXBlID0g dGhpcy5yZXNvdXJjZUNvbGxlY3Rpb25Gb3JUeXBlKHJlc291cmNlLnR5cGUpOwpAQCAtMTM4LDcg KzEzOCw3IEBAIFdJLlJlc291cmNlQ29sbGVjdGlvbiA9IGNsYXNzIFJlc291cmNlQ29sbGVjdGlv biBleHRlbmRzIFdJLkNvbGxlY3Rpb24KICAgICAgICAgICAgIHJlc291cmNlc0NvbGxlY3Rpb25G b3JUeXBlLnJlbW92ZShyZXNvdXJjZSk7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl9yZXNv dXJjZVVSTE1hcC5kZWxldGUocmVzb3VyY2UudXJsKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VV UkxNYXAuZGVsZXRlKHJlc291cmNlLnVybCwgcmVzb3VyY2UpOwogICAgIH0KIAogICAgIF9yZXNv dXJjZVVSTERpZENoYW5nZShldmVudCkKQEAgLTE1Myw4ICsxNTMsOCBAQCBXSS5SZXNvdXJjZUNv bGxlY3Rpb24gPSBjbGFzcyBSZXNvdXJjZUNvbGxlY3Rpb24gZXh0ZW5kcyBXSS5Db2xsZWN0aW9u CiAgICAgICAgIGlmICghb2xkVVJMKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRo aXMuX3Jlc291cmNlVVJMTWFwLnNldChyZXNvdXJjZS51cmwsIHJlc291cmNlKTsKLSAgICAgICAg dGhpcy5fcmVzb3VyY2VVUkxNYXAuZGVsZXRlKG9sZFVSTCk7CisgICAgICAgIHRoaXMuX3Jlc291 cmNlVVJMTWFwLmFkZChyZXNvdXJjZS51cmwsIHJlc291cmNlKTsKKyAgICAgICAgdGhpcy5fcmVz b3VyY2VVUkxNYXAuZGVsZXRlKG9sZFVSTCwgcmVzb3VyY2UpOwogICAgIH0KIAogICAgIF9yZXNv dXJjZVR5cGVEaWRDaGFuZ2UoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdC5qcwppbmRleCA2NTdjNTQxYWZiMzc4YmZmYmY3 OWI0Yzg0NzIwOTMwYmIyYTFhNTkxLi44NTExMTUyMGEwOWVlMmRhMjBlNzUwZDJhYjQ0YTUzYzU0 NWRiZjNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvU2NyaXB0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9TY3JpcHQuanMKQEAgLTI4MywxNiArMjgzLDIwIEBAIFdJLlNjcmlwdCA9IGNsYXNz IFNjcmlwdCBleHRlbmRzIFdJLlNvdXJjZUNvZGUKICAgICAgICAgaWYgKHRoaXMuX3RhcmdldCAm JiB0aGlzLl90YXJnZXQgIT09IFdJLm1haW5UYXJnZXQpCiAgICAgICAgICAgICByZXNvbHZlciA9 IHRoaXMuX3RhcmdldC5yZXNvdXJjZUNvbGxlY3Rpb247CiAKKyAgICAgICAgZnVuY3Rpb24gaXNT Y3JpcHRSZXNvdXJjZShpdGVtKSB7CisgICAgICAgICAgICByZXR1cm4gaXRlbS50eXBlID09PSBX SS5SZXNvdXJjZS5UeXBlLkRvY3VtZW50IHx8IGl0ZW0udHlwZSA9PT0gV0kuUmVzb3VyY2UuVHlw ZS5TY3JpcHQ7CisgICAgICAgIH0KKwogICAgICAgICB0cnkgewogICAgICAgICAgICAgLy8gVHJ5 IHdpdGggdGhlIFNjcmlwdCdzIGZ1bGwgVVJMLgotICAgICAgICAgICAgbGV0IHJlc291cmNlID0g cmVzb2x2ZXIucmVzb3VyY2VGb3JVUkwodGhpcy5fdXJsKTsKKyAgICAgICAgICAgIGxldCByZXNv dXJjZSA9IHJlc29sdmVyLnJlc291cmNlc0ZvclVSTCh0aGlzLl91cmwpLmZpbmQoaXNTY3JpcHRS ZXNvdXJjZSk7CiAgICAgICAgICAgICBpZiAocmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIHJlc291cmNlOwogCiAgICAgICAgICAgICAvLyBUcnkgd2l0aCB0aGUgU2NyaXB0J3MgZnVs bCBkZWNvZGVkIFVSTC4KICAgICAgICAgICAgIGxldCBkZWNvZGVkVVJMID0gZGVjb2RlVVJJKHRo aXMuX3VybCk7CiAgICAgICAgICAgICBpZiAoZGVjb2RlZFVSTCAhPT0gdGhpcy5fdXJsKSB7Ci0g ICAgICAgICAgICAgICAgcmVzb3VyY2UgPSByZXNvbHZlci5yZXNvdXJjZUZvclVSTChkZWNvZGVk VVJMKTsKKyAgICAgICAgICAgICAgICByZXNvdXJjZSA9IHJlc29sdmVyLnJlc291cmNlc0ZvclVS TChkZWNvZGVkVVJMKS5maW5kKGlzU2NyaXB0UmVzb3VyY2UpOwogICAgICAgICAgICAgICAgIGlm IChyZXNvdXJjZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc291cmNlOwogICAgICAg ICAgICAgfQpAQCAtMzAwLDcgKzMwNCw3IEBAIFdJLlNjcmlwdCA9IGNsYXNzIFNjcmlwdCBleHRl bmRzIFdJLlNvdXJjZUNvZGUKICAgICAgICAgICAgIC8vIE5leHQgdHJ5IHJlbW92aW5nIGFueSBm cmFnbWVudCBpbiB0aGUgb3JpZ2luYWwgVVJMLgogICAgICAgICAgICAgbGV0IHVybFdpdGhvdXRG cmFnbWVudCA9IHJlbW92ZVVSTEZyYWdtZW50KHRoaXMuX3VybCk7CiAgICAgICAgICAgICBpZiAo dXJsV2l0aG91dEZyYWdtZW50ICE9PSB0aGlzLl91cmwpIHsKLSAgICAgICAgICAgICAgICByZXNv dXJjZSA9IHJlc29sdmVyLnJlc291cmNlRm9yVVJMKHVybFdpdGhvdXRGcmFnbWVudCk7CisgICAg ICAgICAgICAgICAgcmVzb3VyY2UgPSByZXNvbHZlci5yZXNvdXJjZXNGb3JVUkwodXJsV2l0aG91 dEZyYWdtZW50KS5maW5kKGlzU2NyaXB0UmVzb3VyY2UpOwogICAgICAgICAgICAgICAgIGlmIChy ZXNvdXJjZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc291cmNlOwogICAgICAgICAg ICAgfQpAQCAtMzA4LDcgKzMxMiw3IEBAIFdJLlNjcmlwdCA9IGNsYXNzIFNjcmlwdCBleHRlbmRz IFdJLlNvdXJjZUNvZGUKICAgICAgICAgICAgIC8vIEZpbmFsbHkgdHJ5IHJlbW92aW5nIGFueSBm cmFnbWVudCBpbiB0aGUgZGVjb2RlZCBVUkwuCiAgICAgICAgICAgICBsZXQgZGVjb2RlZFVSTFdp dGhvdXRGcmFnbWVudCA9IHJlbW92ZVVSTEZyYWdtZW50KGRlY29kZWRVUkwpOwogICAgICAgICAg ICAgaWYgKGRlY29kZWRVUkxXaXRob3V0RnJhZ21lbnQgIT09IGRlY29kZWRVUkwpIHsKLSAgICAg ICAgICAgICAgICByZXNvdXJjZSA9IHJlc29sdmVyLnJlc291cmNlRm9yVVJMKGRlY29kZWRVUkxX aXRob3V0RnJhZ21lbnQpOworICAgICAgICAgICAgICAgIHJlc291cmNlID0gcmVzb2x2ZXIucmVz b3VyY2VzRm9yVVJMKGRlY29kZWRVUkxXaXRob3V0RnJhZ21lbnQpLmZpbmQoaXNTY3JpcHRSZXNv dXJjZSk7CiAgICAgICAgICAgICAgICAgaWYgKHJlc291cmNlKQogICAgICAgICAgICAgICAgICAg ICByZXR1cm4gcmVzb3VyY2U7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxpbmVSZWNvcmQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxp bmVSZWNvcmQuanMKaW5kZXggZjM5NDRhOTM3ZmEwOTEzY2IzZjMzMmQ2MmQ4MWI3NWI2NWRiOTM1 Yi4uZDM0ODZjMzM1YzgyODdkYWRmZTA2OGQ1MzliMjNjMjNkNDFkMTljZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFRpbWVsaW5l UmVjb3JkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9TY3JpcHRUaW1lbGluZVJlY29yZC5qcwpAQCAtMTI1LDcgKzEyNSw3IEBAIFdJLlNjcmlwdFRp bWVsaW5lUmVjb3JkID0gY2xhc3MgU2NyaXB0VGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1l bGluZVJlY29yZAogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoImlkIiBpbiBub2RlUGF5bG9h ZCk7CiAKICAgICAgICAgICAgIGlmIChub2RlUGF5bG9hZC51cmwpIHsKLSAgICAgICAgICAgICAg ICB2YXIgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlRm9yVVJMKG5vZGVQ YXlsb2FkLnVybCk7CisgICAgICAgICAgICAgICAgbGV0IHNvdXJjZUNvZGUgPSBXSS5uZXR3b3Jr TWFuYWdlci5yZXNvdXJjZXNGb3JVUkwobm9kZVBheWxvYWQudXJsKS5maXJzdFZhbHVlOwogICAg ICAgICAgICAgICAgIGlmICghc291cmNlQ29kZSkKICAgICAgICAgICAgICAgICAgICAgc291cmNl Q29kZSA9IFdJLmRlYnVnZ2VyTWFuYWdlci5zY3JpcHRzRm9yVVJMKG5vZGVQYXlsb2FkLnVybCwg V0kuYXNzdW1pbmdNYWluVGFyZ2V0KCkpWzBdOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0 aWVzLmpzCmluZGV4IDBhMzVkMDU0Y2FjNDRkNGQ1ZDNlNmVmZDg3ZjVlMzk2MTAyNTU5NzcuLmYz NDRkNDVlZGM1MTJjM2UxZTU0NzQyNTM5MzcxMGI1NGI3MmFjMzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVz LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRl eHRNZW51VXRpbGl0aWVzLmpzCkBAIC0yMDgsNyArMjA4LDcgQEAgV0kuYXBwZW5kQ29udGV4dE1l bnVJdGVtc0ZvclVSTCA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCB1cmwsIG9wdGlvbnMgPSB7fSkK ICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgaWYgKFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNl Rm9yVVJMKHVybCkpIHsKKyAgICBpZiAoV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VzRm9yVVJM KHVybCkuc2l6ZSkgewogICAgICAgICBpZiAoIVdJLmlzU2hvd2luZ1NvdXJjZXNUYWIoKSkgewog ICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiUmV2ZWFsIGlu IFNvdXJjZXMgVGFiIiksICgpID0+IHsKICAgICAgICAgICAgICAgICBzaG93UmVzb3VyY2VXaXRo T3B0aW9ucyh7cHJlZmVycmVkVGFiVHlwZTogV0kuU291cmNlc1RhYkNvbnRlbnRWaWV3LlR5cGV9 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDAxYTZlMTdjNTcx NTIyNjVlYWQxOTNkYTk5ZjQxMWFjNmZhNzc0MTguLjZmOTdkM2EyMDA3MmYwYTEzZjIwYWYxOWNi N2EyYmU3MDczMTBkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpA QCAtMTAxLDEwICsxMDEsMTIgQEAgV0kuRE9NRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIERP TURldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5EZXRhaWxzU2lkZWIKIAogICAgIF9tb3Vz ZVdhc0NsaWNrZWQoZXZlbnQpCiAgICAgeworICAgICAgICBsZXQgcGFyZW50RnJhbWUgPSBudWxs OworCiAgICAgICAgIGlmICh0aGlzLl9kb21Ob2RlICYmIHRoaXMuX2RvbU5vZGUub3duZXJEb2N1 bWVudCkgewotICAgICAgICAgICAgdmFyIG1haW5SZXNvdXJjZSA9IFdJLm5ldHdvcmtNYW5hZ2Vy LnJlc291cmNlRm9yVVJMKHRoaXMuX2RvbU5vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCk7 CisgICAgICAgICAgICBsZXQgbWFpblJlc291cmNlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3Vy Y2VzRm9yVVJMKHRoaXMuX2RvbU5vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCkuZmlyc3RW YWx1ZTsKICAgICAgICAgICAgIGlmIChtYWluUmVzb3VyY2UpCi0gICAgICAgICAgICAgICAgdmFy IHBhcmVudEZyYW1lID0gbWFpblJlc291cmNlLnBhcmVudEZyYW1lOworICAgICAgICAgICAgICAg IHBhcmVudEZyYW1lID0gbWFpblJlc291cmNlLnBhcmVudEZyYW1lOwogICAgICAgICB9CiAKICAg ICAgICAgY29uc3Qgb3B0aW9ucyA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFNpZGViYXJQYW5lbC5qcwppbmRl eCAzNjE2Mzg4ZjE2M2RjOWQ0NjZjZDMzMGI4YjYxYTRhM2YwNWJjYWI5Li5kOTVhY2JlOTMwZjU4 ZjAzODg0MTFlNGY5ZmM4ZmU4Y2MzMmNiYzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hTaWRlYmFyUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBhbmVs LmpzCkBAIC0xOTUsNyArMTk1LDcgQEAgV0kuU2VhcmNoU2lkZWJhclBhbmVsID0gY2xhc3MgU2Vh cmNoU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW4KICAgICAgICAg ICAgIGlmICghZnJhbWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICB2 YXIgcmVzb3VyY2UgPSBmcmFtZS51cmwgPT09IHVybCA/IGZyYW1lLm1haW5SZXNvdXJjZSA6IGZy YW1lLnJlc291cmNlRm9yVVJMKHVybCk7CisgICAgICAgICAgICBsZXQgcmVzb3VyY2UgPSBmcmFt ZS51cmwgPT09IHVybCA/IGZyYW1lLm1haW5SZXNvdXJjZSA6IGZyYW1lLnJlc291cmNlc0ZvclVS TCh1cmwpLmZpcnN0VmFsdWU7CiAgICAgICAgICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMjg2LDcgKzI4Niw3IEBAIFdJLlNlYXJjaFNpZGViYXJQYW5l bCA9IGNsYXNzIFNlYXJjaFNpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFy UGFuCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgICAg ICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIGEgZnJhbWUgdG8gZG8gcmVzb3VyY2VGb3JV UkwsIGJ1dCBET01BZ2VudCBkb2VzIG5vdCBwcm92aWRlIGEgZnJhbWVJZC4KLSAgICAgICAgICAg ICAgICAgICAgdmFyIHJlc291cmNlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VGb3JVUkwo ZG9tTm9kZS5vd25lckRvY3VtZW50LmRvY3VtZW50VVJMKTsKKyAgICAgICAgICAgICAgICAgICAg bGV0IHJlc291cmNlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VzRm9yVVJMKGRvbU5vZGUu b3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCkuZmlyc3RWYWx1ZTsKICAgICAgICAgICAgICAgICAg ICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggNDk3NWI0N2I2ZDU1MWZhNjE0MDIxZTBlMzU5MWMzMDExMTVmNmFlMy4uZTNhZDk0YzMx ZGFiYWRmNGVlYzU0NzQ3MzIzMzE1YjJiYzdjYmI1OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDIwLTA2LTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBhbGxvdyBtdWx0aXBsZSByZXNvdXJjZXMgZm9yIGEgZ2l2ZW4gVVJMCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4NTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rv ci91bml0LXRlc3RzL3NldC11dGlsaXRpZXMuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5p dC10ZXN0cy9zZXQtdXRpbGl0aWVzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgQWRkIHRlc3QgZm9y IGBTZXQucHJvdG90eXBlLmZpbmRgLgorCisgICAgICAgICogaHR0cC90ZXN0cy93ZWJzb2NrZXQv dGVzdHMvaHliaS9pbnNwZWN0b3IvcmVzb2x2ZVdlYlNvY2tldC5odG1sOgorICAgICAgICBVcGRh dGUgdXNhZ2Ugb2YgYHJlc291cmNlRm9yVVJMYCB0byBgcmVzb3VyY2VzRm9yVVJMYCB3aXRoIGBT ZXQucHJvdG90eXBlLmZpcnN0VmFsdWVgLgorCiAyMDIwLTA2LTA1ICBKYXNvbiBMYXdyZW5jZSAg PGxhd3JlbmNlLmpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyBy MjYyNTI0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVz dHMvaHliaS9pbnNwZWN0b3IvcmVzb2x2ZVdlYlNvY2tldC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9pbnNwZWN0b3IvcmVzb2x2ZVdlYlNvY2tldC5o dG1sCmluZGV4IDI0NjQyYThiMmYyNmJlYjk4YTU2MTkxNjc0N2IzNmFjYzU4MjE0MzEuLmE0NDYy OTFjMzE0NGMyZGY5ODliMjMyM2VjNzhjZmUzZDA0MzAyMDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvaW5zcGVjdG9yL3Jlc29sdmVXZWJT b2NrZXQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9o eWJpL2luc3BlY3Rvci9yZXNvbHZlV2ViU29ja2V0Lmh0bWwKQEAgLTI0LDcgKzI0LDcgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2hvdWxkIHJldHVybiBhIHZhbGlk IHJlc3BvbnNlIGZvciB0aGUgZ2l2ZW4gcmVxdWVzdCBpZGVudGlmaWVyLiIsCiAgICAgICAgIHRl c3QocmVzb2x2ZSwgcmVqZWN0KSB7CiAgICAgICAgICAgICBjb25zdCB1cmwgPSAid3M6Ly8xMjcu MC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvaHliaS9pbnNwZWN0b3IvZWNobyI7Ci0gICAgICAg ICAgICBsZXQgd2ViU29ja2V0UmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZUZv clVSTCh1cmwpOworICAgICAgICAgICAgbGV0IHdlYlNvY2tldFJlc291cmNlID0gV0kubmV0d29y a01hbmFnZXIucmVzb3VyY2VzRm9yVVJMKHVybCkuZmluZCgocmVzb3VyY2UpID0+IHJlc291cmNl LnR5cGUgPT09IFdJLlJlc291cmNlLlR5cGUuV2ViU29ja2V0KTsKICAgICAgICAgICAgIGlmICgh d2ViU29ja2V0UmVzb3VyY2UpIHsKICAgICAgICAgICAgICAgICByZWplY3QoIk1pc3NpbmcgV2Vi U29ja2V0IHJlc291cmNlLiIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3NldC11dGlsaXRpZXMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy1leHBl Y3RlZC50eHQKaW5kZXggNDk5MGE4YjlkNGM4Yzk0NjQ2ODMyZjJiNzBkNDJkZjJjY2ZhZDA4Yi4u ZmJhYWE1OGM3ZjI4YjM2NTBmNjM3NzIxZDU2Mzk5NTZlM2M0ODNhNyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy1leHBl Y3RlZC50eHQKQEAgLTEsNSArMSwxMCBAQAogCiA9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IFNldAor LS0gUnVubmluZyB0ZXN0IGNhc2U6IFNldC5wcm90b3R5cGUuZmluZAorUEFTUzogU2V0IGNhbiBm aW5kIGEgaXRlbSBpdCBob2xkcy4KK1BBU1M6IFNldCBmaW5kcyB0aGUgZmlyc3QgaXRlbSBpZiB0 aGUgZ2l2ZW4gcHJlZGljYXRlIG1hdGNoZXMgbXVsdGlwbGUgaXRlbXMuCitQQVNTOiBTZXQgcmV0 dXJucyAndW5kZWZpbmVkJyB3aGVuIGF0dGVtcHRpbmcgdG8gZmluZCBhbiBpdGVtIGlmIHRoZSBn aXZlbiBwcmVkaWNhdGUgZG9lc24ndCBtYXRjaCBhbnl0aGluZy4KKwogLS0gUnVubmluZyB0ZXN0 IGNhc2U6IFNldC5wcm90b3R5cGUucHVzaEFsbAogQXJyYXk6CiBbMSwyXSA9PiBbMSwyLCJhMSIs ImEyIl0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3NldC11 dGlsaXRpZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3NldC11dGls aXRpZXMuaHRtbAppbmRleCBjODJhNTI1NTdkZWM1MDViOWIwZjZmMzc2NDU0NWEyMWQ5MDJmNDBj Li5iN2E4ZGMwZjA0ZDc4ODYyZTE4Nzc1NTBkNTg1ZmUzZDFkNzRhMjEwIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRpbGl0aWVzLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGllcy5odG1sCkBAIC03 LDYgKzcsMTYgQEAgZnVuY3Rpb24gdGVzdCgpCiB7CiAgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9y VGVzdC5jcmVhdGVTeW5jU3VpdGUoIlNldCIpOwogCisgICAgc3VpdGUuYWRkVGVzdENhc2Uoewor ICAgICAgICBuYW1lOiAiU2V0LnByb3RvdHlwZS5maW5kIiwKKyAgICAgICAgdGVzdCgpIHsKKyAg ICAgICAgICAgIGxldCBzZXQgPSBuZXcgU2V0KFsiYSIsICJiIl0pOworICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5leHBlY3RFcXVhbChzZXQuZmluZCgoaXRlbSkgPT4gaXRlbSA9PT0gImIiKSwg ImIiLCAiU2V0IGNhbiBmaW5kIGEgaXRlbSBpdCBob2xkcy4iKTsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0RXF1YWwoc2V0LmZpbmQoKGl0ZW0pID0+IHR5cGVvZiBpdGVtID09PSAi c3RyaW5nIiksICJhIiwgIlNldCBmaW5kcyB0aGUgZmlyc3QgaXRlbSBpZiB0aGUgZ2l2ZW4gcHJl ZGljYXRlIG1hdGNoZXMgbXVsdGlwbGUgaXRlbXMuIik7CisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdEVxdWFsKHNldC5maW5kKChpdGVtKSA9PiB0eXBlb2YgaXRlbSA9PT0gIm51bWJl ciIpLCB1bmRlZmluZWQsICJTZXQgcmV0dXJucyAndW5kZWZpbmVkJyB3aGVuIGF0dGVtcHRpbmcg dG8gZmluZCBhbiBpdGVtIGlmIHRoZSBnaXZlbiBwcmVkaWNhdGUgZG9lc24ndCBtYXRjaCBhbnl0 aGluZy4iKTsKKyAgICAgICAgfSwKKyAgICB9KTsKKwogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsK ICAgICAgICAgbmFtZTogIlNldC5wcm90b3R5cGUucHVzaEFsbCIsCiAgICAgICAgIHRlc3QoKSB7 Cg== 401226 2020-06-05 19:54:58 -0700 2020-06-09 13:44:18 -0700 Patch bug-212852-20200605205457.patch text/plain 28854 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ3ZWY1NjA0ZWQwNDU0YTFiODZkNTA2ZWM3ZWRm NTIyMDJkNDllNzIuLjRiNjkwYWQ3MTIyZDI5Mzg5MGQxOGQxYzI5OTVkNzY2OWQ4NjU4YWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDIwLTA2LTA1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh bGxvdyBtdWx0aXBsZSByZXNvdXJjZXMgZm9yIGEgZ2l2ZW4gVVJMCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4NTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5LCB3aGVuIGEgbmV3IHJl c291cmNlIGlzIGFkZGVkIHdpdGggYSBVUkwgdGhhdCBtYXRjaGVzIGFuIGV4aXN0aW5nIHJlc291 cmNlLCBhbnkKKyAgICAgICAgYHJlc291cmNlRm9yVVJMYCBjYWxsIHdpdGggdGhhdCBVUkwgd2ls bCByZXR1cm4gdGhlIG5ldyByZXNvdXJjZSBpbnN0ZWFkIG9mIHRoZSBvbGQgb25lLiBOb3cKKyAg ICAgICAgdGhhdCB0aGVyZSBpcyBhIGBNdWx0aW1hcGAgb2YgVVJMIHRvIHJlc291cmNlLCBpdCBp cyBwb3NzaWJsZSB0byBwaWNrIHdoaWNoIHJlc291cmNlIGlzIHVzZWQKKyAgICAgICAgaW5zdGVh ZCBvZiBhbHdheXMgdXNpbmcgdGhlIG5ld2VzdCBvbmUuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9SZXNvdXJjZUNvbGxlY3Rpb24uanM6CisgICAgICAgIChXSS5SZXNvdXJjZUNv bGxlY3Rpb24pOgorICAgICAgICAoV0kuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5yZXNv dXJjZXNGb3JVUkwpOiBBZGRlZC4KKyAgICAgICAgKFdJLlJlc291cmNlQ29sbGVjdGlvbi5wcm90 b3R5cGUuX2Fzc29jaWF0ZVdpdGhSZXNvdXJjZSk6CisgICAgICAgIChXSS5SZXNvdXJjZUNvbGxl Y3Rpb24ucHJvdG90eXBlLl9kaXNhc3NvY2lhdGVXaXRoUmVzb3VyY2UpOgorICAgICAgICAoV0ku UmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5fcmVzb3VyY2VVUkxEaWRDaGFuZ2UpOgorICAg ICAgICAoV0kuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5yZXNvdXJjZUZvclVSTCk6IERl bGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRnJhbWUuanM6CisgICAgICAg IChXSS5GcmFtZS5wcm90b3R5cGUucmVzb3VyY2VzRm9yVVJMKTogQWRkZWQuCisgICAgICAgIChX SS5GcmFtZS5wcm90b3R5cGUucmVzb3VyY2VGb3JVUkwpOiBEZWxldGVkLgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXSS5O ZXR3b3JrTWFuYWdlci5wcm90b3R5cGUucmVzb3VyY2VzRm9yVVJMKTogQWRkZWQuCisgICAgICAg IChXSS5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUucmVzb3VyY2VSZXF1ZXN0RGlkUmVjZWl2ZVJl c3BvbnNlKToKKyAgICAgICAgKFdJLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5faW5pdGlhdG9y U291cmNlQ29kZUxvY2F0aW9uRnJvbVBheWxvYWQpOgorICAgICAgICAoV0kuTmV0d29ya01hbmFn ZXIucHJvdG90eXBlLnJlc291cmNlRm9yVVJMKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL1NjcmlwdC5qczoKKyAgICAgICAgKFdJLlNjcmlwdC5wcm90b3R5cGUu X3Jlc29sdmVSZXNvdXJjZSk6CisgICAgICAgIChXSS5TY3JpcHQucHJvdG90eXBlLl9yZXNvbHZl UmVzb3VyY2UuaXNTY3JpcHRSZXNvdXJjZSk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ1NTTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkNTU01hbmFnZXIucHJv dG90eXBlLl91cGRhdGVSZXNvdXJjZUNvbnRlbnQuZmV0Y2hlZFN0eWxlU2hlZXRDb250ZW50KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzOgorICAgICAgICAoU2V0 LnByb3RvdHlwZS5maW5kKTogQWRkZWQuCisgICAgICAgIEFkZCB1dGlsaXR5IGZvciBmaW5kaW5n IGFuIGl0ZW0gaW4gYSBgU2V0YCB0byBhdm9pZCBoYXZpbmcgdG8gYEFycmF5LmZyb21gLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5vcGVuVVJM KToKKyAgICAgICAgKFdJLnNvdXJjZUNvZGVGb3JVUkwpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVN YW5hZ2VyLnByb3RvdHlwZS5fcHJvY2Vzc1JlY29yZCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Nb2RlbHMvQ2FsbEZyYW1lLmpzOgorICAgICAgICAoV0kuQ2FsbEZyYW1lLmZyb21QYXlsb2Fk KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Db25zb2xlTWVzc2FnZS5qczoKKyAg ICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5nZXQgc291cmNlQ29kZUxvY2F0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzOgorICAg ICAgICAoV0kuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJlY29yZC5q czoKKyAgICAgICAgKFdJLlNjcmlwdFRpbWVsaW5lUmVjb3JkLnByb3RvdHlwZS5faW5pdGlhbGl6 ZVByb2ZpbGVGcm9tUGF5bG9hZC5wcm9maWxlTm9kZUZyb21QYXlsb2FkKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzOgorICAgICAgICAoV0ku YXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclVSTCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuRE9NRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX21vdXNlV2FzQ2xpY2tlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5TZWFyY2hT aWRlYmFyUGFuZWwucHJvdG90eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICBVc2UgdGhlIGBm aXJzdFZhbHVlYCBpbnN0ZWFkIG9mIHRoZSBpbXBsaWNpdCBgbGFzdFZhbHVlYCB0byBtYXRjaCBl eGlzdGluZyBuZWFyYnkgdXNhZ2Ugb2YKKyAgICAgICAgYFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90 b3R5cGUuc2NyaXB0c0ZvclVSTGAsIHdoaWNoIGV4cGxpY2l0bHkgY2hvb3NlcyB0aGUgZmlyc3Qg c2NyaXB0LgorCiAyMDIwLTA2LTA0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFdvcmsgYXJvdW5kIGJyb2tlbiBzeXN0ZW0gdmVyc2lvbiBtYWNybwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmlu ZGV4IDZlNmEwM2Y1YWJmMTFmNmEyYzg1MTQwZGZhMWRkNjg0YmI4ZGI5OTguLjM0NGFmNTIzZTU5 MDRhOWU2Y2I4Mzk0M2EzNzc3YWE3OWJiMTUzYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTExMDYsOSArMTEwNiw5IEBAIFdJ Lm9wZW5VUkwgPSBmdW5jdGlvbih1cmwsIGZyYW1lLCBvcHRpb25zID0ge30pCiAgICAgbGV0IHNp bXBsaWZpZWRVUkwgPSByZW1vdmVVUkxGcmFnbWVudCh1cmwpOwogICAgIGlmIChmcmFtZSkgewog ICAgICAgICAvLyBXSS5GcmFtZS5yZXNvdXJjZUZvclVSTCBkb2VzIG5vdCBjaGVjayB0aGUgbWFp biByZXNvdXJjZSwgb25seSBzdWItcmVzb3VyY2VzLiBTbyBjaGVjayBib3RoLgotICAgICAgICBy ZXNvdXJjZSA9IGZyYW1lLnVybCA9PT0gc2ltcGxpZmllZFVSTCA/IGZyYW1lLm1haW5SZXNvdXJj ZSA6IGZyYW1lLnJlc291cmNlRm9yVVJMKHNpbXBsaWZpZWRVUkwsIHNlYXJjaENoaWxkRnJhbWVz KTsKKyAgICAgICAgcmVzb3VyY2UgPSBmcmFtZS51cmwgPT09IHNpbXBsaWZpZWRVUkwgPyBmcmFt ZS5tYWluUmVzb3VyY2UgOiBmcmFtZS5yZXNvdXJjZXNGb3JVUkwoc2ltcGxpZmllZFVSTCwgc2Vh cmNoQ2hpbGRGcmFtZXMpLmZpcnN0VmFsdWU7CiAgICAgfSBlbHNlIGlmIChXSS5zaGFyZWRBcHAu ZGVidWdnYWJsZVR5cGUgPT09IFdJLkRlYnVnZ2FibGVUeXBlLlNlcnZpY2VXb3JrZXIpCi0gICAg ICAgIHJlc291cmNlID0gV0kubWFpblRhcmdldC5yZXNvdXJjZUNvbGxlY3Rpb24ucmVzb3VyY2VG b3JVUkwocmVtb3ZlVVJMRnJhZ21lbnQodXJsKSk7CisgICAgICAgIHJlc291cmNlID0gV0kubWFp blRhcmdldC5yZXNvdXJjZUNvbGxlY3Rpb24ucmVzb3VyY2VzRm9yVVJMKHJlbW92ZVVSTEZyYWdt ZW50KHVybCkpLmZpcnN0VmFsdWU7CiAKICAgICBpZiAocmVzb3VyY2UpIHsKICAgICAgICAgLy8g Q29udGV4dCBtZW51IHNlbGVjdGlvbnMgbWF5IGdvIHRocm91Z2ggdGhpcyBjb2RlIHBhdGg7IGRv bid0IGNsb2JiZXIgdGhlIHByZXZpb3VzbHktc2V0IGhpbnQuCkBAIC0zMDYwLDcgKzMwNjAsNyBA QCBXSS5saW5raWZ5RWxlbWVudCA9IGZ1bmN0aW9uKGxpbmtFbGVtZW50LCBzb3VyY2VDb2RlTG9j YXRpb24sIG9wdGlvbnMgPSB7fSkgewogCiBXSS5zb3VyY2VDb2RlRm9yVVJMID0gZnVuY3Rpb24o dXJsKQogewotICAgIHZhciBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VG b3JVUkwodXJsKTsKKyAgICBsZXQgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291 cmNlc0ZvclVSTCh1cmwpLmZpcnN0VmFsdWU7CiAgICAgaWYgKCFzb3VyY2VDb2RlKSB7CiAgICAg ICAgIHNvdXJjZUNvZGUgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0c0ZvclVSTCh1cmwsIFdJ LmFzc3VtaW5nTWFpblRhcmdldCgpKVswXTsKICAgICAgICAgaWYgKHNvdXJjZUNvZGUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVz LmpzCmluZGV4IGY4MWFlZTZiZmQzNmM4YjU0MmQ0ZmM4MDY3YWY4OTllNGU5ZTk2ZWQuLjdlMmJi ZGQzNWU2MGIzYThiYWY3ZGI4NGVhODFlZmIxZDQ2YjQ2YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xNDYs NiArMTQ2LDE4IEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShNYXAucHJvdG90eXBlLCAiZ2V0T3JJ bml0aWFsaXplIiwKICAgICB9CiB9KTsKIAorT2JqZWN0LmRlZmluZVByb3BlcnR5KFNldC5wcm90 b3R5cGUsICJmaW5kIiwKK3sKKyAgICB2YWx1ZShwcmVkaWNhdGUpCisgICAgeworICAgICAgICBm b3IgKGxldCBpdGVtIG9mIHRoaXMpIHsKKyAgICAgICAgICAgIGlmIChwcmVkaWNhdGUoaXRlbSwg dGhpcykpCisgICAgICAgICAgICAgICAgcmV0dXJuIGl0ZW07CisgICAgICAgIH0KKyAgICAgICAg cmV0dXJuIHVuZGVmaW5lZDsKKyAgICB9LAorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShT ZXQucHJvdG90eXBlLCAiYWRkQWxsIiwKIHsKICAgICB2YWx1ZShpdGVyYWJsZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU01h bmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9DU1NNYW5hZ2VyLmpzCmluZGV4IDkxMzg5YzQwMzliMGI4ZGM4NWUzODAxMGFkYzEwOTBlNzJk Mjc3NTAuLjY4YWVhYTk3ODcwMjhlZThkMTg1OGExZDI3MDc1MDMzNjBiZDRlOTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU01h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ1NTTWFuYWdlci5qcwpAQCAtNjE1LDEzICs2MTUsMTAgQEAgV0kuQ1NTTWFuYWdlciA9 IGNsYXNzIENTU01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgICAgIGlmICghc3R5bGVTaGVldC5pc0luc3BlY3RvclN0eWxlU2hlZXQo KSkgewotICAgICAgICAgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0ID0gcmVwcmVzZW50ZWRPYmpl Y3QucGFyZW50RnJhbWUucmVzb3VyY2VGb3JVUkwocmVwcmVzZW50ZWRPYmplY3QudXJsKTsKLSAg ICAgICAgICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQotICAgICAgICAgICAgICAgICAg ICByZXR1cm47Ci0KICAgICAgICAgICAgICAgICAvLyBPbmx5IHRyeSB0byB1cGRhdGUgc3R5bGVz aGVldCByZXNvdXJjZXMuIE90aGVyIHJlc291cmNlcywgbGlrZSBkb2N1bWVudHMsIGNhbiBjb250 YWluCiAgICAgICAgICAgICAgICAgLy8gbXVsdGlwbGUgc3R5bGVzaGVldHMgYW5kIHdlIGRvbid0 IGhhdmUgdGhlIHNvdXJjZSByYW5nZXMgdG8gdXBkYXRlIHRob3NlLgotICAgICAgICAgICAgICAg IGlmIChyZXByZXNlbnRlZE9iamVjdC50eXBlICE9PSBXSS5SZXNvdXJjZS5UeXBlLlN0eWxlU2hl ZXQpCisgICAgICAgICAgICAgICAgcmVwcmVzZW50ZWRPYmplY3QgPSByZXByZXNlbnRlZE9iamVj dC5wYXJlbnRGcmFtZS5yZXNvdXJjZXNGb3JVUkwocmVwcmVzZW50ZWRPYmplY3QudXJsKS5maW5k KChyZXNvdXJjZSkgPT4gcmVzb3VyY2UudHlwZSA9PT0gV0kuUmVzb3VyY2UuVHlwZS5TdHlsZVNo ZWV0KTsKKyAgICAgICAgICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQogICAgICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL05ldHdvcmtNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29y a01hbmFnZXIuanMKaW5kZXggOTM3NjM0OWI5ZGFiYTEwMjMzYmEwMWJkNzY0OGFmMDc5YWEyYTBm NS4uYjRkNGNhMzhhOGFhNzliN2UwMTQyOWNlNDEyZmFhNzZmM2RkYzNkYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTmV0d29ya01h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvTmV0d29ya01hbmFnZXIuanMKQEAgLTQ2MSwxNSArNDYxLDE3IEBAIFdJLk5ldHdvcmtN YW5hZ2VyID0gY2xhc3MgTmV0d29ya01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgcmVzb3VyY2VGb3JVUkwodXJsKQorICAgIHJlc291 cmNlc0ZvclVSTCh1cmwpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX21haW5GcmFtZSkKLSAg ICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICBsZXQgcmVzb3VyY2VzID0gbmV3IFNldDsK KyAgICAgICAgaWYgKHRoaXMuX21haW5GcmFtZSkgeworICAgICAgICAgICAgaWYgKHRoaXMuX21h aW5GcmFtZS5tYWluUmVzb3VyY2UudXJsID09PSB1cmwpCisgICAgICAgICAgICAgICAgcmVzb3Vy Y2VzLmFkZCh0aGlzLl9tYWluRnJhbWUubWFpblJlc291cmNlKTsKIAotICAgICAgICBpZiAodGhp cy5fbWFpbkZyYW1lLm1haW5SZXNvdXJjZS51cmwgPT09IHVybCkKLSAgICAgICAgICAgIHJldHVy biB0aGlzLl9tYWluRnJhbWUubWFpblJlc291cmNlOwotCi0gICAgICAgIHJldHVybiB0aGlzLl9t YWluRnJhbWUucmVzb3VyY2VGb3JVUkwodXJsLCB0cnVlKTsKKyAgICAgICAgICAgIGNvbnN0IHJl Y3Vyc2l2ZWx5U2VhcmNoQ2hpbGRGcmFtZXMgPSB0cnVlOworICAgICAgICAgICAgcmVzb3VyY2Vz LmFkZEFsbCh0aGlzLl9tYWluRnJhbWUucmVzb3VyY2VzRm9yVVJMKHVybCwgcmVjdXJzaXZlbHlT ZWFyY2hDaGlsZEZyYW1lcykpOworICAgICAgICB9CisgICAgICAgIHJldHVybiByZXNvdXJjZXM7 CiAgICAgfQogCiAgICAgYWRvcHRPcnBoYW5lZFJlc291cmNlc0ZvclRhcmdldCh0YXJnZXQpCkBA IC04MDksNyArODExLDcgQEAgV0kuTmV0d29ya01hbmFnZXIgPSBjbGFzcyBOZXR3b3JrTWFuYWdl ciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoIXJlc291cmNlKSB7CiAgICAgICAgICAg ICB2YXIgZnJhbWUgPSB0aGlzLmZyYW1lRm9ySWRlbnRpZmllcihmcmFtZUlkZW50aWZpZXIpOwog ICAgICAgICAgICAgaWYgKGZyYW1lKQotICAgICAgICAgICAgICAgIHJlc291cmNlID0gZnJhbWUu cmVzb3VyY2VGb3JVUkwocmVzcG9uc2UudXJsKTsKKyAgICAgICAgICAgICAgICByZXNvdXJjZSA9 IGZyYW1lLnJlc291cmNlc0ZvclVSTChyZXNwb25zZS51cmwpLmZpcnN0VmFsdWU7CiAKICAgICAg ICAgICAgIC8vIElmIHdlIGZpbmQgdGhlIHJlc291cmNlIHRoaXMgd2F5IHdlIGhhZCBtYXJrZWQg aXQgZWFybGllciBhcyBmaW5pc2hlZCB2aWEgUGFnZS5nZXRSZXNvdXJjZVRyZWUuCiAgICAgICAg ICAgICAvLyBBc3NvY2lhdGUgdGhlIHJlc291cmNlIHdpdGggdGhlIHJlcXVlc3RJZGVudGlmaWVy IHNvIGl0IGNhbiBiZSBmb3VuZCBpbiBmdXR1cmUgbG9hZGluZyBldmVudHMuCkBAIC0xMDgzLDcg KzEwODUsNyBAQCBXSS5OZXR3b3JrTWFuYWdlciA9IGNsYXNzIE5ldHdvcmtNYW5hZ2VyIGV4dGVu ZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmICghdXJsIHx8IGlzTmFOKGxpbmVOdW1iZXIpIHx8IGxp bmVOdW1iZXIgPCAwKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICAgICAgdmFyIHNv dXJjZUNvZGUgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAg ICBsZXQgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlc0ZvclVSTCh1cmwp LmZpcnN0VmFsdWU7CiAgICAgICAgIGlmICghc291cmNlQ29kZSkKICAgICAgICAgICAgIHNvdXJj ZUNvZGUgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0c0ZvclVSTCh1cmwsIFdJLm1haW5UYXJn ZXQpWzBdOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggZjMyNWY1 OTVlYjgwYTM1NWJlODVmNGVlOGU2YWJkZmEzMmZhOTE0NC4uNWY1YzE4NDkxNmRjZTVmNTJmZjVi MTU5YjFkNmVmYWYwY2ExYjc3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5q cwpAQCAtODU3LDcgKzg1Nyw4IEBAIFdJLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5l TWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBjYXNlIEluc3BlY3RvckJhY2tlbmQu RW51bS5UaW1lbGluZS5FdmVudFR5cGUuRXZhbHVhdGVTY3JpcHQ6CiAgICAgICAgICAgICBpZiAo IXNvdXJjZUNvZGVMb2NhdGlvbikgewogICAgICAgICAgICAgICAgIHZhciBtYWluRnJhbWUgPSBX SS5uZXR3b3JrTWFuYWdlci5tYWluRnJhbWU7Ci0gICAgICAgICAgICAgICAgdmFyIHNjcmlwdFJl c291cmNlID0gbWFpbkZyYW1lLnVybCA9PT0gcmVjb3JkUGF5bG9hZC5kYXRhLnVybCA/IG1haW5G cmFtZS5tYWluUmVzb3VyY2UgOiBtYWluRnJhbWUucmVzb3VyY2VGb3JVUkwocmVjb3JkUGF5bG9h ZC5kYXRhLnVybCwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgY29uc3QgcmVjdXJzaXZlbHlTZWFy Y2hDaGlsZEZyYW1lcyA9IHRydWU7CisgICAgICAgICAgICAgICAgbGV0IHNjcmlwdFJlc291cmNl ID0gbWFpbkZyYW1lLnVybCA9PT0gcmVjb3JkUGF5bG9hZC5kYXRhLnVybCA/IG1haW5GcmFtZS5t YWluUmVzb3VyY2UgOiBtYWluRnJhbWUucmVzb3VyY2VzRm9yVVJMKHJlY29yZFBheWxvYWQuZGF0 YS51cmwsIHJlY3Vyc2l2ZWx5U2VhcmNoQ2hpbGRGcmFtZXMpLmxhc3RWYWx1ZTsKICAgICAgICAg ICAgICAgICBpZiAoc2NyaXB0UmVzb3VyY2UpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gVGhl IGxpbmVOdW1iZXIgaXMgMS1iYXNlZCwgYnV0IHdlIGV4cGVjdCAwLWJhc2VkLgogICAgICAgICAg ICAgICAgICAgICBsZXQgbGluZU51bWJlciA9IHJlY29yZFBheWxvYWQuZGF0YS5saW5lTnVtYmVy IC0gMTsKQEAgLTkwNyw3ICs5MDgsOCBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1l bGluZU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICAgICAgaWYgKCFzb3VyY2VD b2RlTG9jYXRpb24pIHsKICAgICAgICAgICAgICAgICB2YXIgbWFpbkZyYW1lID0gV0kubmV0d29y a01hbmFnZXIubWFpbkZyYW1lOwotICAgICAgICAgICAgICAgIHZhciBzY3JpcHRSZXNvdXJjZSA9 IG1haW5GcmFtZS51cmwgPT09IHJlY29yZFBheWxvYWQuZGF0YS5zY3JpcHROYW1lID8gbWFpbkZy YW1lLm1haW5SZXNvdXJjZSA6IG1haW5GcmFtZS5yZXNvdXJjZUZvclVSTChyZWNvcmRQYXlsb2Fk LmRhdGEuc2NyaXB0TmFtZSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgY29uc3QgcmVjdXJzaXZl bHlTZWFyY2hDaGlsZEZyYW1lcyA9IHRydWU7CisgICAgICAgICAgICAgICAgbGV0IHNjcmlwdFJl c291cmNlID0gbWFpbkZyYW1lLnVybCA9PT0gcmVjb3JkUGF5bG9hZC5kYXRhLnNjcmlwdE5hbWUg PyBtYWluRnJhbWUubWFpblJlc291cmNlIDogbWFpbkZyYW1lLnJlc291cmNlc0ZvclVSTChyZWNv cmRQYXlsb2FkLmRhdGEuc2NyaXB0TmFtZSwgcmVjdXJzaXZlbHlTZWFyY2hDaGlsZEZyYW1lcyku bGFzdFZhbHVlOwogICAgICAgICAgICAgICAgIGlmIChzY3JpcHRSZXNvdXJjZSkgewogICAgICAg ICAgICAgICAgICAgICAvLyBUaGUgbGluZU51bWJlciBpcyAxLWJhc2VkLCBidXQgd2UgZXhwZWN0 IDAtYmFzZWQuCiAgICAgICAgICAgICAgICAgICAgIGxldCBsaW5lTnVtYmVyID0gcmVjb3JkUGF5 bG9hZC5kYXRhLnNjcmlwdExpbmUgLSAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbGxGcmFtZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DYWxsRnJhbWUuanMKaW5kZXggMTdjNmQ4OTJiMmMz ODVmYTc1NTIxYzQ3MmYzYzlhZGQyMDk5MmVkMy4uZDQ1M2M1NmFlOWE0NDIyYzQ4NTA4ZjJhMjU3 MTg0YjgxMTAwZThhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0NhbGxGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvQ2FsbEZyYW1lLmpzCkBAIC0yMzMsNyArMjMzLDcgQEAgV0kuQ2Fs bEZyYW1lID0gY2xhc3MgQ2FsbEZyYW1lCiAgICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvZGUg PSBzb3VyY2VDb2RlLnJlc291cmNlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCFz b3VyY2VDb2RlKQotICAgICAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBXSS5uZXR3b3JrTWFuYWdl ci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBXSS5u ZXR3b3JrTWFuYWdlci5yZXNvdXJjZXNGb3JVUkwodXJsKS5maXJzdFZhbHVlOwogICAgICAgICAg ICAgaWYgKCFzb3VyY2VDb2RlKQogICAgICAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBXSS5kZWJ1 Z2dlck1hbmFnZXIuc2NyaXB0c0ZvclVSTCh1cmwsIHRhcmdldClbMF07CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Db25zb2xlTWVzc2Fn ZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Db25zb2xl TWVzc2FnZS5qcwppbmRleCBmNTQ3NmI5MjQ5YjQ3MjcyZDQ3NjUzYzcyMzlkOWIxOTAzYzQwMmU3 Li5iZTc4NzhlMGI3NTMwZWY3NGJlMjk0YWJmZGY5YzUwNGMxNGMxODIyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29uc29sZU1lc3NhZ2Uu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbnNv bGVNZXNzYWdlLmpzCkBAIC04NCw3ICs4NCw3IEBAIFdJLkNvbnNvbGVNZXNzYWdlID0gY2xhc3Mg Q29uc29sZU1lc3NhZ2UKICAgICAgICAgLy8gSWYgdGhhdCBkb2Vzbid0IGV4aXN0IHRyeSB0byBn ZXQgYSBsb2NhdGlvbiBmcm9tIHRoZSB1cmwvbGluZS9jb2x1bW4gaW4gdGhlIENvbnNvbGVNZXNz YWdlLgogICAgICAgICAvLyBGSVhNRSA8aHR0cDovL3dlYmtpdC5vcmcvYi83NjQwND46IFJlbW92 ZSB0aGUgc3RyaW5nIGVxdWFsaXR5IGNoZWNrcyBmb3IgdW5kZWZpbmVkIG9uY2Ugd2UgZG9uJ3Qg Z2V0IHRoYXQgdmFsdWUgYW55bW9yZS4KICAgICAgICAgaWYgKHRoaXMuX3VybCAmJiB0aGlzLl91 cmwgIT09ICJ1bmRlZmluZWQiKSB7Ci0gICAgICAgICAgICBsZXQgc291cmNlQ29kZSA9IFdJLm5l dHdvcmtNYW5hZ2VyLnJlc291cmNlRm9yVVJMKHRoaXMuX3VybCk7CisgICAgICAgICAgICBsZXQg c291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLnJlc291cmNlc0ZvclVSTCh0aGlzLl91cmwp LmZpcnN0VmFsdWU7CiAgICAgICAgICAgICBpZiAoc291cmNlQ29kZSkgewogICAgICAgICAgICAg ICAgIGxldCBsaW5lTnVtYmVyID0gdGhpcy5fbGluZSA+IDAgPyB0aGlzLl9saW5lIC0gMSA6IDA7 CiAgICAgICAgICAgICAgICAgbGV0IGNvbHVtbk51bWJlciA9IHRoaXMuX2NvbHVtbiA+IDAgPyB0 aGlzLl9jb2x1bW4gLSAxIDogMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKaW5kZXggMGEyOTI2YzMz MzZiN2NhYTUxYjc1YThiNzcwNDk1ZGI2MDVjODA0MS4uYmZmYjQxMzA2NTI0YmNhNzcyODg1NjRk ZGU5NzU5MjU3MGNkNTViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKQEAgLTcxLDE2ICs3MSwx NiBAQCBXSS5ET01Ob2RlU3R5bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdJLk9i amVjdAogCiAgICAgICAgIC8vIFRyeSB0byB1c2UgdGhlIG5vZGUgdG8gZmluZCB0aGUgZnJhbWUg d2hpY2ggaGFzIHRoZSBjb3JyZWN0IHJlc291cmNlIGZpcnN0LgogICAgICAgICBpZiAoZG9jdW1l bnROb2RlKSB7Ci0gICAgICAgICAgICBsZXQgbWFpblJlc291cmNlID0gV0kubmV0d29ya01hbmFn ZXIucmVzb3VyY2VGb3JVUkwoZG9jdW1lbnROb2RlLmRvY3VtZW50VVJMKTsKKyAgICAgICAgICAg IGxldCBtYWluUmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZXNGb3JVUkwoZG9j dW1lbnROb2RlLmRvY3VtZW50VVJMKS5maXJzdFZhbHVlOwogICAgICAgICAgICAgaWYgKG1haW5S ZXNvdXJjZSkgewogICAgICAgICAgICAgICAgIGxldCBwYXJlbnRGcmFtZSA9IG1haW5SZXNvdXJj ZS5wYXJlbnRGcmFtZTsKLSAgICAgICAgICAgICAgICBzb3VyY2VDb2RlID0gcGFyZW50RnJhbWUu cmVzb3VyY2VGb3JVUkwoc291cmNlVVJMKTsKKyAgICAgICAgICAgICAgICBzb3VyY2VDb2RlID0g cGFyZW50RnJhbWUucmVzb3VyY2VzRm9yVVJMKHNvdXJjZVVSTCkuZmlyc3RWYWx1ZTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8vIElmIHRoYXQgZGlkbid0IGZpbmQgdGhl IHJlc291cmNlLCB0aGVuIHNlYXJjaCBhbGwgZnJhbWVzLgogICAgICAgICBpZiAoIXNvdXJjZUNv ZGUpCi0gICAgICAgICAgICBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VG b3JVUkwoc291cmNlVVJMKTsKKyAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBXSS5uZXR3b3JrTWFu YWdlci5yZXNvdXJjZXNGb3JVUkwoc291cmNlVVJMKS5maXJzdFZhbHVlOwogCiAgICAgICAgIGlm ICghc291cmNlQ29kZSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzCmluZGV4IGRiMWQ3 MjM5ODkwODc5ZTk0YjAzM2U1ZjkxNzgwMjI0OGRhOGQwNmYuLmViNThlNTU5YzE5NGVhYzRmNTky Zjg0YWY2NTgyODRlNTJiOTYyNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9GcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvRnJhbWUuanMKQEAgLTM2MSwzMCArMzYxLDIyIEBAIFdJLkZy YW1lID0gY2xhc3MgRnJhbWUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV0kuRnJhbWUuRXZlbnQuQWxsQ2hpbGRGcmFtZXNSZW1vdmVkKTsK ICAgICB9CiAKLSAgICByZXNvdXJjZUZvclVSTCh1cmwsIHJlY3Vyc2l2ZWx5U2VhcmNoQ2hpbGRG cmFtZXMpCisgICAgcmVzb3VyY2VzRm9yVVJMKHVybCwgcmVjdXJzaXZlbHlTZWFyY2hDaGlsZEZy YW1lcykKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlQ29sbGVj dGlvbi5yZXNvdXJjZUZvclVSTCh1cmwpOwotICAgICAgICBpZiAocmVzb3VyY2UpCi0gICAgICAg ICAgICByZXR1cm4gcmVzb3VyY2U7CisgICAgICAgIGxldCByZXNvdXJjZXMgPSB0aGlzLl9yZXNv dXJjZUNvbGxlY3Rpb24ucmVzb3VyY2VzRm9yVVJMKHVybCk7CiAKICAgICAgICAgLy8gQ2hlY2sg dGhlIG1haW4gcmVzb3VyY2VzIG9mIHRoZSBjaGlsZCBmcmFtZXMgZm9yIHRoZSByZXF1ZXN0ZWQg VVJMLgogICAgICAgICBmb3IgKGxldCBjaGlsZEZyYW1lIG9mIHRoaXMuX2NoaWxkRnJhbWVDb2xs ZWN0aW9uKSB7Ci0gICAgICAgICAgICByZXNvdXJjZSA9IGNoaWxkRnJhbWUubWFpblJlc291cmNl OwotICAgICAgICAgICAgaWYgKHJlc291cmNlLnVybCA9PT0gdXJsKQotICAgICAgICAgICAgICAg IHJldHVybiByZXNvdXJjZTsKKyAgICAgICAgICAgIGlmIChjaGlsZEZyYW1lLm1haW5SZXNvdXJj ZS51cmwgPT09IHVybCkKKyAgICAgICAgICAgICAgICByZXNvdXJjZXMuYWRkKGNoaWxkRnJhbWUu bWFpblJlc291cmNlKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghcmVjdXJzaXZlbHlTZWFy Y2hDaGlsZEZyYW1lcykKLSAgICAgICAgICAgIHJldHVybiBudWxsOwotCi0gICAgICAgIC8vIFJl Y3Vyc2l2ZWx5IHNlYXJjaCByZXNvdXJjZXMgb2YgY2hpbGQgZnJhbWVzLgotICAgICAgICBmb3Ig KGxldCBjaGlsZEZyYW1lIG9mIHRoaXMuX2NoaWxkRnJhbWVDb2xsZWN0aW9uKSB7Ci0gICAgICAg ICAgICByZXNvdXJjZSA9IGNoaWxkRnJhbWUucmVzb3VyY2VGb3JVUkwodXJsLCB0cnVlKTsKLSAg ICAgICAgICAgIGlmIChyZXNvdXJjZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2U7 CisgICAgICAgIGlmIChyZWN1cnNpdmVseVNlYXJjaENoaWxkRnJhbWVzKSB7CisgICAgICAgICAg ICBmb3IgKGxldCBjaGlsZEZyYW1lIG9mIHRoaXMuX2NoaWxkRnJhbWVDb2xsZWN0aW9uKQorICAg ICAgICAgICAgICAgIHJlc291cmNlcy5hZGRBbGwoY2hpbGRGcmFtZS5yZXNvdXJjZXNGb3JVUkwo dXJsLCByZWN1cnNpdmVseVNlYXJjaENoaWxkRnJhbWVzKSk7CiAgICAgICAgIH0KIAotICAgICAg ICByZXR1cm4gbnVsbDsKKyAgICAgICAgcmV0dXJuIHJlc291cmNlczsKICAgICB9CiAKICAgICBy ZXNvdXJjZUNvbGxlY3Rpb25Gb3JUeXBlKHR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2VDb2xsZWN0aW9uLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlQ29sbGVjdGlv bi5qcwppbmRleCA5NmIxNTQzODYxMWY2M2NjYjFmZGM2ZDk0YTU2NmRhNGJhNTVlMTM5Li5iMmU5 MWJlZGZkMjljNGQ4YzZlNTJlNDUyOGRkYWZiNzQwM2ViNGM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2VDb2xsZWN0aW9uLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJj ZUNvbGxlY3Rpb24uanMKQEAgLTMxLDcgKzMxLDcgQEAgV0kuUmVzb3VyY2VDb2xsZWN0aW9uID0g Y2xhc3MgUmVzb3VyY2VDb2xsZWN0aW9uIGV4dGVuZHMgV0kuQ29sbGVjdGlvbgogICAgICAgICBz dXBlcigpOwogCiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHlwZSA9IHJlc291cmNlVHlwZSB8fCBu dWxsOwotICAgICAgICB0aGlzLl9yZXNvdXJjZVVSTE1hcCA9IG5ldyBNYXA7CisgICAgICAgIHRo aXMuX3Jlc291cmNlVVJMTWFwID0gbmV3IE11bHRpbWFwOwogICAgICAgICB0aGlzLl9yZXNvdXJj ZXNUeXBlTWFwID0gbmV3IE1hcDsKICAgICB9CiAKQEAgLTU5LDkgKzU5LDkgQEAgV0kuUmVzb3Vy Y2VDb2xsZWN0aW9uID0gY2xhc3MgUmVzb3VyY2VDb2xsZWN0aW9uIGV4dGVuZHMgV0kuQ29sbGVj dGlvbgogICAgICAgICByZXR1cm4gb2JqZWN0LnR5cGUgPT09IHRoaXMuX3Jlc291cmNlVHlwZTsK ICAgICB9CiAKLSAgICByZXNvdXJjZUZvclVSTCh1cmwpCisgICAgcmVzb3VyY2VzRm9yVVJMKHVy bCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZVVSTE1hcC5nZXQodXJsKSB8 fCBudWxsOworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VVUkxNYXAuZ2V0KHVybCkgfHwg bmV3IFNldDsKICAgICB9CiAKICAgICByZXNvdXJjZUNvbGxlY3Rpb25Gb3JUeXBlKHR5cGUpCkBA IC0xMTQsNyArMTE0LDcgQEAgV0kuUmVzb3VyY2VDb2xsZWN0aW9uID0gY2xhc3MgUmVzb3VyY2VD b2xsZWN0aW9uIGV4dGVuZHMgV0kuQ29sbGVjdGlvbgogCiAgICAgX2Fzc29jaWF0ZVdpdGhSZXNv dXJjZShyZXNvdXJjZSkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Jlc291cmNlVVJMTWFwLnNldChy ZXNvdXJjZS51cmwsIHJlc291cmNlKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAuYWRk KHJlc291cmNlLnVybCwgcmVzb3VyY2UpOwogCiAgICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2VU eXBlKSB7CiAgICAgICAgICAgICBsZXQgcmVzb3VyY2VzQ29sbGVjdGlvbkZvclR5cGUgPSB0aGlz LnJlc291cmNlQ29sbGVjdGlvbkZvclR5cGUocmVzb3VyY2UudHlwZSk7CkBAIC0xMzgsNyArMTM4 LDcgQEAgV0kuUmVzb3VyY2VDb2xsZWN0aW9uID0gY2xhc3MgUmVzb3VyY2VDb2xsZWN0aW9uIGV4 dGVuZHMgV0kuQ29sbGVjdGlvbgogICAgICAgICAgICAgcmVzb3VyY2VzQ29sbGVjdGlvbkZvclR5 cGUucmVtb3ZlKHJlc291cmNlKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX3Jlc291cmNl VVJMTWFwLmRlbGV0ZShyZXNvdXJjZS51cmwpOworICAgICAgICB0aGlzLl9yZXNvdXJjZVVSTE1h cC5kZWxldGUocmVzb3VyY2UudXJsLCByZXNvdXJjZSk7CiAgICAgfQogCiAgICAgX3Jlc291cmNl VVJMRGlkQ2hhbmdlKGV2ZW50KQpAQCAtMTUzLDggKzE1Myw4IEBAIFdJLlJlc291cmNlQ29sbGVj dGlvbiA9IGNsYXNzIFJlc291cmNlQ29sbGVjdGlvbiBleHRlbmRzIFdJLkNvbGxlY3Rpb24KICAg ICAgICAgaWYgKCFvbGRVUkwpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5f cmVzb3VyY2VVUkxNYXAuc2V0KHJlc291cmNlLnVybCwgcmVzb3VyY2UpOwotICAgICAgICB0aGlz Ll9yZXNvdXJjZVVSTE1hcC5kZWxldGUob2xkVVJMKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VV UkxNYXAuYWRkKHJlc291cmNlLnVybCwgcmVzb3VyY2UpOworICAgICAgICB0aGlzLl9yZXNvdXJj ZVVSTE1hcC5kZWxldGUob2xkVVJMLCByZXNvdXJjZSk7CiAgICAgfQogCiAgICAgX3Jlc291cmNl VHlwZURpZENoYW5nZShldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0LmpzCmluZGV4IDY1N2M1NDFhZmIzNzhiZmZiZjc5YjRj ODQ3MjA5MzBiYjJhMWE1OTEuLjg1MTExNTIwYTA5ZWUyZGEyMGU3NTBkMmFiNDRhNTNjNTQ1ZGJm M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9TY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1NjcmlwdC5qcwpAQCAtMjgzLDE2ICsyODMsMjAgQEAgV0kuU2NyaXB0ID0gY2xhc3MgU2Ny aXB0IGV4dGVuZHMgV0kuU291cmNlQ29kZQogICAgICAgICBpZiAodGhpcy5fdGFyZ2V0ICYmIHRo aXMuX3RhcmdldCAhPT0gV0kubWFpblRhcmdldCkKICAgICAgICAgICAgIHJlc29sdmVyID0gdGhp cy5fdGFyZ2V0LnJlc291cmNlQ29sbGVjdGlvbjsKIAorICAgICAgICBmdW5jdGlvbiBpc1Njcmlw dFJlc291cmNlKGl0ZW0pIHsKKyAgICAgICAgICAgIHJldHVybiBpdGVtLnR5cGUgPT09IFdJLlJl c291cmNlLlR5cGUuRG9jdW1lbnQgfHwgaXRlbS50eXBlID09PSBXSS5SZXNvdXJjZS5UeXBlLlNj cmlwdDsKKyAgICAgICAgfQorCiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAvLyBUcnkgd2l0 aCB0aGUgU2NyaXB0J3MgZnVsbCBVUkwuCi0gICAgICAgICAgICBsZXQgcmVzb3VyY2UgPSByZXNv bHZlci5yZXNvdXJjZUZvclVSTCh0aGlzLl91cmwpOworICAgICAgICAgICAgbGV0IHJlc291cmNl ID0gcmVzb2x2ZXIucmVzb3VyY2VzRm9yVVJMKHRoaXMuX3VybCkuZmluZChpc1NjcmlwdFJlc291 cmNlKTsKICAgICAgICAgICAgIGlmIChyZXNvdXJjZSkKICAgICAgICAgICAgICAgICByZXR1cm4g cmVzb3VyY2U7CiAKICAgICAgICAgICAgIC8vIFRyeSB3aXRoIHRoZSBTY3JpcHQncyBmdWxsIGRl Y29kZWQgVVJMLgogICAgICAgICAgICAgbGV0IGRlY29kZWRVUkwgPSBkZWNvZGVVUkkodGhpcy5f dXJsKTsKICAgICAgICAgICAgIGlmIChkZWNvZGVkVVJMICE9PSB0aGlzLl91cmwpIHsKLSAgICAg ICAgICAgICAgICByZXNvdXJjZSA9IHJlc29sdmVyLnJlc291cmNlRm9yVVJMKGRlY29kZWRVUkwp OworICAgICAgICAgICAgICAgIHJlc291cmNlID0gcmVzb2x2ZXIucmVzb3VyY2VzRm9yVVJMKGRl Y29kZWRVUkwpLmZpbmQoaXNTY3JpcHRSZXNvdXJjZSk7CiAgICAgICAgICAgICAgICAgaWYgKHJl c291cmNlKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAgICAgICAg ICB9CkBAIC0zMDAsNyArMzA0LDcgQEAgV0kuU2NyaXB0ID0gY2xhc3MgU2NyaXB0IGV4dGVuZHMg V0kuU291cmNlQ29kZQogICAgICAgICAgICAgLy8gTmV4dCB0cnkgcmVtb3ZpbmcgYW55IGZyYWdt ZW50IGluIHRoZSBvcmlnaW5hbCBVUkwuCiAgICAgICAgICAgICBsZXQgdXJsV2l0aG91dEZyYWdt ZW50ID0gcmVtb3ZlVVJMRnJhZ21lbnQodGhpcy5fdXJsKTsKICAgICAgICAgICAgIGlmICh1cmxX aXRob3V0RnJhZ21lbnQgIT09IHRoaXMuX3VybCkgewotICAgICAgICAgICAgICAgIHJlc291cmNl ID0gcmVzb2x2ZXIucmVzb3VyY2VGb3JVUkwodXJsV2l0aG91dEZyYWdtZW50KTsKKyAgICAgICAg ICAgICAgICByZXNvdXJjZSA9IHJlc29sdmVyLnJlc291cmNlc0ZvclVSTCh1cmxXaXRob3V0RnJh Z21lbnQpLmZpbmQoaXNTY3JpcHRSZXNvdXJjZSk7CiAgICAgICAgICAgICAgICAgaWYgKHJlc291 cmNlKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAgICAgICAgICB9 CkBAIC0zMDgsNyArMzEyLDcgQEAgV0kuU2NyaXB0ID0gY2xhc3MgU2NyaXB0IGV4dGVuZHMgV0ku U291cmNlQ29kZQogICAgICAgICAgICAgLy8gRmluYWxseSB0cnkgcmVtb3ZpbmcgYW55IGZyYWdt ZW50IGluIHRoZSBkZWNvZGVkIFVSTC4KICAgICAgICAgICAgIGxldCBkZWNvZGVkVVJMV2l0aG91 dEZyYWdtZW50ID0gcmVtb3ZlVVJMRnJhZ21lbnQoZGVjb2RlZFVSTCk7CiAgICAgICAgICAgICBp ZiAoZGVjb2RlZFVSTFdpdGhvdXRGcmFnbWVudCAhPT0gZGVjb2RlZFVSTCkgewotICAgICAgICAg ICAgICAgIHJlc291cmNlID0gcmVzb2x2ZXIucmVzb3VyY2VGb3JVUkwoZGVjb2RlZFVSTFdpdGhv dXRGcmFnbWVudCk7CisgICAgICAgICAgICAgICAgcmVzb3VyY2UgPSByZXNvbHZlci5yZXNvdXJj ZXNGb3JVUkwoZGVjb2RlZFVSTFdpdGhvdXRGcmFnbWVudCkuZmluZChpc1NjcmlwdFJlc291cmNl KTsKICAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiByZXNvdXJjZTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJlY29yZC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJl Y29yZC5qcwppbmRleCBmMzk0NGE5MzdmYTA5MTNjYjNmMzMyZDYyZDgxYjc1YjY1ZGI5MzViLi5k MzQ4NmMzMzVjODI4N2RhZGZlMDY4ZDUzOWIyM2MyM2Q0MWQxOWNkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxpbmVSZWNv cmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Nj cmlwdFRpbWVsaW5lUmVjb3JkLmpzCkBAIC0xMjUsNyArMTI1LDcgQEAgV0kuU2NyaXB0VGltZWxp bmVSZWNvcmQgPSBjbGFzcyBTY3JpcHRUaW1lbGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5l UmVjb3JkCiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCgiaWQiIGluIG5vZGVQYXlsb2FkKTsK IAogICAgICAgICAgICAgaWYgKG5vZGVQYXlsb2FkLnVybCkgewotICAgICAgICAgICAgICAgIHZh ciBzb3VyY2VDb2RlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VGb3JVUkwobm9kZVBheWxv YWQudXJsKTsKKyAgICAgICAgICAgICAgICBsZXQgc291cmNlQ29kZSA9IFdJLm5ldHdvcmtNYW5h Z2VyLnJlc291cmNlc0ZvclVSTChub2RlUGF5bG9hZC51cmwpLmZpcnN0VmFsdWU7CiAgICAgICAg ICAgICAgICAgaWYgKCFzb3VyY2VDb2RlKQogICAgICAgICAgICAgICAgICAgICBzb3VyY2VDb2Rl ID0gV0kuZGVidWdnZXJNYW5hZ2VyLnNjcmlwdHNGb3JVUkwobm9kZVBheWxvYWQudXJsLCBXSS5h c3N1bWluZ01haW5UYXJnZXQoKSlbMF07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGlsaXRpZXMu anMKaW5kZXggMGEzNWQwNTRjYWM0NGQ0ZDVkM2U2ZWZkODdmNWUzOTYxMDI1NTk3Ny4uZjM0NGQ0 NWVkYzUxMmMzZTFlNTQ3NDI1MzkzNzEwYjU0YjcyYWMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGlsaXRpZXMuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1l bnVVdGlsaXRpZXMuanMKQEAgLTIwOCw3ICsyMDgsNyBAQCBXSS5hcHBlbmRDb250ZXh0TWVudUl0 ZW1zRm9yVVJMID0gZnVuY3Rpb24oY29udGV4dE1lbnUsIHVybCwgb3B0aW9ucyA9IHt9KQogICAg ICAgICB9KTsKICAgICB9CiAKLSAgICBpZiAoV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VGb3JV UkwodXJsKSkgeworICAgIGlmIChXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZXNGb3JVUkwodXJs KS5zaXplKSB7CiAgICAgICAgIGlmICghV0kuaXNTaG93aW5nU291cmNlc1RhYigpKSB7CiAgICAg ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJSZXZlYWwgaW4gU291 cmNlcyBUYWIiKSwgKCkgPT4gewogICAgICAgICAgICAgICAgIHNob3dSZXNvdXJjZVdpdGhPcHRp b25zKHtwcmVmZXJyZWRUYWJUeXBlOiBXSS5Tb3VyY2VzVGFiQ29udGVudFZpZXcuVHlwZX0pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N RGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggMDFhNmUxN2M1NzE1MjI2 NWVhZDE5M2RhOTlmNDExYWM2ZmE3NzQxOC4uNmY5N2QzYTIwMDcyZjBhMTNmMjBhZjE5Y2I3YTJi ZTcwNzMxMGQyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0x MDEsMTAgKzEwMSwxMiBAQCBXSS5ET01EZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgRE9NRGV0 YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRldGFpbHNTaWRlYgogCiAgICAgX21vdXNlV2Fz Q2xpY2tlZChldmVudCkKICAgICB7CisgICAgICAgIGxldCBwYXJlbnRGcmFtZSA9IG51bGw7CisK ICAgICAgICAgaWYgKHRoaXMuX2RvbU5vZGUgJiYgdGhpcy5fZG9tTm9kZS5vd25lckRvY3VtZW50 KSB7Ci0gICAgICAgICAgICB2YXIgbWFpblJlc291cmNlID0gV0kubmV0d29ya01hbmFnZXIucmVz b3VyY2VGb3JVUkwodGhpcy5fZG9tTm9kZS5vd25lckRvY3VtZW50LmRvY3VtZW50VVJMKTsKKyAg ICAgICAgICAgIGxldCBtYWluUmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZXNG b3JVUkwodGhpcy5fZG9tTm9kZS5vd25lckRvY3VtZW50LmRvY3VtZW50VVJMKS5maXJzdFZhbHVl OwogICAgICAgICAgICAgaWYgKG1haW5SZXNvdXJjZSkKLSAgICAgICAgICAgICAgICB2YXIgcGFy ZW50RnJhbWUgPSBtYWluUmVzb3VyY2UucGFyZW50RnJhbWU7CisgICAgICAgICAgICAgICAgcGFy ZW50RnJhbWUgPSBtYWluUmVzb3VyY2UucGFyZW50RnJhbWU7CiAgICAgICAgIH0KIAogICAgICAg ICBjb25zdCBvcHRpb25zID0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBhbmVsLmpzCmluZGV4IDM2 MTYzODhmMTYzZGM5ZDQ2NmNkMzMwYjhiNjFhNGEzZjA1YmNhYjkuLmQ5NWFjYmU5MzBmNThmMDM4 ODQxMWU0ZjlmYzhmZThjYzMyY2JjODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hTaWRlYmFyUGFuZWwuanMK QEAgLTE5NSw3ICsxOTUsNyBAQCBXSS5TZWFyY2hTaWRlYmFyUGFuZWwgPSBjbGFzcyBTZWFyY2hT aWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICAgICAg aWYgKCFmcmFtZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIHZhciBy ZXNvdXJjZSA9IGZyYW1lLnVybCA9PT0gdXJsID8gZnJhbWUubWFpblJlc291cmNlIDogZnJhbWUu cmVzb3VyY2VGb3JVUkwodXJsKTsKKyAgICAgICAgICAgIGxldCByZXNvdXJjZSA9IGZyYW1lLnVy bCA9PT0gdXJsID8gZnJhbWUubWFpblJlc291cmNlIDogZnJhbWUucmVzb3VyY2VzRm9yVVJMKHVy bCkuZmlyc3RWYWx1ZTsKICAgICAgICAgICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogCkBAIC0yODYsNyArMjg2LDcgQEAgV0kuU2VhcmNoU2lkZWJhclBhbmVsID0g Y2xhc3MgU2VhcmNoU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW4K ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICAgICAgICAg IC8vIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgYSBmcmFtZSB0byBkbyByZXNvdXJjZUZvclVSTCwg YnV0IERPTUFnZW50IGRvZXMgbm90IHByb3ZpZGUgYSBmcmFtZUlkLgotICAgICAgICAgICAgICAg ICAgICB2YXIgcmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZUZvclVSTChkb21O b2RlLm93bmVyRG9jdW1lbnQuZG9jdW1lbnRVUkwpOworICAgICAgICAgICAgICAgICAgICBsZXQg cmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFuYWdlci5yZXNvdXJjZXNGb3JVUkwoZG9tTm9kZS5vd25l ckRvY3VtZW50LmRvY3VtZW50VVJMKS5maXJzdFZhbHVlOwogICAgICAgICAgICAgICAgICAgICBp ZiAoIXJlc291cmNlKQogICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBiMWI3YTk0NDI4NWVlNDVkNTc5Yzk1NGJmOTY4ZDkzMDg0YjUyOTc5Li5mMzA1NzJiNjcyYjM3 YTEwYTU2MTU5MDJlNzMxZTE5ODdkYTVlZTNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAt MDYtMDUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IGFsbG93IG11bHRpcGxlIHJlc291cmNlcyBmb3IgYSBnaXZlbiBVUkwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjg1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3Vu aXQtdGVzdHMvc2V0LXV0aWxpdGllcy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci91bml0LXRl c3RzL3NldC11dGlsaXRpZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICBBZGQgdGVzdCBmb3IgYFNl dC5wcm90b3R5cGUuZmluZGAuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oeWJpL2luc3BlY3Rvci9yZXNvbHZlV2ViU29ja2V0Lmh0bWw6CisgICAgICAgIFVwZGF0ZSB1 c2FnZSBvZiBgcmVzb3VyY2VGb3JVUkxgIHRvIGByZXNvdXJjZXNGb3JVUkxgIHdpdGggYFNldC5w cm90b3R5cGUuZmlyc3RWYWx1ZWAuCisKIDIwMjAtMDYtMDUgIFJ5YW4gSGFkZGFkICA8cnlhbmhh ZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjI2MTks IHIyNjI2MjUsIGFuZCByMjYyNjQxLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9pbnNwZWN0b3IvcmVzb2x2ZVdlYlNvY2tldC5odG1sIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9pbnNwZWN0b3IvcmVz b2x2ZVdlYlNvY2tldC5odG1sCmluZGV4IDI0NjQyYThiMmYyNmJlYjk4YTU2MTkxNjc0N2IzNmFj YzU4MjE0MzEuLmQ4Nzk3ZGIzZjEwZWYxMzkxNzQwNjU5YWVhMzhiMDk5MzhjYWM3NmMgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvaW5zcGVj dG9yL3Jlc29sdmVXZWJTb2NrZXQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dl YnNvY2tldC90ZXN0cy9oeWJpL2luc3BlY3Rvci9yZXNvbHZlV2ViU29ja2V0Lmh0bWwKQEAgLTI0 LDcgKzI0LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2hvdWxk IHJldHVybiBhIHZhbGlkIHJlc3BvbnNlIGZvciB0aGUgZ2l2ZW4gcmVxdWVzdCBpZGVudGlmaWVy LiIsCiAgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CiAgICAgICAgICAgICBjb25zdCB1 cmwgPSAid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvaHliaS9pbnNwZWN0b3Iv ZWNobyI7Ci0gICAgICAgICAgICBsZXQgd2ViU29ja2V0UmVzb3VyY2UgPSBXSS5uZXR3b3JrTWFu YWdlci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICAgICAgbGV0IHdlYlNvY2tldFJlc291 cmNlID0gV0kubmV0d29ya01hbmFnZXIucmVzb3VyY2VzRm9yVVJMKHVybCkuZmluZCgocmVzb3Vy Y2UpID0+IHJlc291cmNlIGluc3RhbmNlb2YgV0kuV2ViU29ja2V0UmVzb3VyY2UpOwogICAgICAg ICAgICAgaWYgKCF3ZWJTb2NrZXRSZXNvdXJjZSkgewogICAgICAgICAgICAgICAgIHJlamVjdCgi TWlzc2luZyBXZWJTb2NrZXQgcmVzb3VyY2UuIik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc2V0LXV0aWxpdGll cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRp bGl0aWVzLWV4cGVjdGVkLnR4dAppbmRleCA0OTkwYThiOWQ0YzhjOTQ2NDY4MzJmMmI3MGQ0MmRm MmNjZmFkMDhiLi5mYmFhYTU4YzdmMjhiMzY1MGY2Mzc3MjFkNTYzOTk1NmUzYzQ4M2E3IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRpbGl0aWVzLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRp bGl0aWVzLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDEwIEBACiAKID09IFJ1bm5pbmcgdGVzdCBz dWl0ZTogU2V0CistLSBSdW5uaW5nIHRlc3QgY2FzZTogU2V0LnByb3RvdHlwZS5maW5kCitQQVNT OiBTZXQgY2FuIGZpbmQgYSBpdGVtIGl0IGhvbGRzLgorUEFTUzogU2V0IGZpbmRzIHRoZSBmaXJz dCBpdGVtIGlmIHRoZSBnaXZlbiBwcmVkaWNhdGUgbWF0Y2hlcyBtdWx0aXBsZSBpdGVtcy4KK1BB U1M6IFNldCByZXR1cm5zICd1bmRlZmluZWQnIHdoZW4gYXR0ZW1wdGluZyB0byBmaW5kIGFuIGl0 ZW0gaWYgdGhlIGdpdmVuIHByZWRpY2F0ZSBkb2Vzbid0IG1hdGNoIGFueXRoaW5nLgorCiAtLSBS dW5uaW5nIHRlc3QgY2FzZTogU2V0LnByb3RvdHlwZS5wdXNoQWxsCiBBcnJheToKIFsxLDJdID0+ IFsxLDIsImExIiwiYTIiXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQt dGVzdHMvc2V0LXV0aWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVz dHMvc2V0LXV0aWxpdGllcy5odG1sCmluZGV4IGM4MmE1MjU1N2RlYzUwNWI5YjBmNmYzNzY0NTQ1 YTIxZDkwMmY0MGMuLmI3YThkYzBmMDRkNzg4NjJlMTg3NzU1MGQ1ODVmZTNkMWQ3NGEyMTAgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3NldC11dGlsaXRpZXMu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zZXQtdXRpbGl0aWVz Lmh0bWwKQEAgLTcsNiArNywxNiBAQCBmdW5jdGlvbiB0ZXN0KCkKIHsKICAgICBsZXQgc3VpdGUg PSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVN5bmNTdWl0ZSgiU2V0Iik7CiAKKyAgICBzdWl0ZS5hZGRU ZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJTZXQucHJvdG90eXBlLmZpbmQiLAorICAgICAgICB0 ZXN0KCkgeworICAgICAgICAgICAgbGV0IHNldCA9IG5ldyBTZXQoWyJhIiwgImIiXSk7CisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHNldC5maW5kKChpdGVtKSA9PiBpdGVt ID09PSAiYiIpLCAiYiIsICJTZXQgY2FuIGZpbmQgYSBpdGVtIGl0IGhvbGRzLiIpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChzZXQuZmluZCgoaXRlbSkgPT4gdHlwZW9m IGl0ZW0gPT09ICJzdHJpbmciKSwgImEiLCAiU2V0IGZpbmRzIHRoZSBmaXJzdCBpdGVtIGlmIHRo ZSBnaXZlbiBwcmVkaWNhdGUgbWF0Y2hlcyBtdWx0aXBsZSBpdGVtcy4iKTsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoc2V0LmZpbmQoKGl0ZW0pID0+IHR5cGVvZiBpdGVt ID09PSAibnVtYmVyIiksIHVuZGVmaW5lZCwgIlNldCByZXR1cm5zICd1bmRlZmluZWQnIHdoZW4g YXR0ZW1wdGluZyB0byBmaW5kIGFuIGl0ZW0gaWYgdGhlIGdpdmVuIHByZWRpY2F0ZSBkb2Vzbid0 IG1hdGNoIGFueXRoaW5nLiIpOworICAgICAgICB9LAorICAgIH0pOworCiAgICAgc3VpdGUuYWRk VGVzdENhc2UoewogICAgICAgICBuYW1lOiAiU2V0LnByb3RvdHlwZS5wdXNoQWxsIiwKICAgICAg ICAgdGVzdCgpIHsK