136657 2014-09-08 20:11:21 -0700 Web Inspector: Fix ESLint no-trailing-spaces warnings 2014-09-09 12:57:31 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck graouts joepeck jonowells timothy webkit-bug-importer oldest_to_newest 1034037 0 joepeck 2014-09-08 20:11:21 -0700 ESLint catches a lot of trailing whitespace in Web Inspector code. 1034038 1 237831 joepeck 2014-09-08 20:15:29 -0700 Created attachment 237831 [PATCH] Proposed Fix 1034125 2 237831 aestes 2014-09-09 10:00:45 -0700 Comment on attachment 237831 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237831&action=review > Source/WebInspectorUI/UserInterface/Base/Utilities.js:586 > + Oops? 1034139 3 237831 joepeck 2014-09-09 12:41:30 -0700 Comment on attachment 237831 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237831&action=review >> Source/WebInspectorUI/UserInterface/Base/Utilities.js:586 >> + > > Oops? Hahah, good catch. 1034143 4 joepeck 2014-09-09 12:57:31 -0700 <http://trac.webkit.org/changeset/173436> 237831 2014-09-08 20:15:29 -0700 2014-09-09 12:41:30 -0700 [PATCH] Proposed Fix trailing-whitespace.patch text/plain 55492 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvLmVzbGludHJjCmluZGV4IGMxMWQ0YmIuLjA2NWYxMzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJLy5lc2xpbnRyYwpAQCAtNTksNiArNTksNyBAQAogICAgICAgICAiZXFlcWVxIjogMiwKICAg ICAgICAgImN1cmx5IjogMCwKICAgICAgICAgInF1b3RlcyI6IFsyLCAiZG91YmxlIl0sCisgICAg ICAgICJuby10cmFpbGluZy1zcGFjZXMiOiAyLAogICAgICAgICAibm8tdW5kZXJzY29yZS1kYW5n bGUiOiAwLAogICAgICAgICAibmV3LXBhcmVucyI6IDAKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZwppbmRleCBhYTI4NjYxLi44ODVkMjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAg LTEsNSArMSwxMTEgQEAKIDIwMTQtMDktMDggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggRVNMaW50IG5vLXRyYWlsaW5n LXNwYWNlcyB3YXJuaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM2NjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiAuZXNsaW50cmM6CisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0RPTVV0 aWxpdGllcy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvVVJMVXRpbGl0aWVzLmpz OgorICAgICAgICAocmVsYXRpdmVQYXRoKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2Uv VXRpbGl0aWVzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1p cnJvckNvbG9yRWRpdGluZ0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29k ZU1pcnJvckNvbG9yRWRpdGluZ0NvbnRyb2xsZXIucHJvdG90eXBlLl9jb2xvclBpY2tlckNvbG9y Q2hhbmdlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9y RHJhZ1RvQWRqdXN0TnVtYmVyQ29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b2RlTWlycm9yRHJhZ1RvQWRqdXN0TnVtYmVyQ29udHJvbGxlci5wcm90b3R5cGUuc2V0IGVuYWJs ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JEcmFnVG9BZGp1c3ROdW1iZXJD b250cm9sbGVyLnByb3RvdHlwZS5kcmFnVG9BZGp1c3RDb250cm9sbGVyQ2FuQWRqdXN0T2JqZWN0 QXRQb2ludCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9y RWRpdGluZ0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckVk aXRpbmdDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVLZXlkb3duRXZlbnQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckdyYWRpZW50RWRpdGluZ0NvbnRy b2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckdyYWRpZW50RWRpdGlu Z0NvbnRyb2xsZXIucHJvdG90eXBlLmdyYWRpZW50U2xpZGVyU3RvcFdhc1NlbGVjdGVkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5n Q29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFj a2luZ0NvbnRyb2xsZXIucHJvdG90eXBlLl9wcm9jZXNzSmF2YVNjcmlwdEV4cHJlc3Npb24pOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRHJhZ1RvQWRqdXN0Q29udHJvbGxl ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EcmFnVG9BZGp1c3RDb250cm9sbGVyLnByb3Rv dHlwZS5zZXQgYWN0aXZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EcmFnVG9BZGp1c3RDb250 cm9sbGVyLnByb3RvdHlwZS5fc2V0RHJhZ2dpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRy YWdUb0FkanVzdENvbnRyb2xsZXIucHJvdG90eXBlLl9zZXRUcmFja3NNb3VzZUNsaWNrQW5kRHJh Zyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9FeHRlcm5hbC9Fc3ByaW1hL2VzcHJpbWEuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQXBwbGljYXRpb25DYWNoZUZyYW1lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZSk6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LnByb3RvdHlwZS5nZXQgbWFuaWZl c3RVUkwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0Nvb2tpZVN0b3JhZ2VPYmpl Y3QuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NU2VhcmNoTWF0Y2hPYmpl Y3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NU2VhcmNoTWF0Y2hPYmplY3QucHJvdG90 eXBlLmdldCB0aXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NU2VhcmNoTWF0Y2hPYmpl Y3QudGl0bGVGb3JET01Ob2RlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9EYXRh YmFzZU9iamVjdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhYmFzZU9iamVjdC5wcm90 b3R5cGUuZ2V0VGFibGVOYW1lcyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRGF0 YWJhc2VUYWJsZU9iamVjdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxl T2JqZWN0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9HcmFkaWVudC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5HcmFkaWVudC5mcm9tU3RyaW5nKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SYWRpYWxHcmFkaWVudC5wcm90b3R5cGUudG9TdHJpbmcpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvTW9kZWxzL0lzc3VlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Jc3N1ZU1lc3NhZ2UucHJvdG90eXBlLl9mb3JtYXRUZXh0SWZOZWNlc3NhcnkpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXRJbWFnZVNpemUuaW1hZ2VEaWRMb2FkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0SW1hZ2VTaXplKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0LnByb3RvdHlwZS5fbWFrZVN5bnRheFRyZWUpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvTW9kZWxzL1NvdXJjZUNvZGVMb2NhdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Tb3VyY2VDb2RlTG9jYXRpb24ucHJvdG90eXBlLmhhc0RpZmZlcmVudERpc3BsYXlMb2NhdGlv bik6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvVGV4dE1hcmtlci5qczoKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1BhZ2VPYnNlcnZlci5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBh bmVsLnByb3RvdHlwZS5zZXQgYXBwbGljYXRpb25DYWNoZUZyYW1lKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUucmVm cmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURldGFpbHNTaWRl YmFyUGFuZWwucHJvdG90eXBlLl9uZXR3b3JrU3RhdGVVcGRhdGVkKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50KToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVF bGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVz dFRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgbmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QXBwbGljYXRpb25DYWNoZU1hbmlmZXN0VHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBzZWNvbmRh cnlOYW1lKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvbk5hdmlnYXRpb25J dGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbG9yUGlja2VyLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ29sb3JXaGVlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b2xvcldoZWVsLnByb3RvdHlwZS5fZHJhdyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9Db21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcucHJvdG90eXBlLnNob3cpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29uc29sZUNvbW1hbmQuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEZsb3dUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0Nvb2tpZVN0b3JhZ2VUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29r aWVTdG9yYWdlVHJlZUVsZW1lbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRXZl bnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FdmVudExp c3RlbmVyU2VjdGlvbkdyb3VwLnByb3RvdHlwZS5fZnVuY3Rpb25UZXh0T3JMaW5rKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudFBhdGhDb21wb25lbnQu anM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5wcm90b3R5cGUuX2hhbmRsZUtleWRv d25FdmVudCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEYXRhR3Jp ZE5vZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGF0YUdyaWROb2RlLnBy b3RvdHlwZS5fbWFrZU5hbWVDZWxsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xh eWVyVHJlZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnBy b3RvdHlwZS5faGlnaGxpZ2h0UmFuZ2VzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05hdmlnYXRpb25CYXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvbkJhcik6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uSXRlbS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uSXRlbSk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaEltYWdl U2l6ZVNlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NvcGVCYXJJdGVtKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZS51cGRhdGVSYW5nZVRp bWVzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRyZWVFbGVtZW50KToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNlYXJjaFJlc3VsdFRyZWVFbGVtZW50LnRydW5jYXRlQW5kSGlnaGxpZ2h0VGl0bGUpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2xpZGVyLmpzOgorCisyMDE0LTA5LTA4ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogSW5zcGVjdG9yIGZyZXF1ZW50bHkgcmVzdG9yZXMgd3JvbmcgdmlldyB3aGVuIG9wZW5lZCAo b2Z0ZW4gVGltZWxpbmVzIGluc3RlYWQgb2YgUmVzb3VyY2UpCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU5NjUKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9ET01VdGlsaXRpZXMuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0RPTVV0aWxpdGllcy5qcwppbmRl eCAyZGJhNjEzNC4uNTJiMTgzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9ET01VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9ET01VdGlsaXRpZXMuanMKQEAgLTc0LDcgKzc0LDcgQEAg V2ViSW5zcGVjdG9yLmxpbmtpZnlBY2Nlc3NpYmlsaXR5Tm9kZVJlZmVyZW5jZSA9IGZ1bmN0aW9u KG5vZGUpCiB7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAvLyBT YW1lIGFzIGxpbmtpZnlOb2RlUmVmZXJlbmNlIGV4Y2VwdCB0aGUgbGluayB0ZXh0IGhhcyB0aGUg Y2xhc3NuYW1lcyByZW1vdmVkLi4uIAorICAgIC8vIFNhbWUgYXMgbGlua2lmeU5vZGVSZWZlcmVu Y2UgZXhjZXB0IHRoZSBsaW5rIHRleHQgaGFzIHRoZSBjbGFzc25hbWVzIHJlbW92ZWQuLi4KICAg ICAvLyAuLi5mb3IgbGlzdCBicmV2aXR5LCBhbmQgYm90aCB0ZXh0IGFuZCB0aXRsZSBoYXZlIHJv bGVTZWxlY3RvckZvck5vZGUgYXBwZW5kZWQuCiAgICAgdmFyIGxpbmsgPSBXZWJJbnNwZWN0b3Iu bGlua2lmeU5vZGVSZWZlcmVuY2Uobm9kZSk7CiAgICAgdmFyIHRhZ0lkU2VsZWN0b3IgPSBsaW5r LnRpdGxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9VUkxVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1VSTFV0aWxpdGllcy5qcwppbmRleCBmMGFiOGEwLi5jNzI3YWIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1VSTFV0aWxpdGllcy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1VSTFV0aWxp dGllcy5qcwpAQCAtMzUsNyArMzUsNyBAQCBmdW5jdGlvbiByZWxhdGl2ZVBhdGgocGF0aCwgYmFz ZVBhdGgpCiB7CiAgICAgY29uc29sZS5hc3NlcnQocGF0aC5jaGFyQXQoMCkgPT09ICIvIik7CiAg ICAgY29uc29sZS5hc3NlcnQoYmFzZVBhdGguY2hhckF0KDApID09PSAiLyIpOwotICAgIAorCiAg ICAgdmFyIHBhdGhDb21wb25lbnRzID0gcGF0aC5zcGxpdCgiLyIpOwogICAgIHZhciBiYXNlQ29t cG9uZW50cyA9IGJhc2VQYXRoLnJlcGxhY2UoL1wvJC8sICIiKS5zcGxpdCgiLyIpOwogICAgIHZh ciBmaW5hbENvbXBvbmVudHMgPSBbXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5kZXggNmUzNGU0ZS4uMGE3ODljZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGls aXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9V dGlsaXRpZXMuanMKQEAgLTU4Myw4ICs1ODMsOCBAQCBPYmplY3QuZGVmaW5lUHJvcGVydHkoU3Ry aW5nLCAidG9rZW5pemVGb3JtYXRTdHJpbmciLAogICAgICAgICByZXR1cm4gdG9rZW5zOwogICAg IH0KIH0pOwotCi1PYmplY3QuZGVmaW5lUHJvcGVydHkoU3RyaW5nLnByb3RvdHlwZSwgInN0YXJ0 c1dpdGgiLCAKKyAKK09iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcucHJvdG90eXBlLCAic3Rh cnRzV2l0aCIsCiB7CiAgICAgdmFsdWU6IGZ1bmN0aW9uKHN0cmluZykKICAgICB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2Rl TWlycm9yQ29sb3JFZGl0aW5nQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JDb2xvckVkaXRpbmdDb250cm9sbGVy LmpzCmluZGV4IGUwYzJlOGEuLjhlMzFjMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JDb2xvckVkaXRpbmdDb250 cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0NvZGVNaXJyb3JDb2xvckVkaXRpbmdDb250cm9sbGVyLmpzCkBAIC0zMSw3ICszMSw3 IEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yQ29sb3JFZGl0aW5nQ29udHJvbGxlciA9IGZ1bmN0 aW9uKGNvZGVNaXJyb3IsIG1hcmtlcikKIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yQ29sb3JFZGl0 aW5nQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rv ci5Db2RlTWlycm9yQ29sb3JFZGl0aW5nQ29udHJvbGxlciwKICAgICBfX3Byb3RvX186IFdlYklu c3BlY3Rvci5Db2RlTWlycm9yRWRpdGluZ0NvbnRyb2xsZXIucHJvdG90eXBlLAotICAgIAorCiAg ICAgLy8gUHVibGljCiAKICAgICBnZXQgaW5pdGlhbFZhbHVlKCkKQEAgLTU3LDkgKzU3LDkgQEAg V2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JDb2xvckVkaXRpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9 IHsKICAgICB9LAogCiAgICAgLy8gUHJpdmF0ZQotICAgIAorCiAgICAgX2NvbG9yUGlja2VyQ29s b3JDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMudmFsdWUgPSBl dmVudC50YXJnZXQuY29sb3I7Ci0gICAgfSAgICAKKyAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yRHJh Z1RvQWRqdXN0TnVtYmVyQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JEcmFnVG9BZGp1c3ROdW1iZXJDb250cm9s bGVyLmpzCmluZGV4IDhiOWNlMjUuLjVhYjVmYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JEcmFnVG9BZGp1c3RO dW1iZXJDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JEcmFnVG9BZGp1c3ROdW1iZXJDb250cm9sbGVyLmpz CkBAIC00NCw3ICs0NCw3IEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yRHJhZ1RvQWRqdXN0TnVt YmVyQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5lbmFi bGVkID09PSBlbmFibGVkKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAKKwogICAgICAg ICB0aGlzLl9kcmFnVG9BZGp1c3RDb250cm9sbGVyLmVsZW1lbnQgPSB0aGlzLl9jb2RlTWlycm9y LmdldFdyYXBwZXJFbGVtZW50KCk7CiAgICAgICAgIHRoaXMuX2RyYWdUb0FkanVzdENvbnRyb2xs ZXIuZW5hYmxlZCA9IGVuYWJsZWQ7CiAgICAgfSwKQEAgLTEwOCw3ICsxMDgsNyBAQCBXZWJJbnNw ZWN0b3IuQ29kZU1pcnJvckRyYWdUb0FkanVzdE51bWJlckNvbnRyb2xsZXIucHJvdG90eXBlID0g ewogICAgICAgICAgICAgICAgIGxpbmU6IHBvc2l0aW9uLmxpbmUKICAgICAgICAgICAgIH0KICAg ICAgICAgfTsKLSAgICAgICAgCisKICAgICAgICAgcmV0dXJuIGNvbnRhaW5zTnVtYmVyOwogICAg IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9Db2RlTWlycm9yRWRpdGluZ0NvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yRWRpdGluZ0NvbnRy b2xsZXIuanMKaW5kZXggMzQyMjZhYi4uOTUzMDA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckVkaXRpbmdDb250 cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0NvZGVNaXJyb3JFZGl0aW5nQ29udHJvbGxlci5qcwpAQCAtNDIsMTQgKzQyLDE0IEBA IFdlYkluc3BlY3Rvci5Db2RlTWlycm9yRWRpdGluZ0NvbnRyb2xsZXIgPSBmdW5jdGlvbihjb2Rl TWlycm9yLCBtYXJrZXIpCiBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckVkaXRpbmdDb250cm9sbGVy LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JF ZGl0aW5nQ29udHJvbGxlciwKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3QucHJv dG90eXBlLAotICAgIAorCiAgICAgLy8gUHVibGljCi0gICAgCisKICAgICBnZXQgbWFya2VyKCkK ICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9tYXJrZXI7CiAgICAgfSwKLSAgICAKKwogICAg IGdldCByYW5nZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fcmFuZ2U7CkBAIC01OSw3 ICs1OSw3IEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yRWRpdGluZ0NvbnRyb2xsZXIucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ZhbHVlOwogICAgIH0sCi0gICAg CisKICAgICBzZXQgdmFsdWUodmFsdWUpCiAgICAgewogICAgICAgICB0aGlzLnRleHQgPSB2YWx1 ZS50b1N0cmluZygpOwpAQCAtODIsNyArODIsNyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckVk aXRpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHRvID0ge2xpbmU6IHRo aXMuX3JhbmdlLmVuZExpbmUsIGNoOiB0aGlzLl9yYW5nZS5lbmRDb2x1bW59OwogICAgICAgICBy ZXR1cm4gdGhpcy5fY29kZU1pcnJvci5nZXRSYW5nZShmcm9tLCB0byk7CiAgICAgfSwKLSAgICAK KwogICAgIHNldCB0ZXh0KHRleHQpCiAgICAgewogICAgICAgICB2YXIgZnJvbSA9IHtsaW5lOiB0 aGlzLl9yYW5nZS5zdGFydExpbmUsIGNoOiB0aGlzLl9yYW5nZS5zdGFydENvbHVtbn07CkBAIC0x MDAsMTMgKzEwMCwxMyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckVkaXRpbmdDb250cm9sbGVy LnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KICAg ICAgICAgcmV0dXJuIHRoaXMudGV4dDsKICAgICB9LAotICAgIAorCiAgICAgZ2V0IGNzc0NsYXNz TmFtZSgpCiAgICAgewogICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgogICAg ICAgICByZXR1cm4gIiI7CiAgICAgfSwKLSAgICAKKwogICAgIGdldCBwb3BvdmVyKCkKICAgICB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9wb3BvdmVyOwpAQCAtMTUzLDcgKzE1Myw3IEBAIFdlYklu c3BlY3Rvci5Db2RlTWlycm9yRWRpdGluZ0NvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgIHsK ICAgICAgICAgaWYgKCF0aGlzLl9rZXlib2FyZFNob3J0Y3V0RXNjLm1hdGNoZXNFdmVudChldmVu dCkgfHwgIXRoaXMuX3BvcG92ZXIudmlzaWJsZSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgCisKICAgICAgICAgdGhpcy52YWx1ZSA9IHRoaXMuX29yaWdpbmFsVmFsdWU7CiAg ICAgICAgIHRoaXMuX3BvcG92ZXIuZGlzbWlzcygpOwogCkBAIC0xNzYsNyArMTc2LDcgQEAgV2Vi SW5zcGVjdG9yLkNvZGVNaXJyb3JFZGl0aW5nQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgdGhpcy5fb3JpZ2luYWxWYWx1ZSA9IHRoaXMuX3ZhbHVlLmNvcHkoKTsKICAgICB9LAot ICAgIAorCiAgICAgZGlkRGlzbWlzc1BvcG92ZXI6IGZ1bmN0aW9uKHBvcG92ZXIpCiAgICAgewog ICAgICAgICBkZWxldGUgdGhpcy5fcG9wb3ZlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JHcmFkaWVudEVkaXRp bmdDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQ29kZU1pcnJvckdyYWRpZW50RWRpdGluZ0NvbnRyb2xsZXIuanMKaW5kZXggZTNj NTQyNS4uMGQyNWM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckdyYWRpZW50RWRpdGluZ0NvbnRyb2xsZXIuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29k ZU1pcnJvckdyYWRpZW50RWRpdGluZ0NvbnRyb2xsZXIuanMKQEAgLTE1OSw3ICsxNTksNyBAQCBX ZWJJbnNwZWN0b3IuQ29kZU1pcnJvckdyYWRpZW50RWRpdGluZ0NvbnRyb2xsZXIucHJvdG90eXBl ID0gewogICAgIHsKICAgICAgICAgdGhpcy50ZXh0ID0gdGhpcy52YWx1ZS50b1N0cmluZygpOwog ICAgIH0sCi0gICAgCisKICAgICBncmFkaWVudFNsaWRlclN0b3BXYXNTZWxlY3RlZDogZnVuY3Rp b24oZ3JhZGllbnRTbGlkZXIsIHN0b3ApCiAgICAgewogICAgICAgICB2YXIgc2VsZWN0ZWRTdG9w ID0gZ3JhZGllbnRTbGlkZXIuc2VsZWN0ZWRTdG9wOwpAQCAtMTc2LDcgKzE3Niw3IEBAIFdlYklu c3BlY3Rvci5Db2RlTWlycm9yR3JhZGllbnRFZGl0aW5nQ29udHJvbGxlci5wcm90b3R5cGUgPSB7 CiAgICAgICAgIC8vIEVuc3VyZSB0aGUgYW5nbGUgaW5wdXQgaXMgbm90IGZvY3VzZWQgc2luY2Us IGlmIGl0IHdlcmUsIGl0J2QgbWFrZSBhIHNjcm9sbGJhciBhcHBlYXIgYXMgd2UKICAgICAgICAg Ly8gYW5pbWF0ZSB0aGUgcG9wb3ZlcidzIGZyYW1lIHRvIGZpdCBpdHMgbmV3IGNvbnRlbnQuCiAg ICAgICAgIHRoaXMuX2FuZ2xlSW5wdXQuYmx1cigpOwotICAgICAgICAKKwogICAgICAgICB0aGlz LnBvcG92ZXIudXBkYXRlKCk7CiAgICAgfSwKIApAQCAtMjM4LDcgKzIzOCw3IEBAIFdlYkluc3Bl Y3Rvci5Db2RlTWlycm9yR3JhZGllbnRFZGl0aW5nQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX2dyYWRpZW50U2xpZGVyLnN0b3BzID0gdGhpcy52YWx1ZS5zdG9wczsKICAg ICAgICAgdGhpcy50ZXh0ID0gdGhpcy52YWx1ZS50b1N0cmluZygpOwogICAgIH0sCi0gICAgCisK ICAgICBfdXBkYXRlQ1NTQ2xhc3NGb3JHcmFkaWVudFR5cGU6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIGlmICh0aGlzLnZhbHVlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkxpbmVhckdyYWRp ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJh Y2tpbmdDb250cm9sbGVyLmpzCmluZGV4IGJkNWY3MmYuLjA1YWMzNTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JU b2tlblRyYWNraW5nQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIu anMKQEAgLTE0OSw3ICsxNDksNyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tp bmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9o b3ZlcmVkTWFya2VyOwogICAgIH0sCi0gICAgCisKICAgICBzZXQgaG92ZXJlZE1hcmtlcihob3Zl cmVkTWFya2VyKQogICAgIHsKICAgICAgICAgdGhpcy5faG92ZXJlZE1hcmtlciA9IGhvdmVyZWRN YXJrZXI7CkBAIC00NDAsMTMgKzQ0MCwxMyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBzdGFydDog dGhpcy5fY29kZU1pcnJvci5nZXRDdXJzb3IoInN0YXJ0IiksCiAgICAgICAgICAgICAgICAgZW5k OiB0aGlzLl9jb2RlTWlycm9yLmdldEN1cnNvcigiZW5kIikKICAgICAgICAgICAgIH07Ci0gICAg ICAgIAorCiAgICAgICAgICAgICBmdW5jdGlvbiB0b2tlbklzSW5SYW5nZSh0b2tlbiwgcmFuZ2Up CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRva2VuLmxpbmUgPj0gcmFu Z2Uuc3RhcnQubGluZSAmJiB0b2tlbi5jaCA+PSByYW5nZS5zdGFydC5jaCAmJgogICAgICAgICAg ICAgICAgICAgICAgICB0b2tlbi5saW5lIDw9IHJhbmdlLmVuZC5saW5lICYmIHRva2VuLmNoIDw9 IHJhbmdlLmVuZC5jaDsKICAgICAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgICAgIGlm ICh0b2tlbklzSW5SYW5nZShzdGFydFBvc2l0aW9uLCBzZWxlY3Rpb25SYW5nZSkgfHwgdG9rZW5J c0luUmFuZ2UoZW5kUG9zaXRpb24sIHNlbGVjdGlvblJhbmdlKSkgewogICAgICAgICAgICAgICAg IHJldHVybiB7CiAgICAgICAgICAgICAgICAgICAgIGhvdmVyZWRUb2tlbjogdGhpcy5faG92ZXJl ZFRva2VuSW5mby50b2tlbiwKQEAgLTQ1NSw3ICs0NTUsNyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1p cnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICAgICAgZXhwcmVzc2lvblJhbmdlOiBzZWxlY3Rpb25SYW5nZSwKICAgICAgICAgICAgICAgICB9 OwogICAgICAgICAgICAgfQotICAgICAgICB9IAorICAgICAgICB9CiAKICAgICAgICAgLy8gV2Ug b25seSBoYW5kbGUgdmFycywgZGVmaW5pdGlvbnMsIHByb3BlcnRpZXMsIGFuZCB0aGUga2V5d29y ZCAndGhpcycuCiAgICAgICAgIHZhciB0eXBlID0gdGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tl bi50eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRHJhZ1RvQWRqdXN0Q29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RyYWdUb0FkanVzdENvbnRyb2xsZXIuanMK aW5kZXggYzM5NmM5OC4uM2ZiM2I0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRHJhZ1RvQWRqdXN0Q29udHJvbGxlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EcmFnVG9B ZGp1c3RDb250cm9sbGVyLmpzCkBAIC03NCw3ICs3NCw3IEBAIFdlYkluc3BlY3Rvci5EcmFnVG9B ZGp1c3RDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5f ZWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCisKICAgICAgICAgaWYgKHRo aXMuX2FjdGl2ZSA9PT0gYWN0aXZlKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xNDMsNyAr MTQzLDcgQEAgV2ViSW5zcGVjdG9yLkRyYWdUb0FkanVzdENvbnRyb2xsZXIucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2RyYWdnaW5nID09PSBkcmFnZ2luZykKICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgCisKICAgICAgICAgY29uc29sZS5hc3NlcnQod2luZG93 LmV2ZW50KTsKICAgICAgICAgaWYgKGRyYWdnaW5nKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmVsZW1lbnREcmFnU3RhcnQodGhpcy5fZWxlbWVudCwgdGhpcywgdGhpcywgd2luZG93LmV2ZW50 LCAiY29sLXJlc2l6ZSIsIHdpbmRvdyk7CkBAIC0xNTcsNyArMTU3LDcgQEAgV2ViSW5zcGVjdG9y LkRyYWdUb0FkanVzdENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYg KHRoaXMuX3RyYWNrc01vdXNlQ2xpY2tBbmREcmFnID09PSB0cmFja3NNb3VzZUNsaWNrQW5kRHJh ZykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCisKICAgICAgICAgaWYgKHRyYWNrc01v dXNlQ2xpY2tBbmREcmFnKSB7CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5h ZGQoV2ViSW5zcGVjdG9yLkRyYWdUb0FkanVzdENvbnRyb2xsZXIuU3R5bGVDbGFzc05hbWUpOwog ICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMsIHRy dWUpOwpAQCAtMTY4LDcgKzE2OCw3IEBAIFdlYkluc3BlY3Rvci5EcmFnVG9BZGp1c3RDb250cm9s bGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVy KCJjb250ZXh0bWVudSIsIHRoaXMsIHRydWUpOwogICAgICAgICAgICAgdGhpcy5fc2V0RHJhZ2dp bmcoZmFsc2UpOwogICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAgIHRoaXMuX3RyYWNrc01v dXNlQ2xpY2tBbmREcmFnID0gdHJhY2tzTW91c2VDbGlja0FuZERyYWc7CiAgICAgfSwKIApAQCAt MTgwLDcgKzE4MCw3IEBAIFdlYkluc3BlY3Rvci5EcmFnVG9BZGp1c3RDb250cm9sbGVyLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9zZXRUcmFja3NNb3VzZUNsaWNrQW5kRHJhZyhjYW5C ZUFkanVzdGVkKTsKICAgICB9LAotICAgIAorCiAgICAgX21vdXNlTW92ZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKICAgICAgICAgdmFyIGNhbkJlQWRqdXN0ZWQgPSBldmVudC5hbHRLZXk7CkBA IC0xODksNyArMTg5LDcgQEAgV2ViSW5zcGVjdG9yLkRyYWdUb0FkanVzdENvbnRyb2xsZXIucHJv dG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3NldFRyYWNrc01vdXNlQ2xpY2tBbmREcmFnKGNh bkJlQWRqdXN0ZWQpOwogICAgIH0sCi0gICAgCisKICAgICBfbW91c2VXYXNQcmVzc2VkOiBmdW5j dGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX2xhc3RYID0gZXZlbnQuc2NyZWVuWDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFs L0VzcHJpbWEvZXNwcmltYS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0V4dGVybmFsL0VzcHJpbWEvZXNwcmltYS5qcwppbmRleCAwNjIxNDA0Li45NDFiMmQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9FeHRlcm5hbC9Fc3By aW1hL2VzcHJpbWEuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RXh0ZXJuYWwvRXNwcmltYS9lc3ByaW1hLmpzCkBAIC0zMiw3ICszMiw3IEBACiAqLwogCiAvLyBX ZWJLaXQgTW9kaWZpY2F0aW9uczoKLS8vIC0gVGhlIG9ubHkgZWRpdCBtYWRlIHRvIHRoaXMgZmls ZSBpcyB0aGUgdXNlICdXZWJJbnNwZWN0b3IuRXNwcmltYScgYXMgdGhlICdleHBvcnRzJyBvYmpl Y3QgZm9yIGVzcHJpbWEuIAorLy8gLSBUaGUgb25seSBlZGl0IG1hZGUgdG8gdGhpcyBmaWxlIGlz IHRoZSB1c2UgJ1dlYkluc3BlY3Rvci5Fc3ByaW1hJyBhcyB0aGUgJ2V4cG9ydHMnIG9iamVjdCBm b3IgZXNwcmltYS4KIC8vICAgVGhlIGNvZGUgdGhhdCBkZXRlcm1pbmVzIHRoZSBjb250ZXh0IGVz cHJpbWEgaXMgbG9hZGVkIGluIChub2RlLmpzLCB0aGUgYnJvd3NlciwgZXRjLikgaGFzIGJlZW4g cmVwbGFjZWQgd2l0aCBhIHJlZmVyZW5jZSB0byAnV2ViSW5zcGVjdG9yLkVzcHJpbWEnLgogV2Vi SW5zcGVjdG9yLkVzcHJpbWEgPSB7fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9BcHBsaWNhdGlvbkNhY2hlRnJh bWUuanMKaW5kZXggNGQ3NTg3NS4uNjAyMjk5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQXBwbGljYXRpb25D YWNoZUZyYW1lLmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNh Y2hlRnJhbWUgPSBmdW5jdGlvbihmcmFtZSwgbWFuaWZlc3QsIHN0YXR1cykKICAgICBjb25zb2xl LmFzc2VydChtYW5pZmVzdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hl TWFuaWZlc3QpOwogCiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwotICAgIAor CiAgICAgdGhpcy5fZnJhbWUgPSBmcmFtZTsKICAgICB0aGlzLl9tYW5pZmVzdCA9IG1hbmlmZXN0 OwogICAgIHRoaXMuX3N0YXR1cyA9IHN0YXR1czsKQEAgLTQxLDcgKzQxLDcgQEAgV2ViSW5zcGVj dG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZS5NYW5pZmVzdFVSTENvb2tpZUtleSA9ICJhcHBsaWNh dGlvbi1jYWNoZS1mcmEKIAogV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hl RnJhbWUsCi0gICAgCisKICAgICAvLyBQdWJsaWMKIAogICAgIGdldCBmcmFtZSgpCkBAIC01OCw3 ICs1OCw3IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWUucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1czsKICAgICB9LAotICAgIAorCiAg ICAgc2V0IHN0YXR1cyhzdGF0dXMpCiAgICAgewogICAgICAgICB0aGlzLl9zdGF0dXMgPSBzdGF0 dXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0FwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdC5qcwppbmRleCA5MTQ1 ODk5Li5lOWZkODk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9BcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3Qu anMKQEAgLTI2LDE3ICsyNiwxNyBAQAogV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5p ZmVzdCA9IGZ1bmN0aW9uKG1hbmlmZXN0VVJMKQogewogICAgIFdlYkluc3BlY3Rvci5PYmplY3Qu Y2FsbCh0aGlzKTsKLSAgICAKKwogICAgIHRoaXMuX21hbmlmZXN0VVJMID0gbWFuaWZlc3RVUkw7 CiB9OwogCiBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LnByb3RvdHlwZSA9 IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVz dCwKLSAgICAKKwogICAgIGdldCBtYW5pZmVzdFVSTCgpCiAgICAgewogICAgICAgICByZXR1cm4g dGhpcy5fbWFuaWZlc3RVUkw7Ci0gICAgfSAgICAKKyAgICB9CiB9OwogCiBXZWJJbnNwZWN0b3Iu QXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuT2JqZWN0LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9Db29raWVTdG9yYWdlT2JqZWN0LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Nvb2tpZVN0b3JhZ2VPYmplY3QuanMKaW5k ZXggZDFjYTk2ZS4uMGFlNjBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0Nvb2tpZVN0b3JhZ2VPYmplY3QuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Nvb2tpZVN0b3JhZ2VPYmplY3QuanMK QEAgLTM4LDcgKzM4LDcgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VPYmplY3QucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2hvc3Q7CiAgICAgfSwKLSAgICAK KwogICAgIHNhdmVJZGVudGl0eVRvQ29va2llOiBmdW5jdGlvbihjb29raWUpCiAgICAgewogICAg ICAgICBjb29raWVbV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VPYmplY3QuQ29va2llSG9zdENv b2tpZUtleV0gPSB0aGlzLmhvc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvRE9NU2VhcmNoTWF0Y2hPYmplY3QuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NU2VhcmNoTWF0Y2hPYmplY3QuanMK aW5kZXggNmJhMDQ1Ny4uNDZmMWQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVNlYXJjaE1hdGNoT2JqZWN0LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01TZWFyY2hNYXRjaE9iamVj dC5qcwpAQCAtNTYsNyArNTYsNyBAQCBXZWJJbnNwZWN0b3IuRE9NU2VhcmNoTWF0Y2hPYmplY3Qu cHJvdG90eXBlID0gewogCiAgICAgZ2V0IHRpdGxlKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0 aGlzLl90aXRsZTsgICAgIAorICAgICAgICByZXR1cm4gdGhpcy5fdGl0bGU7CiAgICAgfSwKIAog ICAgIGdldCBjbGFzc05hbWUoKQpAQCAtNzgsNyArNzgsNyBAQCBXZWJJbnNwZWN0b3IuRE9NU2Vh cmNoTWF0Y2hPYmplY3QucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvLyBQcml2YXRlCi0g ICAgCisKICAgICBfZ2VuZXJhdGVDbGFzc05hbWU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IHN3aXRjaCAodGhpcy5fZG9tTm9kZS5ub2RlVHlwZSgpKSB7CkBAIC0xMDksNyArMTA5LDcgQEAg V2ViSW5zcGVjdG9yLkRPTVNlYXJjaE1hdGNoT2JqZWN0LnRpdGxlRm9yRE9NTm9kZSA9IGZ1bmN0 aW9uKGRvbU5vZGUpCiAgICAgc3dpdGNoIChkb21Ob2RlLm5vZGVUeXBlKCkpIHsKICAgICBjYXNl IE5vZGUuRUxFTUVOVF9OT0RFOgogICAgICAgICB2YXIgdGl0bGUgPSAiPCIgKyBkb21Ob2RlLm5v ZGVOYW1lSW5Db3JyZWN0Q2FzZSgpOwotICAgICAgICAKKwogICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGRvbU5vZGUuYXR0cmlidXRlcygpLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB0 aXRsZSArPSAiICIgKyBkb21Ob2RlLmF0dHJpYnV0ZXMoKVtpXS5uYW1lOwogICAgICAgICAgICAg aWYgKGRvbU5vZGUuYXR0cmlidXRlcygpW2ldLnZhbHVlLmxlbmd0aCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9EYXRhYmFzZU9iamVjdC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9EYXRhYmFzZU9i amVjdC5qcwppbmRleCAwMTgxNTk3Li4zYjE3N2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRGF0YWJhc2VPYmplY3QuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RhdGFiYXNlT2JqZWN0Lmpz CkBAIC0zNyw3ICszNyw3IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZU9iamVjdC5OYW1lQ29va2ll S2V5ID0gImRhdGFiYXNlLW9iamVjdC1uYW1lIjsKIAogV2ViSW5zcGVjdG9yLkRhdGFiYXNlT2Jq ZWN0LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkRhdGFiYXNl T2JqZWN0LAotICAgIAorCiAgICAgLy8gUHVibGljCiAKICAgICBnZXQgaWQoKQpAQCAtNTQsMTIg KzU0LDEyIEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZU9iamVjdC5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICByZXR1cm4gdGhpcy5fbmFtZTsKICAgICB9LAotICAgIAorCiAgICAgZ2V0IHZl cnNpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ZlcnNpb247CiAgICAgfSwKLSAg ICAKKwogICAgIHNhdmVJZGVudGl0eVRvQ29va2llOiBmdW5jdGlvbihjb29raWUpCiAgICAgewog ICAgICAgICBjb29raWVbV2ViSW5zcGVjdG9yLkRhdGFiYXNlT2JqZWN0Lkhvc3RDb29raWVLZXld ID0gdGhpcy5ob3N0OwpAQCAtNzMsNyArNzMsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VPYmpl Y3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKCFlcnJvcikKICAgICAgICAgICAgICAg ICBjYWxsYmFjayhuYW1lcy5zb3J0KCkpOwogICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAg IERhdGFiYXNlQWdlbnQuZ2V0RGF0YWJhc2VUYWJsZU5hbWVzKHRoaXMuX2lkLCBzb3J0aW5nQ2Fs bGJhY2spOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9EYXRhYmFzZVRhYmxlT2JqZWN0LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RhdGFiYXNlVGFibGVPYmplY3QuanMKaW5kZXgg NWU2MWQyNS4uYTZhOGJhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0RhdGFiYXNlVGFibGVPYmplY3QuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RhdGFiYXNlVGFibGVPYmplY3QuanMKQEAg LTI2LDcgKzI2LDcgQEAKIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlT2JqZWN0ID0gZnVuY3Rp b24obmFtZSwgZGF0YWJhc2UpCiB7CiAgICAgY29uc29sZS5hc3NlcnQoZGF0YWJhc2UgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuRGF0YWJhc2VPYmplY3QpOwotICAgIAorCiAgICAgdGhpcy5fbmFt ZSA9IG5hbWU7CiAgICAgdGhpcy5fZGF0YWJhc2UgPSBkYXRhYmFzZTsKIH07CkBAIC0zNiwxMiAr MzYsMTIgQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVPYmplY3QuTmFtZUNvb2tpZUtleSA9 ICJkYXRhYmFzZS10YWJsZS1vYmplY3QtbmFtZSI7CiAKIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRh YmxlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkRh dGFiYXNlVGFibGVPYmplY3QsCi0gICAgCisKICAgICBnZXQgbmFtZSgpCiAgICAgewogICAgICAg ICByZXR1cm4gdGhpcy5fbmFtZTsKICAgICB9LAotICAgIAorCiAgICAgZ2V0IGRhdGFiYXNlKCkK ICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9kYXRhYmFzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9HcmFkaWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9HcmFkaWVudC5qcwppbmRleCAx MGFhM2Y2Li42Y2ExM2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvR3JhZGllbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0dyYWRpZW50LmpzCkBAIC0yOCw3ICsyOCw3IEBAIFdlYkluc3Bl Y3Rvci5HcmFkaWVudCA9IHsKICAgICAgICAgTGluZWFyOiAibGluZWFyLWdyYWRpZW50IiwKICAg ICAgICAgUmFkaWFsOiAicmFkaWFsLWdyYWRpZW50IgogICAgIH0sCi0gICAgCisKICAgICBmcm9t U3RyaW5nOiBmdW5jdGlvbihjc3NTdHJpbmcpCiAgICAgewogICAgICAgICB2YXIgdHlwZTsKQEAg LTg3LDEzICs4NywxMyBAQCBXZWJJbnNwZWN0b3IuR3JhZGllbnQgPSB7CiAgICAgICAgICAgICBn cmFkaWVudCA9IFdlYkluc3BlY3Rvci5MaW5lYXJHcmFkaWVudC5saW5lYXJHcmFkaWVudFdpdGhD b21wb25lbnRzKGNvbXBvbmVudHMpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBncmFkaWVu dCA9IFdlYkluc3BlY3Rvci5SYWRpYWxHcmFkaWVudC5yYWRpYWxHcmFkaWVudFdpdGhDb21wb25l bnRzKGNvbXBvbmVudHMpOwotICAgIAorCiAgICAgICAgIGlmIChncmFkaWVudCkKICAgICAgICAg ICAgIGdyYWRpZW50LnJlcGVhdHMgPSB0eXBlU3RyaW5nLmluZGV4T2YoInJlcGVhdGluZyIpID09 PSAwOwotICAgIAorCiAgICAgICAgIHJldHVybiBncmFkaWVudDsKICAgICB9LAotICAgIAorCiAg ICAgc3RvcHNXaXRoQ29tcG9uZW50czogZnVuY3Rpb24oY29tcG9uZW50cykKICAgICB7CiAgICAg ICAgIC8vIEZJWE1FOiBoYW5kbGUgbGVuZ3Rocy4KQEAgLTEyOSw3ICsxMjksNyBAQCBXZWJJbnNw ZWN0b3IuR3JhZGllbnQgPSB7CiAKICAgICAgICAgcmV0dXJuIHN0b3BzOwogICAgIH0sCi0gICAg CisKICAgICBzdHJpbmdGcm9tU3RvcHM6IGZ1bmN0aW9uKHN0b3BzKQogICAgIHsKICAgICAgICAg dmFyIGNvdW50ID0gc3RvcHMubGVuZ3RoIC0gMTsKQEAgLTI3Myw3ICsyNzMsNyBAQCBXZWJJbnNw ZWN0b3IuUmFkaWFsR3JhZGllbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgc3RyICs9ICIs ICI7CiAKICAgICAgICAgc3RyICs9IFdlYkluc3BlY3Rvci5HcmFkaWVudC5zdHJpbmdGcm9tU3Rv cHModGhpcy5zdG9wcyk7Ci0gICAgICAgIAorCiAgICAgICAgIHJldHVybiAodGhpcy5yZXBlYXRz ID8gInJlcGVhdGluZy0iIDogIiIpICsgdGhpcy50eXBlICsgIigiICsgc3RyICsgIikiOwogICAg IH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9Jc3N1ZU1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvSXNzdWVNZXNzYWdlLmpzCmluZGV4IDY4OTQxNzUuLjkzYTFjMzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Jc3N1ZU1lc3Nh Z2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0lz c3VlTWVzc2FnZS5qcwpAQCAtMjA3LDcgKzIwNyw3IEBAIFdlYkluc3BlY3Rvci5Jc3N1ZU1lc3Nh Z2UucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9wYXJhbWV0ZXJzKQog ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAKKwogICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdC50eXBlKHRoaXMuX3BhcmFtZXRlcnNbMF0pICE9PSAic3RyaW5nIikKICAg ICAgICAgICAgIHJldHVybjsKIApAQCAtMjE1LDE0ICsyMTUsMTQgQEAgV2ViSW5zcGVjdG9yLklz c3VlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBv YmouZGVzY3JpcHRpb247CiAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgdmFyIGZvcm1h dHRlcnMgPSB7fTsKICAgICAgICAgZm9ybWF0dGVycy5vID0gdmFsdWVGb3JtYXR0ZXI7CiAgICAg ICAgIGZvcm1hdHRlcnMucyA9IHZhbHVlRm9ybWF0dGVyOwogICAgICAgICBmb3JtYXR0ZXJzLmYg PSB2YWx1ZUZvcm1hdHRlcjsKICAgICAgICAgZm9ybWF0dGVycy5pID0gdmFsdWVGb3JtYXR0ZXI7 CiAgICAgICAgIGZvcm1hdHRlcnMuZCA9IHZhbHVlRm9ybWF0dGVyOwotICAgICAgICAKKwogICAg ICAgICBmdW5jdGlvbiBhcHBlbmQoYSwgYikKICAgICAgICAgewogICAgICAgICAgICAgYSArPSBi OwpAQCAtMjMxLDEwICsyMzEsMTAgQEAgV2ViSW5zcGVjdG9yLklzc3VlTWVzc2FnZS5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgdmFyIHJlc3VsdCA9IFN0cmluZy5mb3JtYXQodGhpcy5fcGFyYW1l dGVyc1swXS5kZXNjcmlwdGlvbiwgdGhpcy5fcGFyYW1ldGVycy5zbGljZSgxKSwgZm9ybWF0dGVy cywgIiIsIGFwcGVuZCk7CiAgICAgICAgIHZhciByZXN1bHRUZXh0ID0gcmVzdWx0LmZvcm1hdHRl ZFJlc3VsdDsKLSAgICAgICAgCisKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXN1bHQu dW51c2VkU3Vic3RpdHV0aW9ucy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHJlc3VsdFRleHQg Kz0gIiAiICsgcmVzdWx0LnVudXNlZFN1YnN0aXR1dGlvbnNbaV0uZGVzY3JpcHRpb247Ci0gICAg ICAgIAorCiAgICAgICAgIHRoaXMuX3RleHQgPSByZXN1bHRUZXh0OwogICAgIH0KIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3Vy Y2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3Vy Y2UuanMKaW5kZXggODI2NDFhOC4uM2VhOGFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcwpAQCAtNjY2LDcgKzY2 Niw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgd2lkdGg6IGltYWdlLndpZHRoLAogICAgICAgICAgICAgICAgIGhlaWdodDogaW1hZ2UuaGVp Z2h0CiAgICAgICAgICAgICB9OwotICAgICAgICAgICAgCisKICAgICAgICAgICAgIGNhbGxiYWNr KHRoaXMuX2ltYWdlU2l6ZSk7CiAgICAgICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0LmpzCmluZGV4IDE0ZmNjOGQuLmNi MDZmNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9TY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1NjcmlwdC5qcwpAQCAtMjA5LDcgKzIwOSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHQu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9LAogCi0gICAgX21ha2VT eW50YXhUcmVlOiBmdW5jdGlvbihzb3VyY2VUZXh0KSAKKyAgICBfbWFrZVN5bnRheFRyZWU6IGZ1 bmN0aW9uKHNvdXJjZVRleHQpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc2NyaXB0U3ludGF4 VHJlZSB8fCAhc291cmNlVGV4dCkKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlTG9jYXRp b24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNl Q29kZUxvY2F0aW9uLmpzCmluZGV4IGVlMzdiMjYuLjdkOTUzODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlTG9jYXRpb24u anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJj ZUNvZGVMb2NhdGlvbi5qcwpAQCAtMTkwLDcgKzE5MCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VD b2RlTG9jYXRpb24ucHJvdG90eXBlID0gewogCiAgICAgaGFzRGlmZmVyZW50RGlzcGxheUxvY2F0 aW9uOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgIHJldHVybiB0aGlzLmhhc01hcHBlZExvY2F0 aW9uKCkgfHwgdGhpcy5oYXNGb3JtYXR0ZWRMb2NhdGlvbigpOyAKKyAgICAgICByZXR1cm4gdGhp cy5oYXNNYXBwZWRMb2NhdGlvbigpIHx8IHRoaXMuaGFzRm9ybWF0dGVkTG9jYXRpb24oKTsKICAg ICB9LAogCiAgICAgdXBkYXRlOiBmdW5jdGlvbihzb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb2x1 bW5OdW1iZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvVGV4dE1hcmtlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9UZXh0TWFya2VyLmpzCmluZGV4IGU4MTlhZWYuLjhhMmUyMzUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UZXh0TWFya2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UZXh0 TWFya2VyLmpzCkBAIC00Nyw3ICs0Nyw3IEBAIFdlYkluc3BlY3Rvci5UZXh0TWFya2VyLnRleHRN YXJrZXJGb3JDb2RlTWlycm9yVGV4dE1hcmtlciA9IGZ1bmN0aW9uKGNvZGVNaXJyb3JUCiBXZWJJ bnNwZWN0b3IuVGV4dE1hcmtlci5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYklu c3BlY3Rvci5UZXh0TWFya2VyLAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9iamVjdC5w cm90b3R5cGUsCi0gICAgCisKICAgICAvLyBQdWJsaWMKIAogICAgIGdldCBjb2RlTWlycm9yVGV4 dE1hcmtlcigpCkBAIC03OCw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0TWFya2VyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIGVuZDogcmFuZ2UudG8KICAgICAgICAgfSk7CiAgICAgfSwK LSAgICAKKwogICAgIGNsZWFyOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9jb2Rl TWlycm9yVGV4dE1hcmtlci5jbGVhcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUGFnZU9ic2VydmVyLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUGFnZU9ic2VydmVyLmpzCmluZGV4IDll YTQxMTguLjFmMTM0YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL1BhZ2VPYnNlcnZlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9QYWdlT2JzZXJ2ZXIuanMKQEAgLTUyLDcgKzUyLDcg QEAgV2ViSW5zcGVjdG9yLlBhZ2VPYnNlcnZlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIuZnJhbWVEaWREZXRhY2goZnJhbWVJ ZCk7CiAgICAgfSwKLSAgICAKKwogICAgIGZyYW1lU3RhcnRlZExvYWRpbmc6IGZ1bmN0aW9uKGZy YW1lSWQpCiAgICAgewogICAgICAgICAvLyBOb3QgaGFuZGxlZCB5ZXQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hl RGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDQw MDE5YjEuLjVkMzlmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2Fj aGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC04OCwxNyArODgsMTcgQEAgV2ViSW5zcGVjdG9y LkFwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAg ICAgICByZXR1cm4gISF0aGlzLmFwcGxpY2F0aW9uQ2FjaGVGcmFtZTsKICAgICB9LAotICAgIAor CiAgICAgZ2V0IGFwcGxpY2F0aW9uQ2FjaGVGcmFtZSgpCiAgICAgewogICAgICAgICByZXR1cm4g dGhpcy5fYXBwbGljYXRpb25DYWNoZUZyYW1lOwogICAgIH0sCi0gICAgCisKICAgICBzZXQgYXBw bGljYXRpb25DYWNoZUZyYW1lKGFwcGxpY2F0aW9uQ2FjaGVGcmFtZSkKICAgICB7CiAgICAgICAg IGlmICh0aGlzLl9hcHBsaWNhdGlvbkNhY2hlRnJhbWUgPT09IGFwcGxpY2F0aW9uQ2FjaGVGcmFt ZSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCisKICAgICAgICAgdGhpcy5fYXBwbGlj YXRpb25DYWNoZUZyYW1lID0gYXBwbGljYXRpb25DYWNoZUZyYW1lOwogCiAgICAgICAgIHRoaXMu bmVlZHNSZWZyZXNoKCk7CkBAIC0xMTEsMjEgKzExMSwyMSBAQCBXZWJJbnNwZWN0b3IuQXBwbGlj YXRpb25DYWNoZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRo aXMuX2xvY2F0aW9uRnJhbWVVUkxSb3cudmFsdWUgPSB0aGlzLmFwcGxpY2F0aW9uQ2FjaGVGcmFt ZS5mcmFtZS51cmw7CiAgICAgICAgIHRoaXMuX2xvY2F0aW9uTWFuaWZlc3RVUkxSb3cudmFsdWUg PSB0aGlzLmFwcGxpY2F0aW9uQ2FjaGVGcmFtZS5tYW5pZmVzdC5tYW5pZmVzdFVSTDsKLSAgICAg ICAgCisKICAgICAgICAgdGhpcy5fcmVmcmVzaE9ubGluZVJvdygpOwogICAgICAgICB0aGlzLl9y ZWZyZXNoU3RhdHVzUm93KCk7CiAgICAgfSwKLSAgICAKKwogICAgIC8vIFByaXZhdGUKLSAgICAK KwogICAgIF9uZXR3b3JrU3RhdGVVcGRhdGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAg ICAgIGlmICghdGhpcy5hcHBsaWNhdGlvbkNhY2hlRnJhbWUpCiAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIAorCiAgICAgICAgIHRoaXMuX3JlZnJlc2hPbmxpbmVSb3coKTsKICAgICB9LAot ICAgIAorCiAgICAgX2ZyYW1lTWFuaWZlc3RTdGF0dXNDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkK ICAgICB7CiAgICAgICAgIGlmICghdGhpcy5hcHBsaWNhdGlvbkNhY2hlRnJhbWUpCkBAIC0xMzcs MTIgKzEzNywxMiBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURldGFpbHNTaWRlYmFy UGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3JlZnJlc2hTdGF0dXNSb3coKTsK ICAgICB9LAotICAgIAorCiAgICAgX3JlZnJlc2hPbmxpbmVSb3c6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX29ubGluZVJvdy52YWx1ZSA9IFdlYkluc3BlY3Rvci5hcHBsaWNhdGlv bkNhY2hlTWFuYWdlci5vbmxpbmUgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlllcyIpIDogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJObyIpOwogICAgIH0sCi0gICAgCisKICAgICBfcmVmcmVzaFN0 YXR1c1JvdzogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fc3RhdHVzUm93LnZhbHVl ID0gV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEZXRhaWxzU2lkZWJhclBhbmVsLlN0YXR1 c1t0aGlzLmFwcGxpY2F0aW9uQ2FjaGVGcmFtZS5zdGF0dXNdOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1l VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCA1OTA3NTA4Li43YWJj NTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVUcmVlRWxl bWVudC5qcwpAQCAtMzAsNyArMzAsNyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZy YW1lVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICBXZWJJbnNw ZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLkFwcGxpY2F0 aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50LlN0eWxlQ2xhc3NOYW1lLCAiIiwgIiIsIHJlcHJlc2Vu dGVkT2JqZWN0LCBmYWxzZSk7CiAKICAgICB0aGlzLnNtYWxsID0gdHJ1ZTsKLSAgICAKKwogICAg IHRoaXMudXBkYXRlVGl0bGVzKCk7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3RUcmVlRWxl bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxp Y2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVFbGVtZW50LmpzCmluZGV4IDJkNjRiNmQuLjlmODkzZGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Fw cGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVF bGVtZW50LmpzCkBAIC00MSw3ICs0MSw3IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hl TWFuaWZlc3RUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAoIXRo aXMuX25hbWUpCiAgICAgICAgICAgICB0aGlzLl9nZW5lcmF0ZVRpdGxlcygpOwotICAgIAorCiAg ICAgICAgIHJldHVybiB0aGlzLl9uYW1lOwogICAgIH0sCiAKQEAgLTQ5LDcgKzQ5LDcgQEAgV2Vi SW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fc2Vjb25kYXJ5TmFtZSkKICAgICAgICAgICAg IHRoaXMuX2dlbmVyYXRlVGl0bGVzKCk7Ci0gICAgICAgIAorCiAgICAgICAgIHJldHVybiB0aGlz Ll9zZWNvbmRhcnlOYW1lOwogICAgIH0sCiAKQEAgLTU3LDcgKzU3LDcgQEAgV2ViSW5zcGVjdG9y LkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFwcGxpY2F0aW9uIENhY2hl Iik7CiAgICAgfSwKLSAgICAKKwogICAgIF9nZW5lcmF0ZVRpdGxlczogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgdmFyIHBhcnNlZFVSTCA9IHBhcnNlVVJMKHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QubWFuaWZlc3RVUkwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQnV0dG9uTmF2aWdhdGlvbkl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwppbmRleCBi ZGJjMDA0Li40OWZiMTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcwpAQCAt MzIsMTAgKzMyLDEwIEBAIFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSA9IGZ1bmN0 aW9uKGlkZW50aWZpZXIsIHRvb2xUaXBPckxhYmVsLCBpbWFnZSwKICAgICB0aGlzLnRvb2xUaXAg PSB0b29sVGlwT3JMYWJlbDsKIAogICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi Y2xpY2siLCB0aGlzLl9tb3VzZUNsaWNrZWQuYmluZCh0aGlzKSk7Ci0gICAgCisKICAgICB0aGlz Ll9lbGVtZW50LnNldEF0dHJpYnV0ZSgicm9sZSIsIHJvbGUgfHwgImJ1dHRvbiIpOwotICAgIAot ICAgIGlmIChsYWJlbCkgCisKKyAgICBpZiAobGFiZWwpCiAgICAgICAgIHRoaXMuX2VsZW1lbnQu c2V0QXR0cmlidXRlKCJhcmlhLWxhYmVsIiwgbGFiZWwpOwogCiAgICAgdGhpcy5faW1hZ2VXaWR0 aCA9IGltYWdlV2lkdGggfHwgMTY7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db2xvclBpY2tlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbG9yUGlja2VyLmpzCmluZGV4IDNkNWZhMzQuLjY4OGU2 NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbG9yUGlja2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbG9yUGlja2VyLmpzCkBAIC02MSwxMiArNjEsMTIgQEAgV2ViSW5zcGVjdG9yLkNv bG9yUGlja2VyLnByb3RvdHlwZSA9IHsKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmpl Y3QucHJvdG90eXBlLAogCiAgICAgLy8gUHVibGljCi0gICAgCisKICAgICBnZXQgZWxlbWVudCgp CiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVudDsKICAgICB9LAotICAgIAorCiAg ICAgc2V0IGJyaWdodG5lc3MoYnJpZ2h0bmVzcykKICAgICB7CiAgICAgICAgIGlmIChicmlnaHRu ZXNzID09PSB0aGlzLl9icmlnaHRuZXNzKQpAQCAtNzcsNyArNzcsNyBAQCBXZWJJbnNwZWN0b3Iu Q29sb3JQaWNrZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVDb2xvcigpOwog ICAgICAgICB0aGlzLl91cGRhdGVTbGlkZXJzKHRoaXMuX2NvbG9yV2hlZWwucmF3Q29sb3IsIHRo aXMuX2NvbG9yV2hlZWwudGludGVkQ29sb3IpOwogICAgIH0sCi0gICAgCisKICAgICBzZXQgb3Bh Y2l0eShvcGFjaXR5KQogICAgIHsKICAgICAgICAgaWYgKG9wYWNpdHkgPT09IHRoaXMuX29wYWNp dHkpCkBAIC0xMjUsOSArMTI1LDkgQEAgV2ViSW5zcGVjdG9yLkNvbG9yUGlja2VyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgZWxzZSBpZiAoc2xpZGVyID09PSB0aGlzLl9icmlnaHRuZXNzU2xpZGVy KQogICAgICAgICAgICAgdGhpcy5icmlnaHRuZXNzID0gdmFsdWU7CiAgICAgfSwKLSAgICAKKwog ICAgIC8vIFByaXZhdGUKLSAgICAKKwogICAgIF91cGRhdGVDb2xvcjogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgaWYgKHRoaXMuX2RvbnRVcGRhdGVDb2xvcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbG9yV2hlZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2xvcldoZWVsLmpzCmluZGV4 IDg5ZjY0MzYuLjA2OGE2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NvbG9yV2hlZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sb3JXaGVlbC5qcwpAQCAtNjUsNyArNjUsNyBAQCBXZWJJ bnNwZWN0b3IuQ29sb3JXaGVlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2RyYXdSYXdD YW52YXMoKTsKICAgICAgICAgdGhpcy5fZHJhdygpOwogICAgIH0sCi0gICAgCisKICAgICBnZXQg ZWxlbWVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVudDsKQEAgLTk2LDcg Kzk2LDcgQEAgV2ViSW5zcGVjdG9yLkNvbG9yV2hlZWwucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9zZXRDcm9zc2hhaXJQb3NpdGlvbihkYXRhLnBvaW50KTsKICAgICAgICAgdGhpcy5icmln aHRuZXNzID0gZGF0YS5icmlnaHRuZXNzOwogICAgIH0sCi0gICAgCisKICAgICBnZXQgcmF3Q29s b3IoKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2Nyb3NzaGFpclBvc2l0aW9uKQpAQCAtMjQ5 LDcgKzI0OSw3IEBAIFdlYkluc3BlY3Rvci5Db2xvcldoZWVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIDEKICAgICAgICAgXSk7CiAgICAgfSwKLSAgICAKKwogICAgIF9kcmF3VGludGVkQ2Fu dmFzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgY3R4ID0gdGhpcy5fdGludGVkQ2Fu dmFzLmdldENvbnRleHQoIjJkIik7CkBAIC0yNjQsNyArMjY0LDcgQEAgV2ViSW5zcGVjdG9yLkNv bG9yV2hlZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIGN0eC5yZXN0b3JlKCk7 CiAgICAgfSwKLSAgICAKKwogICAgIF9kcmF3OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0 aGlzLl9kcmF3VGludGVkQ2FudmFzKCk7CkBAIC0yNzYsNyArMjc2LDcgQEAgV2ViSW5zcGVjdG9y LkNvbG9yV2hlZWwucHJvdG90eXBlID0gewogICAgICAgICBjdHguc2F2ZSgpOwogICAgICAgICBj dHguY2xlYXJSZWN0KDAsIDAsIGRpbWVuc2lvbiwgZGltZW5zaW9uKTsKICAgICAgICAgY3R4LmJl Z2luUGF0aCgpOwotICAgICAgICBjdHguYXJjKGRpbWVuc2lvbiAvIDIsIGRpbWVuc2lvbiAvIDIs IHJhZGl1cyArIDEsIDAsIE1hdGguUEkgKiAyLCB0cnVlKTsgCisgICAgICAgIGN0eC5hcmMoZGlt ZW5zaW9uIC8gMiwgZGltZW5zaW9uIC8gMiwgcmFkaXVzICsgMSwgMCwgTWF0aC5QSSAqIDIsIHRy dWUpOwogICAgICAgICBjdHguY2xvc2VQYXRoKCk7CiAgICAgICAgIGN0eC5jbGlwKCk7CiAgICAg ICAgIGN0eC5kcmF3SW1hZ2UodGhpcy5fdGludGVkQ2FudmFzLCAwLCAwLCBkaW1lbnNpb24sIGRp bWVuc2lvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldy5qcwppbmRl eCBjZTRjOWMzLi43MTA5NzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXBsZXRpb25TdWdnZXN0aW9u c1ZpZXcuanMKQEAgLTE1MSw3ICsxNTEsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcGxldGlvblN1Z2dl c3Rpb25zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBoZWlnaHQgPSBNYXRoLm1pbihj b250YWluZXJIZWlnaHQsIG1heGltdW1IZWlnaHQpOwogCiAgICAgICAgIC8vIFBvc2l0aW9uIHRo ZSBzdWdnZXN0aW9ucyBiZWxvdyB0aGUgYW5jaG9yLiBJZiB0aGVyZSBpcyBubyByb29tLCBwb3Np dGlvbiB0aGUgc3VnZ2VzdGlvbnMgYWJvdmUuCi0gICAgICAgIGlmICh1bmRlckhlaWdodCAtIGhl aWdodCA8IDApIAorICAgICAgICBpZiAodW5kZXJIZWlnaHQgLSBoZWlnaHQgPCAwKQogICAgICAg ICAgICAgeSA9IGFib3ZlSGVpZ2h0IC0gaGVpZ2h0OwogCiAgICAgICAgIHRoaXMuX2VsZW1lbnQu c3R5bGUubGVmdCA9IHggKyAicHgiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZUNvbW1hbmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlQ29tbWFuZC5qcwppbmRleCBhNWNmN2Ew Li44YWY5NDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db25zb2xlQ29tbWFuZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db25zb2xlQ29tbWFuZC5qcwpAQCAtODksNyArODksNyBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZUNvbW1hbmQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9mb3Jt YXR0ZWRDb21tYW5kLmNsYXNzTmFtZSA9ICJjb25zb2xlLW1lc3NhZ2UtdGV4dCBzb3VyY2UtY29k ZSI7CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZENvbW1hbmQudGV4dENvbnRlbnQgPSB0aGlzLmNv bW1hbmQ7CiAgICAgfSwKLSAgICAKKwogICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbihp c1ByZWZpeE9wdGlvbmFsKQogICAgIHsKICAgICAgICAgcmV0dXJuIChpc1ByZWZpeE9wdGlvbmFs ID8gIiIgOiAiPiAiKSArIHRoaXMuY29tbWFuZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzCmluZGV4IGM1 MTJiZTkuLjUwODFiNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVByb21wdC5qcwpAQCAtMTU4LDcgKzE1OCw3IEBA IFdlYkluc3BlY3Rvci5Db25zb2xlUHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg Ly8gUHJpdmF0ZQotICAgIAorCiAgICAgX2hhbmRsZUVzY2FwZUtleTogZnVuY3Rpb24oY29kZU1p cnJvcikKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Rmxvd1RyZWVFbGVtZW50 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEZs b3dUcmVlRWxlbWVudC5qcwppbmRleCA3NjZmZjdlLi4yNDY5ZGJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Rmxvd1RyZWVFbGVt ZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnRlbnRGbG93VHJlZUVsZW1lbnQuanMKQEAgLTEyLDcgKzEyLDcgQEAKICAqICAgIGNvcHlyaWdo dCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nCiAgKiAg ICBkaXNjbGFpbWVyIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMK ICAqICAgIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqIAorICoKICAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVIgIkFTIElTIiBBTkQg QU5ZCiAgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFRIRQogICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlVHJlZUVsZW1lbnQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdl VHJlZUVsZW1lbnQuanMKaW5kZXggMTVjOTkzNy4uMjQ5YjI4YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZVRyZWVFbGVt ZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nv b2tpZVN0b3JhZ2VUcmVlRWxlbWVudC5qcwpAQCAtMjYsNyArMjYsNyBAQAogV2ViSW5zcGVjdG9y LkNvb2tpZVN0b3JhZ2VUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0KQog ewogICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLkNvb2tpZVN0b3JhZ2VPYmplY3QpOwotICAgIAorCiAgICAgV2ViSW5zcGVjdG9yLlN0 b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlVHJl ZUVsZW1lbnQuQ29va2llSWNvblN0eWxlQ2xhc3NOYW1lLCBXZWJJbnNwZWN0b3IuZGlzcGxheU5h bWVGb3JIb3N0KHJlcHJlc2VudGVkT2JqZWN0Lmhvc3QpLCByZXByZXNlbnRlZE9iamVjdCk7CiB9 OwogCkBAIC0zNCwxNCArMzQsMTQgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VUcmVlRWxl bWVudC5Db29raWVJY29uU3R5bGVDbGFzc05hbWUgPSAiY29va2llLWljb24iOwogCiBXZWJJbnNw ZWN0b3IuQ29va2llU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1 Y3RvcjogV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VUcmVlRWxlbWVudCwKLSAgICAKKwogICAg IC8vIFB1YmxpYwotICAgIAorCiAgICAgZ2V0IG5hbWUoKQogICAgIHsKICAgICAgICAgcmV0dXJu IHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaG9zdDsKICAgICB9LAotICAgIAorCiAgICAgZ2V0IGNh dGVnb3J5TmFtZSgpCiAgICAgewogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJDb29raWVzIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9FdmVudExpc3RlbmVyU2VjdGlvbkdyb3VwLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRXZlbnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5qcwpp bmRleCAyZDhlYzkwLi40YjdjNGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FdmVudExpc3RlbmVyU2VjdGlvbkdyb3VwLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0V2ZW50TGlzdGVuZXJTZWN0 aW9uR3JvdXAuanMKQEAgLTcwLDcgKzcwLDcgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJT ZWN0aW9uR3JvdXAucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIGZ1bmN0aW9uTmFtZSA9 IG1hdGNoWzFdOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdmFyIGFub255bW91cyA9 IHRydWU7Ci0gICAgICAgICAgICB2YXIgZnVuY3Rpb25OYW1lID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIoYW5vbnltb3VzIGZ1bmN0aW9uKSIpOyAgICAgICAgCisgICAgICAgICAgICB2YXIgZnVu Y3Rpb25OYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIoYW5vbnltb3VzIGZ1bmN0aW9uKSIp OwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9ldmVudExpc3RlbmVyLmxvY2F0aW9u KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv R2VuZXJhbFRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudFBhdGhDb21wb25lbnQuanMK aW5kZXggODM3MDgzOS4uZGI0YTk1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJl ZUVsZW1lbnRQYXRoQ29tcG9uZW50LmpzCkBAIC02Myw5ICs2Myw5IEBAIFdlYkluc3BlY3Rvci5H ZW5lcmFsVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50KG5l eHRTaWJsaW5nKTsKICAgICB9LAotICAgIAorCiAgICAgLy8gUHJpdmF0ZQotICAgIAorCiAgICAg X21haW5UaXRsZURpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlz LmRpc3BsYXlOYW1lID0gdGhpcy5fZ2VuZXJhbFRyZWVFbGVtZW50Lm1haW5UaXRsZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dvVG9MaW5l RGlhbG9nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR29U b0xpbmVEaWFsb2cuanMKaW5kZXggMThkYmQzNS4uZjRlM2NhNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFs b2cuanMKQEAgLTEyMSw3ICsxMjEsNyBAQCBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cucHJv dG90eXBlID0gewogICAgICAgICAgICAgdmFyIHZhbHVlSXNWYWxpZCA9IGZhbHNlOwogICAgICAg ICAgICAgaWYgKHRoaXMuZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuZGVsZWdhdGUuaXNHb1RvTGlu ZURpYWxvZ1ZhbHVlVmFsaWQgPT09ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICAgICAgdmFsdWVJ c1ZhbGlkID0gdGhpcy5kZWxlZ2F0ZS5pc0dvVG9MaW5lRGlhbG9nVmFsdWVWYWxpZCh0aGlzLCB2 YWx1ZSk7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYgKHZhbHVlSXNWYWxpZCAmJiB0 aGlzLmRlbGVnYXRlICYmIHR5cGVvZiB0aGlzLmRlbGVnYXRlLmdvVG9MaW5lRGlhbG9nVmFsdWVX YXNWYWxpZGF0ZWQgPT09ICJmdW5jdGlvbiIpIHsKICAgICAgICAgICAgICAgICB0aGlzLmRlbGVn YXRlLmdvVG9MaW5lRGlhbG9nVmFsdWVXYXNWYWxpZGF0ZWQodGhpcywgdmFsdWUpOwogICAgICAg ICAgICAgICAgIHRoaXMuZGlzbWlzcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGF0YUdyaWROb2RlLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGF0YUdyaWROb2Rl LmpzCmluZGV4IDRmOTM4YTMuLjcxN2I4NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURhdGFHcmlkTm9kZS5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEYXRhR3Jp ZE5vZGUuanMKQEAgLTEwNiw3ICsxMDYsNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGF0YUdy aWROb2RlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgbGFiZWwgPSB0aGlzLl9tYWtlT3V0 bGV0KCJsYWJlbCIsIGZyYWdtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InNwYW4iKSkpOwogICAgICAgICBsYWJlbC5jbGFzc05hbWUgPSAibGFiZWwiOwotICAgIAorCiAg ICAgICAgIHZhciBuYW1lTGFiZWwgPSB0aGlzLl9tYWtlT3V0bGV0KCJuYW1lTGFiZWwiLCBsYWJl bC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpKTsKICAgICAgICAg bmFtZUxhYmVsLmNsYXNzTmFtZSA9ICJuYW1lIjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlU2lkZWJhclBhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlU2lkZWJh clBhbmVsLmpzCmluZGV4IDNhNDU4YzkuLjhmNjQ1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZVNpZGViYXJQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVT aWRlYmFyUGFuZWwuanMKQEAgLTI5MCw3ICsyOTAsNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVl U2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9jaGlsZExheWVyc1Jv dy5kYXRhR3JpZCA9ICFpc0VtcHR5T2JqZWN0KGNoaWxkTGF5ZXJzKSA/IHRoaXMuX2RhdGFHcmlk IDogbnVsbDsKICAgICB9LAotICAgIAorCiAgICAgX2RhdGFHcmlkTm9kZUZvckxheWVyOiBmdW5j dGlvbihsYXllcikKICAgICB7CiAgICAgICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rvci5M YXllclRyZWVEYXRhR3JpZE5vZGUobGF5ZXIpOwpAQCAtMjk5LDcgKzI5OSw3IEBAIFdlYkluc3Bl Y3Rvci5MYXllclRyZWVTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHJldHVy biBub2RlOwogICAgIH0sCi0gICAgCisKICAgICBfdXBkYXRlTWV0cmljczogZnVuY3Rpb24obGF5 ZXJGb3JOb2RlLCBjaGlsZExheWVycykKICAgICB7CiAgICAgICAgIHZhciBsYXllckNvdW50ID0g MDsKQEAgLTM1OSw3ICszNTksNyBAQCBXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlU2lkZWJhclBhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIGNvbnRlbnQuY2xhc3NOYW1lID0gImxheWVyLXRy ZWUtcG9wb3ZlciI7Ci0gICAgICAgIAorCiAgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgicCIpKS50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiUmVhc29ucyBmb3IgY29tcG9zaXRpbmc6Iik7CiAKICAgICAgICAgdmFyIGxpc3QgPSBj b250ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInVsIikpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dD b250ZW50Vmlldy5qcwppbmRleCAzZTZjZWU0Li40Mzg0OWNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmll dy5qcwpAQCAtMjMzLDcgKzIzMyw3IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBpbmRleCA9IHRoaXMuX3NlbGVjdGVkU2VhcmNoTWF0Y2gg PyB0aGlzLl9zZWFyY2hNYXRjaGVzLmluZGV4T2YodGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRjaCkg OiB0aGlzLl9zZWFyY2hNYXRjaGVzLmxlbmd0aDsKICAgICAgICAgdGhpcy5faGlnaGxpZ2h0U2Vh cmNoTWF0Y2hBdEluZGV4KGluZGV4IC0gMSk7CiAgICAgfSwKLSAgICAKKwogICAgIGhpZ2hsaWdo dE5leHRTZWFyY2hNYXRjaDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLnNl YXJjaEluUHJvZ3Jlc3MgfHwgaXNFbXB0eU9iamVjdCh0aGlzLl9zZWFyY2hNYXRjaGVzKSkKQEAg LTg1OCw3ICs4NTgsNyBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgdGhpcy5fcGVyZm9ybVNlYXJjaCgpOwogICAgIH0sCi0gICAgCisK ICAgICBfcGVyZm9ybVNlYXJjaDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCFpc0Vt cHR5T2JqZWN0KHRoaXMuX3NlYXJjaEhpZ2hsaWdodERPTUNoYW5nZXMpKQpAQCAtOTA0LDEzICs5 MDQsMTMgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9zZWxlY3RlZFNlYXJjaE1hdGNoOwogICAgICAgICB9CiAgICAg fSwKLSAgICAKKwogICAgIF9oaWdobGlnaHRSYW5nZXM6IGZ1bmN0aW9uKG1lc3NhZ2UsIG1hdGNo UmFuZ2VzKQogICAgIHsKICAgICAgICAgdmFyIGhpZ2hsaWdodGVkRWxlbWVudHMgPSBXZWJJbnNw ZWN0b3IuaGlnaGxpZ2h0UmFuZ2VzV2l0aFN0eWxlQ2xhc3MobWVzc2FnZSwgbWF0Y2hSYW5nZXMs IFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5IaWdobGlnaHRlZFN0eWxlQ2xhc3NOYW1lLCB0 aGlzLl9zZWFyY2hIaWdobGlnaHRET01DaGFuZ2VzKTsKIAogICAgICAgICBjb25zb2xlLmFzc2Vy dChoaWdobGlnaHRlZEVsZW1lbnRzLmxlbmd0aCA9PT0gbWF0Y2hSYW5nZXMubGVuZ3RoKTsKLSAg ICAgICAgCisKICAgICAgICAgbWF0Y2hSYW5nZXMuZm9yRWFjaChmdW5jdGlvbiAocmFuZ2UsIGlu ZGV4KSB7CiAgICAgICAgICAgICB0aGlzLl9zZWFyY2hNYXRjaGVzLnB1c2goewogICAgICAgICAg ICAgICAgIG1lc3NhZ2U6IG1lc3NhZ2UsCkBAIC05MjcsNyArOTI3LDcgQEAgV2ViSW5zcGVjdG9y LkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAgICAgICAgfSwg dGhpcyk7CiAgICAgfSwKLSAgICAKKwogICAgIF9yYW5nZXNPdmVybGFwOiBmdW5jdGlvbihyYW5n ZTEsIHJhbmdlMikKICAgICB7CiAgICAgICAgIHJldHVybiByYW5nZTEub2Zmc2V0IDw9IHJhbmdl Mi5vZmZzZXQgKyByYW5nZTIubGVuZ3RoICYmIHJhbmdlMi5vZmZzZXQgPD0gcmFuZ2UxLm9mZnNl dCArIHJhbmdlMS5sZW5ndGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcwppbmRleCBjMTJhN2U1Li44M2Q5 N2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OYXZpZ2F0aW9uQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKQEAgLTI5LDcgKzI5LDcgQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25CYXIgPSBmdW5jdGlvbihlbGVtZW50LCBuYXZpZ2F0aW9uSXRlbXMsIHJvbGUs IGxhYmVsKSB7CiAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQgfHwgZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKHRoaXMuY29u c3RydWN0b3IuU3R5bGVDbGFzc05hbWUgfHwgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXIuU3R5 bGVDbGFzc05hbWUpOwogICAgIHRoaXMuX2VsZW1lbnQudGFiSW5kZXggPSAwOwotICAgIAorCiAg ICAgaWYgKHJvbGUpCiAgICAgICAgIHRoaXMuX2VsZW1lbnQuc2V0QXR0cmlidXRlKCJyb2xlIiwg cm9sZSk7CiAgICAgaWYgKGxhYmVsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uSXRlbS5qcwppbmRleCA1OWQwOTlk Li4xNTU3OTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OYXZpZ2F0aW9uSXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uSXRlbS5qcwpAQCAtMzAsOCArMzAsOCBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvbkl0ZW0gPSBmdW5jdGlvbihpZGVudGlmaWVyLCByb2xlLCBsYWJl bCkgewogCiAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuX2hpZGRlbiA9IGZhbHNlOwotICAgIAotICAgIGlmIChyb2xlKSAKKworICAg IGlmIChyb2xlKQogICAgICAgICB0aGlzLl9lbGVtZW50LnNldEF0dHJpYnV0ZSgicm9sZSIsIHJv bGUpOwogICAgIGlmIChsYWJlbCkKICAgICAgICAgdGhpcy5fZWxlbWVudC5zZXRBdHRyaWJ1dGUo ImFyaWEtbGFiZWwiLCBsYWJlbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRl YmFyUGFuZWwuanMKaW5kZXggNWZlZWUxZS4uMjIwNTE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMzgwLDcgKzM4MCw3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAg IGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIAorCiAgICAgICAg IC8vIEhpZGUgdGhlIHNlY3Rpb24gaWYgd2UncmUgbm90IGRlYWxpbmcgd2l0aCBhbiBpbWFnZSBv ciBpZiB0aGUgbG9hZCBmYWlsZWQuCiAgICAgICAgIGlmIChyZXNvdXJjZS50eXBlICE9PSBXZWJJ bnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5JbWFnZSB8fCByZXNvdXJjZS5mYWlsZWQpIHsKICAgICAg ICAgICAgIHZhciBpbWFnZVNlY3Rpb25FbGVtZW50ID0gdGhpcy5faW1hZ2VTaXplU2VjdGlvbi5l bGVtZW50OwpAQCAtMzg4LDEwICszODgsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlRGV0YWls c1NpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50 LnJlbW92ZUNoaWxkKGltYWdlU2VjdGlvbkVsZW1lbnQpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAgIC8vIEVuc3VyZSB0aGUgc2VjdGlvbiBpcyBk aXNwbGF5ZWQsIHJpZ2h0IGJlZm9yZSB0aGUgIkxvY2F0aW9uIiBzZWN0aW9uLgogICAgICAgICB0 aGlzLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2ltYWdlU2l6ZVNlY3Rpb24uZWxlbWVudCwg dGhpcy5fbG9jYXRpb25TZWN0aW9uLmVsZW1lbnQpOwotICAgICAgICAKKwogICAgICAgICAvLyBH ZXQgdGhlIG1ldHJpY3MgZm9yIHRoaXMgcmVzb3VyY2UgYW5kIGZpbGwgaW4gdGhlIG1ldHJpY3Mg cm93cyB3aXRoIHRoYXQgaW5mb3JtYXRpb24uCiAgICAgICAgIHJlc291cmNlLmdldEltYWdlU2l6 ZShmdW5jdGlvbihzaXplKSB7CiAgICAgICAgICAgICB0aGlzLl9pbWFnZVdpZHRoUm93LnZhbHVl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlZnB4IikuZm9ybWF0KHNpemUud2lkdGgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVC YXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJh ci5qcwppbmRleCBiMzQxZDlmLi5lYmRjNDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcwpAQCAtOTEsNyArOTEsNyBA QCBXZWJJbnNwZWN0b3IuU2NvcGVCYXIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvLyBQ cml2YXRlCi0gICAgCisKICAgICBfcG9wdWxhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IHZhciBpdGVtOwpAQCAtMTA2LDcgKzEwNiw3IEBAIFdlYkluc3BlY3Rvci5TY29wZUJhci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy5zZWxlY3RlZEl0ZW1zLmxlbmd0aCAmJiB0aGlz Ll9kZWZhdWx0SXRlbSkKICAgICAgICAgICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0g dHJ1ZTsKICAgICB9LAotICAgIAorCiAgICAgX2l0ZW1TZWxlY3Rpb25EaWRDaGFuZ2U6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHNlbmRlciA9IGV2ZW50LnRhcmdldDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3Bl QmFySXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nj b3BlQmFySXRlbS5qcwppbmRleCA2YWQyODYzLi40ZGVmNTdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpz CkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5TY29wZUJhckl0ZW0gPSBmdW5jdGlvbihp ZCwgbGFiZWwsIGlzRXhjbHVzaXZlKSB7CiAgICAgdGhpcy5pZCA9IGlkOwogICAgIHRoaXMubGFi ZWwgPSBsYWJlbDsKICAgICB0aGlzLmlzRXhjbHVzaXZlID0gaXNFeGNsdXNpdmU7Ci0gICAgCisK ICAgICB0aGlzLl9zZWxlY3RlZFNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInNj b3BlYmFyaXRlbS0iICsgaWQsIGZhbHNlKTsKIAogICAgIHRoaXMuX21hcmtFbGVtZW50U2VsZWN0 ZWQodGhpcy5fc2VsZWN0ZWRTZXR0aW5nLnZhbHVlKTsKQEAgLTU0LDcgKzU0LDcgQEAgV2ViSW5z cGVjdG9yLlNjb3BlQmFySXRlbS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgcmV0 dXJuIHRoaXMuX2VsZW1lbnQ7CiAgICAgfSwKLSAgICAKKwogICAgIGdldCBzZWxlY3RlZCgpCiAg ICAgewogICAgICAgICByZXR1cm4gdGhpcy5fc2VsZWN0ZWRTZXR0aW5nLnZhbHVlOwpAQCAtNjQs NyArNjQsNyBAQCBXZWJJbnNwZWN0b3IuU2NvcGVCYXJJdGVtLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHRoaXMuc2V0U2VsZWN0ZWQoc2VsZWN0ZWQsIGZhbHNlKTsKICAgICB9LAotICAg IAorCiAgICAgc2V0U2VsZWN0ZWQ6IGZ1bmN0aW9uKHNlbGVjdGVkLCB3aXRoTW9kaWZpZXIpCiAg ICAgewogICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRTZXR0aW5nLnZhbHVlID09PSBzZWxlY3Rl ZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5k ZXggMzg3OGJiNi4uYWU5ZmRjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFp bHNTaWRlYmFyUGFuZWwuanMKQEAgLTI3LDcgKzI3LDcgQEAgV2ViSW5zcGVjdG9yLlNjb3BlQ2hh aW5EZXRhaWxzU2lkZWJhclBhbmVsID0gZnVuY3Rpb24oKSB7CiAgICAgV2ViSW5zcGVjdG9yLkRl dGFpbHNTaWRlYmFyUGFuZWwuY2FsbCh0aGlzLCAic2NvcGUtY2hhaW4iLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlNjb3BlIENoYWluIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NvcGUgQ2hh aW4iKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbVZhcmlhYmxlLnN2ZyIsICI1Iik7CiAKICAgICB0 aGlzLl9jYWxsRnJhbWUgPSBudWxsOwotICAgIAorCiAgICAgLy8gVXBkYXRlIG9uIGNvbnNvbGUg cHJvbXB0IGV2YWwgYXMgb2JqZWN0cyBpbiB0aGUgc2NvcGUgY2hhaW4gbWF5IGhhdmUgY2hhbmdl ZC4KICAgICBXZWJJbnNwZWN0b3IucnVudGltZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuUnVudGltZU1hbmFnZXIuRXZlbnQuRGlkRXZhbHVhdGUsIHRoaXMubmVlZHNSZWZy ZXNoLCB0aGlzKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2Rl LmpzCmluZGV4IGVhOGRiNWQuLjg4MTEzMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVs aW5lRGF0YUdyaWROb2RlLmpzCkBAIC04OCw3ICs4OCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRU aW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fcmFuZ2VT dGFydFRpbWUgPSBzdGFydFRpbWU7CiAgICAgICAgIHRoaXMuX3JhbmdlRW5kVGltZSA9IGVuZFRp bWU7Ci0gICAgICAgIAorCiAgICAgICAgIC8vIElmIHdlIGhhdmUgbm8gZHVyYXRpb24gdGhlIHJh bmdlIGRvZXMgbm90IG1hdHRlci4KICAgICAgICAgaWYgKCF0aGlzLl9yZWNvcmQuZHVyYXRpb24p CiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50LmpzCmluZGV4IDcw MjNiYjEuLjkyMGNmYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50LmpzCkBAIC0yNiw3ICsy Niw3IEBACiBXZWJJbnNwZWN0b3IuU2NyaXB0VHJlZUVsZW1lbnQgPSBmdW5jdGlvbihzY3JpcHQp CiB7CiAgICAgY29uc29sZS5hc3NlcnQoc2NyaXB0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNj cmlwdCk7Ci0gICAgCisKICAgICBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRyZWVFbGVtZW50LmNh bGwodGhpcywgc2NyaXB0LCBXZWJJbnNwZWN0b3IuU2NyaXB0VHJlZUVsZW1lbnQuU3R5bGVDbGFz c05hbWUsIG51bGwsIG51bGwsIHNjcmlwdCwgZmFsc2UpOwogCiAgICAgdGhpcy5tYWluVGl0bGUg PSBzY3JpcHQuZGlzcGxheU5hbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hCYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hCYXIuanMKaW5kZXggMGY5MWY0Mi4uODVkNDRkYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Vh cmNoQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NlYXJjaEJhci5qcwpAQCAtNzYsNyArNzYsNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQmFyLnBy b3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5TZWFyY2hCYXIuRXZlbnQuVGV4dENoYW5nZWQpOwogICAgIH0sCi0gICAg CisKICAgICBfaGFuZGxlS2V5ZG93bkV2ZW50OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAg ICAgIGlmICh0aGlzLl9rZXlib2FyZFNob3J0Y3V0RXNjLm1hdGNoZXNFdmVudChldmVudCkpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl YXJjaFJlc3VsdFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuanMKaW5kZXggZDY2OGQwZi4uOTAx YTBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuanMKQEAgLTU0LDcg KzU0LDcgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaFJlc3VsdFRyZWVFbGVtZW50LnRydW5jYXRlQW5k SGlnaGxpZ2h0VGl0bGUgPSBmdW5jdGlvbih0aXRsZSwKIHsKICAgICAvLyBVc2UgdGhlIG9yaWdp bmFsIGxvY2F0aW9uLCBzaW5jZSB0aG9zZSBsaW5lL2NvbHVtbiBvZmZzZXRzIG1hdGNoIHRoZSBs aW5lIHRleHQgaW4gdGl0bGUuCiAgICAgdmFyIHRleHRSYW5nZSA9IHNvdXJjZUNvZGVUZXh0UmFu Z2UudGV4dFJhbmdlOwotICAgIAorCiAgICAgdmFyIHNlYXJjaFRlcm1JbmRleCA9IHRleHRSYW5n ZS5zdGFydENvbHVtbjsKIAogICAgIC8vIFdlIHNob3VsZCBvbmx5IGhhdmUgb25lIGxpbmUgdGV4 dCByYW5nZXMsIHNvIG1ha2Ugc3VyZSB0aGF0IGlzIHRoZSBjYXNlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2xpZGVyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2xpZGVyLmpzCmluZGV4IGE0YTIw NmUuLjhjNDgyOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NsaWRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TbGlkZXIuanMKQEAgLTQyLDE5ICs0MiwxOSBAQCBXZWJJbnNwZWN0b3IuU2xp ZGVyLktub2JXaWR0aCA9IDEzOwogV2ViSW5zcGVjdG9yLlNsaWRlci5wcm90b3R5cGUgPSB7CiAg ICAgY29udHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlNsaWRlciwKICAgICBfX3Byb3RvX186IFdlYklu c3BlY3Rvci5PYmplY3QucHJvdG90eXBlLAotICAgIAorCiAgICAgLy8gUHVibGljCiAKICAgICBn ZXQgZWxlbWVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVudDsKICAgICB9 LAotICAgIAorCiAgICAgZ2V0IHZhbHVlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl92 YWx1ZTsKICAgICB9LAotICAgIAorCiAgICAgc2V0IHZhbHVlKHZhbHVlKQogICAgIHsKICAgICAg ICAgdmFsdWUgPSBNYXRoLm1heChNYXRoLm1pbih2YWx1ZSwgMSksIDApOwpAQCAtNzAsNyArNzAs NyBAQCBXZWJJbnNwZWN0b3IuU2xpZGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMu ZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuZGVsZWdhdGUuc2xpZGVyVmFsdWVEaWRDaGFuZ2UgPT09 ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICB0aGlzLmRlbGVnYXRlLnNsaWRlclZhbHVlRGlkQ2hh bmdlKHRoaXMsIHZhbHVlKTsKICAgICB9LAotICAgIAorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAg ICBoYW5kbGVFdmVudDogZnVuY3Rpb24oZXZlbnQpCg==