145334 2015-05-22 20:41:23 -0700 Web Inspector: Inline use once class names and remove some unused class names 2015-05-22 23:27:40 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1097038 0 joepeck 2015-05-22 20:41:23 -0700 * SUMMARY Inline use once class names and remove some unused class names. This won't cover everything 100%, but it covers a lot of the really obvious cases that could benefit from inlining. 1097039 1 253629 joepeck 2015-05-22 20:42:13 -0700 Created attachment 253629 [PATCH] Proposed Fix 1097068 2 253629 commit-queue 2015-05-22 23:27:36 -0700 Comment on attachment 253629 [PATCH] Proposed Fix Clearing flags on attachment: 253629 Committed r184819: <http://trac.webkit.org/changeset/184819> 1097069 3 commit-queue 2015-05-22 23:27:40 -0700 All reviewed patches have been landed. Closing bug. 253629 2015-05-22 20:42:13 -0700 2015-05-22 23:27:36 -0700 [PATCH] Proposed Fix StyleClassNames.patch text/plain 64925 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ3YjNjZTguLmVjMzJiNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDg4IEBACiAyMDE1LTA1LTIyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5saW5l IHVzZSBvbmNlIGNsYXNzIG5hbWVzIGFuZCByZW1vdmUgc29tZSB1bnVzZWQgY2xhc3MgbmFtZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTMzNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldyk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24pOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DbHVzdGVyQ29udGVudFZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ2x1c3RlckNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVQ cm9tcHQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudEZsb3dUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Db250ZW50Rmxvd1RyZWVFbGVtZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3 KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVyKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VUcmVlRWxlbWVudCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVl Q29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGFzaGJvYXJkVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXNoYm9hcmRWaWV3KToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyRGFzaGJvYXJkVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJEYXNoYm9hcmRWaWV3LnByb3RvdHlwZS5fcmVidWlsZExvY2F0aW9uKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRldGFpbHNTZWN0aW9uKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Rl dGFpbHNTZWN0aW9uU2ltcGxlUm93LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Rm9udFJlc291cmNlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9udFJl c291cmNlQ29udGVudFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5jcmVhdGVNZXRyaWNFbGVtZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Gb250UmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUuY29udGVudEF2YWlsYWJs ZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9IaWVyYXJjaGljYWxQYXRoQ29tcG9u ZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQucHJvdG90 eXBlLnNldCBzZWxlY3RvckFycm93cyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9J bmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGgpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanM6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvUmVwbGF5RGFzaGJvYXJkVmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdENvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1l bGluZU92ZXJ2aWV3R3JhcGgpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dENv bnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRDb250ZW50Vmlldyk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdHcmFwaCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZVJlY29yZEJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZEJhcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEZyYW1l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkRnJhbWUpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3KToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVSdWxlci5wcm90b3R5cGUuc2V0IGFsbG93c1RpbWVSYW5nZVNlbGVjdGlvbik6CisKKzIwMTUt MDUtMjIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBSZW1vdmUgY29kZSByZWxhdGVkIHdpdGggdW51c2VkIHN0eWxlIGNsYXNz ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTMz MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3 LmpzCmluZGV4IGZlMGY0NDcuLjU2MzBhNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxp Y2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3Bl Y3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50VmlldyA9IGZ1bmN0aW9uKHJlcHJlc2Vu dGVkT2JqZWN0KQogCiAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LmNhbGwodGhpcywgcmVw cmVzZW50ZWRPYmplY3QpOwogCi0gICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5z cGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsK KyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiYXBwbGljYXRpb24tY2FjaGUtZnJhbWUi KTsKIAogICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzdG9yYWdlLXZpZXciKTsKICAg ICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgidGFibGUiKTsKQEAgLTQ4LDggKzQ4LDYgQEAg V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24o cmVwcmVzZW50ZWRPYmplY3QpCiAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uQ2FjaGVNYW5h Z2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2Vy LkV2ZW50LkZyYW1lTWFuaWZlc3RTdGF0dXNDaGFuZ2VkLCB0aGlzLl91cGRhdGVTdGF0dXMsIHRo aXMpOwogfQogCi1XZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcu U3R5bGVDbGFzc05hbWUgPSAiYXBwbGljYXRpb24tY2FjaGUtZnJhbWUiOwotCiBXZWJJbnNwZWN0 b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgIGNv bnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcs CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCmluZGV4IGIzZTM3 YTIuLjgzOGVmZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5q cwpAQCAtMjksNyArMjksNyBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJv dyA9IGNsYXNzIEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcwogICAgIHsKICAgICAg ICAgc3VwZXIoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBCb3ggTW9kZWwgSW5mb3JtYXRpb24i KSk7CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkJv eE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuU3R5bGVDbGFzc05hbWUpOworICAgICAgICB0aGlzLmVs ZW1lbnQuY2xhc3NMaXN0LmFkZCgiYm94LW1vZGVsIik7CiAKICAgICAgICAgdGhpcy5fbm9kZVN0 eWxlcyA9IG51bGw7CiAgICAgfQpAQCAtNDI0LDYgKzQyNCw1IEBAIFdlYkluc3BlY3Rvci5Cb3hN b2RlbERldGFpbHNTZWN0aW9uUm93ID0gY2xhc3MgQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyBl eHRlbmRzCiAgICAgfQogfTsKIAotV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25S b3cuU3R5bGVDbGFzc05hbWUgPSAiYm94LW1vZGVsIjsKIFdlYkluc3BlY3Rvci5Cb3hNb2RlbERl dGFpbHNTZWN0aW9uUm93LlN0eWxlVmFsdWVEZWxpbWl0ZXJzID0gIiBceEEwXHRcblwiJzo7LC8o KSI7CiBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5DU1NOdW1iZXJSZWdl eCA9IC9eKC0/KD86XGQrKD86XC5cZCspP3xcLlxkKykpJC87CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2Vj dGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCmluZGV4IDNlYzkzNDEuLjU4YzZhY2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVj bGFyYXRpb25TZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCkBAIC0zMiwyNiArMzIsMjYg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gZnVuY3Rpb24oc3R5 bGUpCiAgICAgdGhpcy5fc3R5bGUgPSBzdHlsZSB8fCBudWxsOwogCiAgICAgdGhpcy5fZWxlbWVu dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2VsZW1lbnQuY2xh c3NOYW1lID0gV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLlN0eWxlQ2xh c3NOYW1lOworICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gInN0eWxlLWRlY2xhcmF0aW9u LXNlY3Rpb24iOwogCiAgICAgdGhpcy5faGVhZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2hlYWRlckVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5z cGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLkhlYWRlckVsZW1lbnRTdHlsZUNsYXNz TmFtZTsKKyAgICB0aGlzLl9oZWFkZXJFbGVtZW50LmNsYXNzTmFtZSA9ICJoZWFkZXIiOwogCiAg ICAgdGhpcy5faWNvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsKLSAg ICB0aGlzLl9pY29uRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvblNlY3Rpb24uSWNvbkVsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICB0aGlzLl9pY29u RWxlbWVudC5jbGFzc05hbWUgPSAiaWNvbiI7CiAgICAgdGhpcy5faGVhZGVyRWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9pY29uRWxlbWVudCk7CiAKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgdGhpcy5fc2VsZWN0b3JFbGVt ZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5T ZWxlY3RvckVsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQu Y2xhc3NOYW1lID0gInNlbGVjdG9yIjsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuc2V0QXR0 cmlidXRlKCJzcGVsbGNoZWNrIiwgImZhbHNlIik7CiAgICAgdGhpcy5faGVhZGVyRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9zZWxlY3RvckVsZW1lbnQpOwogCiAgICAgdGhpcy5fb3JpZ2luRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICB0aGlzLl9vcmlnaW5F bGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlv bi5PcmlnaW5FbGVtZW50U3R5bGVDbGFzc05hbWU7CisgICAgdGhpcy5fb3JpZ2luRWxlbWVudC5j bGFzc05hbWUgPSAib3JpZ2luIjsKICAgICB0aGlzLl9oZWFkZXJFbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX29yaWdpbkVsZW1lbnQpOwogCiAgICAgdGhpcy5fcHJvcGVydGllc0VsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9wcm9wZXJ0aWVzRWxlbWVu dC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uUHJv cGVydGllc0VsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICB0aGlzLl9wcm9wZXJ0aWVzRWxlbWVu dC5jbGFzc05hbWUgPSAicHJvcGVydGllcyI7CiAKICAgICB0aGlzLl9wcm9wZXJ0aWVzVGV4dEVk aXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IodGhp cywgc3R5bGUpOwogICAgIHRoaXMuX3Byb3BlcnRpZXNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X3Byb3BlcnRpZXNUZXh0RWRpdG9yLmVsZW1lbnQpOwpAQCAtMTA2LDE1ICsxMDYsOSBAQCBXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBmdW5jdGlvbihzdHlsZSkKICAg ICB0aGlzLnJlZnJlc2goKTsKIH07CiAKLVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5TdHlsZUNsYXNzTmFtZSA9ICJzdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIjsKIFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5Mb2NrZWRTdHlsZUNsYXNzTmFt ZSA9ICJsb2NrZWQiOwogV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLlNl bGVjdG9yTG9ja2VkU3R5bGVDbGFzc05hbWUgPSAic2VsZWN0b3ItbG9ja2VkIjsKIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5MYXN0SW5Hcm91cFN0eWxlQ2xhc3NOYW1l ID0gImxhc3QtaW4tZ3JvdXAiOwotV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uLkhlYWRlckVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJoZWFkZXIiOwotV2ViSW5zcGVjdG9y LkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLkljb25FbGVtZW50U3R5bGVDbGFzc05hbWUgPSAi aWNvbiI7Ci1XZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uU2VsZWN0b3JF bGVtZW50U3R5bGVDbGFzc05hbWUgPSAic2VsZWN0b3IiOwotV2ViSW5zcGVjdG9yLkNTU1N0eWxl RGVjbGFyYXRpb25TZWN0aW9uLk9yaWdpbkVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJvcmlnaW4i OwotV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLlByb3BlcnRpZXNFbGVt ZW50U3R5bGVDbGFzc05hbWUgPSAicHJvcGVydGllcyI7CiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24uTWF0Y2hlZFNlbGVjdG9yRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0g Im1hdGNoZWQiOwogCiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uQXV0 aG9yU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lID0gImF1dGhvci1zdHlsZS1ydWxlLWljb24i OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGJk ZWM0MGUuLjJhMzhjNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURldGFpbHNTaWRlYmFy UGFuZWwuanMKQEAgLTM5LDcgKzM5LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1Np ZGViYXJQYW5lbCA9IGNsYXNzIENTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCBleHQKIAogICAg ICAgICBpZiAoV2ViSW5zcGVjdG9yLmNzc1N0eWxlTWFuYWdlci5jYW5Gb3JjZVBzZXVkb0NsYXNz ZXMoKSkgewogICAgICAgICAgICAgdGhpcy5fZm9yY2VkUHNldWRvQ2xhc3NDb250YWluZXIgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgIHRoaXMuX2ZvcmNlZFBz ZXVkb0NsYXNzQ29udGFpbmVyLmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURldGFp bHNTaWRlYmFyUGFuZWwuUHNldWRvQ2xhc3Nlc0VsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICAg ICAgICAgIHRoaXMuX2ZvcmNlZFBzZXVkb0NsYXNzQ29udGFpbmVyLmNsYXNzTmFtZSA9ICJwc2V1 ZG8tY2xhc3NlcyI7CiAKICAgICAgICAgICAgIHZhciBncm91cEVsZW1lbnQgPSBudWxsOwogCkBA IC02MCw3ICs2MCw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwg PSBjbGFzcyBDU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0CiAKICAgICAgICAgICAgICAg ICBpZiAoIWdyb3VwRWxlbWVudCB8fCBncm91cEVsZW1lbnQuY2hpbGRyZW4ubGVuZ3RoID09PSAy KSB7CiAgICAgICAgICAgICAgICAgICAgIGdyb3VwRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwotICAgICAgICAgICAgICAgICAgICBncm91cEVsZW1lbnQuY2xhc3NOYW1l ID0gV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5Qc2V1ZG9DbGFzc2Vz R3JvdXBFbGVtZW50U3R5bGVDbGFzc05hbWU7CisgICAgICAgICAgICAgICAgICAgIGdyb3VwRWxl bWVudC5jbGFzc05hbWUgPSAiZ3JvdXAiOwogICAgICAgICAgICAgICAgICAgICB0aGlzLl9mb3Jj ZWRQc2V1ZG9DbGFzc0NvbnRhaW5lci5hcHBlbmRDaGlsZChncm91cEVsZW1lbnQpOwogICAgICAg ICAgICAgICAgIH0KIApAQCAtMjI2LDYgKzIyNiw0IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURl dGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0 CiAgICAgfQogfTsKIAotV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5Q c2V1ZG9DbGFzc2VzRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gInBzZXVkby1jbGFzc2VzIjsKLVdl Ykluc3BlY3Rvci5DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuUHNldWRvQ2xhc3Nlc0dyb3Vw RWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gImdyb3VwIjsKIFdlYkluc3BlY3Rvci5DU1NTdHlsZURl dGFpbHNTaWRlYmFyUGFuZWwuTm9Gb3JjZWRQc2V1ZG9DbGFzc2VzU2Nyb2xsT2Zmc2V0ID0gMzg7 IC8vIERlZmF1bHQgaGVpZ2h0IG9mIHRoZSBmb3JjZWQgcHNldWRvIGNsYXNzZXMgY29udGFpbmVy LiBVcGRhdGVkIGluIHdpZHRoRGlkQ2hhbmdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3Lmpz CmluZGV4IDZhZmJiNjYuLmU4MWExNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NsdXN0ZXJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DbHVzdGVyQ29udGVudFZpZXcuanMK QEAgLTI3LDcgKzI3LDcgQEAgV2ViSW5zcGVjdG9yLkNsdXN0ZXJDb250ZW50VmlldyA9IGZ1bmN0 aW9uKHJlcHJlc2VudGVkT2JqZWN0KQogewogICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5j YWxsKHRoaXMsIHJlcHJlc2VudGVkT2JqZWN0KTsKIAotICAgIHRoaXMuZWxlbWVudC5jbGFzc0xp c3QuYWRkKFdlYkluc3BlY3Rvci5DbHVzdGVyQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUpOwor ICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJjbHVzdGVyIik7CiAKICAgICB0aGlzLl9j b250ZW50Vmlld0NvbnRhaW5lciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWlu ZXIoKTsKICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5lci5FdmVudC5DdXJyZW50Q29udGVudFZpZXdE aWRDaGFuZ2UsIHRoaXMuX2N1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSwgdGhpcyk7CkBAIC0z OCw4ICszOCw2IEBAIFdlYkluc3BlY3Rvci5DbHVzdGVyQ29udGVudFZpZXcgPSBmdW5jdGlvbihy ZXByZXNlbnRlZE9iamVjdCkKICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuTnVtYmVyT2ZTZWFyY2hSZXN1 bHRzRGlkQ2hhbmdlLCB0aGlzLl9jb250ZW50Vmlld051bWJlck9mU2VhcmNoUmVzdWx0c0RpZENo YW5nZSwgdGhpcyk7CiB9OwogCi1XZWJJbnNwZWN0b3IuQ2x1c3RlckNvbnRlbnRWaWV3LlN0eWxl Q2xhc3NOYW1lID0gImNsdXN0ZXIiOwotCiBXZWJJbnNwZWN0b3IuQ2x1c3RlckNvbnRlbnRWaWV3 LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkNsdXN0ZXJDb250 ZW50VmlldywKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuanMKaW5k ZXggMmQ3MGJkMi4uOGU3ODAxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wbGV0aW9uU3VnZ2VzdGlv bnNWaWV3LmpzCkBAIC0zNCwxMCArMzQsMTAgQEAgV2ViSW5zcGVjdG9yLkNvbXBsZXRpb25TdWdn ZXN0aW9uc1ZpZXcgPSBjbGFzcyBDb21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3IGV4dGVuZHMKICAg ICAgICAgdGhpcy5fc2VsZWN0ZWRJbmRleCA9IE5hTjsKIAogICAgICAgICB0aGlzLl9lbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIHRoaXMuX2VsZW1lbnQu Y2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkNvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuU3R5bGVD bGFzc05hbWU7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gImNvbXBsZXRpb24t c3VnZ2VzdGlvbnMiOwogCiAgICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdGhpcy5fY29udGFpbmVyRWxlbWVudC5j bGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldy5Db250YWlu ZXJFbGVtZW50U3R5bGVDbGFzc05hbWU7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQu Y2xhc3NOYW1lID0gImNvbXBsZXRpb24tc3VnZ2VzdGlvbnMtY29udGFpbmVyIjsKICAgICAgICAg dGhpcy5fY29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlz Ll9tb3VzZURvd24uYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIHRoaXMuX21vdXNlVXAuYmluZCh0aGlzKSk7CiAg ICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9pdGVtQ2xpY2tlZC5iaW5kKHRoaXMpKTsKQEAgLTIxOSw3ICsyMTksNSBAQCBXZWJJbnNw ZWN0b3IuQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldyA9IGNsYXNzIENvbXBsZXRpb25TdWdnZXN0 aW9uc1ZpZXcgZXh0ZW5kcwogICAgIH0KIH07CiAKLVdlYkluc3BlY3Rvci5Db21wbGV0aW9uU3Vn Z2VzdGlvbnNWaWV3LlN0eWxlQ2xhc3NOYW1lID0gImNvbXBsZXRpb24tc3VnZ2VzdGlvbnMiOwot V2ViSW5zcGVjdG9yLkNvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuQ29udGFpbmVyRWxlbWVudFN0 eWxlQ2xhc3NOYW1lID0gImNvbXBsZXRpb24tc3VnZ2VzdGlvbnMtY29udGFpbmVyIjsKIFdlYklu c3BlY3Rvci5Db21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3Lkl0ZW1FbGVtZW50U3R5bGVDbGFzc05h bWUgPSAiaXRlbSI7CiBXZWJJbnNwZWN0b3IuQ29tcGxldGlvblN1Z2dlc3Rpb25zVmlldy5TZWxl Y3RlZEl0ZW1TdHlsZUNsYXNzTmFtZSA9ICJzZWxlY3RlZCI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVByb21wdC5qcwpp bmRleCBkNDk3YjFjLi5kZWFkYWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMKQEAgLTMxLDcgKzMx LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVQcm9tcHQgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgbWlt ZVR5cGUsIGVsZW1lbnQpCiAgICAgbWltZVR5cGUgPSBwYXJzZU1JTUVUeXBlKG1pbWVUeXBlKS50 eXBlOwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQgfHwgZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7Ci0gICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5Db25zb2xlUHJvbXB0LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5hZGQoImNvbnNvbGUtcHJvbXB0Iik7CiAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3Qu YWRkKFdlYkluc3BlY3Rvci5TeW50YXhIaWdobGlnaHRlZFN0eWxlQ2xhc3NOYW1lKTsKIAogICAg IHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKQEAgLTYzLDcgKzYzLDYgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVQcm9tcHQgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgbWltZVR5cGUsIGVs ZW1lbnQpCiAgICAgdGhpcy5faGlzdG9yeUluZGV4ID0gMDsKIH07CiAKLVdlYkluc3BlY3Rvci5D b25zb2xlUHJvbXB0LlN0eWxlQ2xhc3NOYW1lID0gImNvbnNvbGUtcHJvbXB0IjsKIFdlYkluc3Bl Y3Rvci5Db25zb2xlUHJvbXB0Lk1heGltdW1IaXN0b3J5U2l6ZSA9IDMwOwogCiBXZWJJbnNwZWN0 b3IuQ29uc29sZVByb21wdC5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCmluZGV4 IGIxN2ExZWYuLmY5YWY5YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCkBAIC0yOSw3ICsyOSw3 IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9uKGVsZW1lbnQsIGRlbGVn YXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAgLy8gV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxs KHRoaXMpOwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQgfHwgZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3Bl Y3Rvci5Db250ZW50QnJvd3Nlci5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhpcy5fZWxlbWVudC5j bGFzc0xpc3QuYWRkKCJjb250ZW50LWJyb3dzZXIiKTsKIAogICAgIHRoaXMuX25hdmlnYXRpb25C YXIgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXI7CiAgICAgdGhpcy5fZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0aW9uQmFyLmVsZW1lbnQpOwpAQCAtOTIsOCArOTIsNiBA QCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIgPSBmdW5jdGlvbihlbGVtZW50LCBkZWxlZ2F0 ZSwgZGlzYWJsZUJhY2tGb3J3YXJkKQogLy8gRklYTUU6IE1vdmUgdG8gYSBXZWJJbnNwZWN0b3Iu T2JqZWN0IHN1YmNsYXNzIGFuZCB3ZSBjYW4gcmVtb3ZlIHRoaXMuCiBXZWJJbnNwZWN0b3IuT2Jq ZWN0LmRlcHJlY2F0ZWRBZGRDb25zdHJ1Y3RvckZ1bmN0aW9ucyhXZWJJbnNwZWN0b3IuQ29udGVu dEJyb3dzZXIpOwogCi1XZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIuU3R5bGVDbGFzc05hbWUg PSAiY29udGVudC1icm93c2VyIjsKLQogV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50 ID0gewogICAgIEN1cnJlbnRSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2U6ICJjb250ZW50LWJy b3dzZXItY3VycmVudC1yZXByZXNlbnRlZC1vYmplY3RzLWRpZC1jaGFuZ2UiLAogICAgIEN1cnJl bnRDb250ZW50Vmlld0RpZENoYW5nZTogImNvbnRlbnQtYnJvd3Nlci1jdXJyZW50LWNvbnRlbnQt dmlldy1kaWQtY2hhbmdlIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudEZsb3dUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRGbG93VHJlZUVsZW1lbnQuanMKaW5k ZXggN2UyOGE2My4uYTY1NzlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEZsb3dUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Rmxvd1RyZWVFbGVtZW50 LmpzCkBAIC0zNCwxMCArMzQsOCBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3dUcmVlRWxlbWVu dCA9IGNsYXNzIENvbnRlbnRGbG93VHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbgogICAgIHsKICAg ICAgICAgY29uc29sZS5hc3NlcnQocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuQ29udGVudEZsb3cpOwogCi0gICAgICAgIHN1cGVyKFtXZWJJbnNwZWN0b3IuQ29udGVu dEZsb3dUcmVlRWxlbWVudC5TdHlsZUNsYXNzTmFtZSwgV2ViSW5zcGVjdG9yLkNvbnRlbnRGbG93 VHJlZUVsZW1lbnQuQ29udGVudEZsb3dJY29uU3R5bGVDbGFzc05hbWVdLCByZXByZXNlbnRlZE9i amVjdC5uYW1lLCBudWxsLCByZXByZXNlbnRlZE9iamVjdCwgZmFsc2UpOworICAgICAgICBzdXBl cigiY29udGVudC1mbG93LWljb24iLCByZXByZXNlbnRlZE9iamVjdC5uYW1lLCBudWxsLCByZXBy ZXNlbnRlZE9iamVjdCwgZmFsc2UpOwogCiAgICAgICAgIHRoaXMuc21hbGwgPSB0cnVlOwogICAg IH0KIH07Ci0KLVdlYkluc3BlY3Rvci5Db250ZW50Rmxvd1RyZWVFbGVtZW50LkNvbnRlbnRGbG93 SWNvblN0eWxlQ2xhc3NOYW1lID0gImNvbnRlbnQtZmxvdy1pY29uIjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMK aW5kZXggMWE0YWNkMC4uY2NkNTVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMKQEAgLTEzMiw3ICsxMzIs NyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVj dCwgZXh0cmFBcmd1bWVudHMpCiAgICAgdGhpcy5fcmVwcmVzZW50ZWRPYmplY3QgPSByZXByZXNl bnRlZE9iamVjdDsKIAogICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkNv bnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5h ZGQoImNvbnRlbnQtdmlldyIpOwogCiAgICAgdGhpcy5fcGFyZW50Q29udGFpbmVyID0gbnVsbDsK IH07CkBAIC0xODMsOCArMTgzLDYgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LmlzVmlld2Fi bGUgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICByZXR1cm4gZmFsc2U7CiB9Owog Ci1XZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUgPSAiY29udGVudC12aWV3 IjsKLQogV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50ID0gewogICAgIFNlbGVjdGlvblBh dGhDb21wb25lbnRzRGlkQ2hhbmdlOiAiY29udGVudC12aWV3LXNlbGVjdGlvbi1wYXRoLWNvbXBv bmVudHMtZGlkLWNoYW5nZSIsCiAgICAgU3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlk Q2hhbmdlOiAiY29udGVudC12aWV3LXN1cHBsZW1lbnRhbC1yZXByZXNlbnRlZC1vYmplY3RzLWRp ZC1jaGFuZ2UiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcwppbmRleCAzYjVkMGFk Li42NjQyMWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcwpAQCAtMjksMTQg KzI5LDEyIEBAIFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5lciA9IGZ1bmN0aW9uKGVs ZW1lbnQpCiAgICAgLy8gV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCiAgICAgdGhp cy5fZWxlbWVudCA9IGVsZW1lbnQgfHwgZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0Nv bnRhaW5lci5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRk KCJjb250ZW50LXZpZXctY29udGFpbmVyIik7CiAKICAgICB0aGlzLl9iYWNrRm9yd2FyZExpc3Qg PSBbXTsKICAgICB0aGlzLl9jdXJyZW50SW5kZXggPSAtMTsKIH07CiAKLVdlYkluc3BlY3Rvci5D b250ZW50Vmlld0NvbnRhaW5lci5TdHlsZUNsYXNzTmFtZSA9ICJjb250ZW50LXZpZXctY29udGFp bmVyIjsKLQogV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVyLkV2ZW50ID0gewogICAg IEN1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZTogImNvbnRlbnQtdmlldy1jb250YWluZXItY3Vy cmVudC1jb250ZW50LXZpZXctZGlkLWNoYW5nZSIKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9y YWdlQ29udGVudFZpZXcuanMKaW5kZXggZjM1MDE2OS4uZTU5ZjI0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtMjcsMTMgKzI3LDExIEBAIFdlYkluc3Bl Y3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVj dCkKIHsKICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuY2FsbCh0aGlzLCByZXByZXNlbnRl ZE9iamVjdCk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3Iu Q29va2llU3RvcmFnZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLmVsZW1l bnQuY2xhc3NMaXN0LmFkZCgiY29va2llLXN0b3JhZ2UiKTsKIAogICAgIHRoaXMudXBkYXRlKCk7 CiB9OwogCi1XZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NO YW1lID0gImNvb2tpZS1zdG9yYWdlIjsKLQogV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250 ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5Db29r aWVTdG9yYWdlQ29udGVudFZpZXcsCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VUcmVlRWxlbWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VUcmVlRWxl bWVudC5qcwppbmRleCBlMWYxNjdmLi40Y2M0ZjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlVHJlZUVsZW1lbnQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3Rv cmFnZVRyZWVFbGVtZW50LmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5Db29raWVT dG9yYWdlVHJlZUVsZW1lbnQgPSBjbGFzcyBDb29raWVTdG9yYWdlVHJlZUVsZW1lbnQgZXh0ZW5k cyBXCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChyZXByZXNlbnRlZE9iamVjdCBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlT2JqZWN0KTsKIAotICAgICAgICBzdXBl cihXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZVRyZWVFbGVtZW50LkNvb2tpZUljb25TdHlsZUNs YXNzTmFtZSwgV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9ySG9zdChyZXByZXNlbnRlZE9iamVj dC5ob3N0KSwgcmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICBzdXBlcigiY29va2llLWljb24i LCBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JIb3N0KHJlcHJlc2VudGVkT2JqZWN0Lmhvc3Qp LCByZXByZXNlbnRlZE9iamVjdCk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC00NCw1ICs0 NCwzIEBAIFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlVHJlZUVsZW1lbnQgPSBjbGFzcyBDb29r aWVTdG9yYWdlVHJlZUVsZW1lbnQgZXh0ZW5kcyBXCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkNvb2tpZXMiKTsKICAgICB9CiB9OwotCi1XZWJJbnNwZWN0b3IuQ29va2ll U3RvcmFnZVRyZWVFbGVtZW50LkNvb2tpZUljb25TdHlsZUNsYXNzTmFtZSA9ICJjb29raWUtaWNv biI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKaW5kZXggMDlmOTFiZi4uNGJj YWYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtMjgsNyArMjgs NyBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVwcmVz ZW50ZWRPYmplY3QpCiB7CiAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LmNhbGwodGhpcywg cmVwcmVzZW50ZWRPYmplY3QpOwogCi0gICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2Vi SW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImRvbS1zdG9yYWdlIik7CiAKICAgICByZXByZXNlbnRl ZE9iamVjdC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlT2JqZWN0LkV2 ZW50Lkl0ZW1zQ2xlYXJlZCwgdGhpcy5pdGVtc0NsZWFyZWQsIHRoaXMpOwogICAgIHJlcHJlc2Vu dGVkT2JqZWN0LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VPYmplY3Qu RXZlbnQuSXRlbUFkZGVkLCB0aGlzLml0ZW1BZGRlZCwgdGhpcyk7CkBAIC00OSw3ICs0OSw2IEBA IFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRl ZE9iamVjdCkKICAgICB0aGlzLl9wb3B1bGF0ZSgpOwogfTsKIAotV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSA9ICJkb20tc3RvcmFnZSI7CiBXZWJJbnNw ZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LkR1cGxpY2F0ZUtleVN0eWxlQ2xhc3NOYW1lID0g ImR1cGxpY2F0ZS1rZXkiOwogV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5NaXNz aW5nS2V5U3R5bGVDbGFzc05hbWUgPSAibWlzc2luZy1rZXkiOwogV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VDb250ZW50Vmlldy5NaXNzaW5nVmFsdWVTdHlsZUNsYXNzTmFtZSA9ICJtaXNzaW5nLXZh bHVlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcwppbmRleCBhMDM5NDhjLi44NzQ0MTcz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC00NCw3ICs0NCw3IEBAIFdlYklu c3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkK ICAgICB0aGlzLl9zaG93c1NoYWRvd0RPTUJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRo aXMuX3RvZ2dsZVNob3dzU2hhZG93RE9NU2V0dGluZywgdGhpcyk7CiAgICAgdGhpcy5fc2hvd1No YWRvd0RPTVNldHRpbmdDaGFuZ2VkKCk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZChXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0 aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZG9tLXRyZWUiKTsKICAgICB0aGlzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9tb3VzZVdhc0NsaWNrZWQuYmluZCh0aGlz KSwgZmFsc2UpOwogCiAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUgPSBuZXcgV2ViSW5zcGVjdG9y LkRPTVRyZWVPdXRsaW5lKHRydWUsIHRydWUsIHRydWUpOwpAQCAtNjMsOCArNjMsNiBAQCBXZWJJ bnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3Qp CiAgICAgdGhpcy5fbnVtYmVyT2ZTZWFyY2hSZXN1bHRzID0gbnVsbDsKIH07CiAKLVdlYkluc3Bl Y3Rvci5ET01UcmVlQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUgPSAiZG9tLXRyZWUiOwotCiBX ZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1 Y3RvcjogV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50VmlldywKICAgICBfX3Byb3RvX186IFdl Ykluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGFzaGJvYXJkVmlldy5qcwppbmRl eCA2YWY5ZWE3Li5mNGU1OThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZFZpZXcuanMKQEAgLTM0LDcgKzM0LDcg QEAgV2ViSW5zcGVjdG9yLkRhc2hib2FyZFZpZXcgPSBjbGFzcyBEYXNoYm9hcmRWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl9yZXByZXNlbnRlZE9iamVjdCA9 IHJlcHJlc2VudGVkT2JqZWN0OwogCiAgICAgICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRk KFdlYkluc3BlY3Rvci5EYXNoYm9hcmRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAgdGhp cy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJkYXNoYm9hcmQiKTsKICAgICAgICAgdGhpcy5fZWxl bWVudC5jbGFzc0xpc3QuYWRkKGlkZW50aWZpZXIpOwogICAgIH0KIApAQCAtODMsNSArODMsMyBA QCBXZWJJbnNwZWN0b3IuRGFzaGJvYXJkVmlldyA9IGNsYXNzIERhc2hib2FyZFZpZXcgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNz ZXMuCiAgICAgfQogfTsKLQotV2ViSW5zcGVjdG9yLkRhc2hib2FyZFZpZXcuU3R5bGVDbGFzc05h bWUgPSAiZGFzaGJvYXJkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVDb250ZW50Vmlldy5q cwppbmRleCBmZGFhZGQ3Li45N2ZhZTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZUNv bnRlbnRWaWV3LmpzCkBAIC0yNyw3ICsyNyw3IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxl Q29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKIHsKICAgICBXZWJJbnNw ZWN0b3IuQ29udGVudFZpZXcuY2FsbCh0aGlzLCByZXByZXNlbnRlZE9iamVjdCk7CiAKLSAgICB0 aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZUNvbnRl bnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi ZGF0YWJhc2UtdGFibGUiKTsKIAogICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9uSXRl bSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImRhdGFiYXNlLXRhYmxl LXJlZnJlc2giLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2giKSwgIkltYWdlcy9SZWxv YWRGdWxsLnN2ZyIsIDEzLCAxMyk7CiAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmlnYXRpb25J dGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2 ZW50LkNsaWNrZWQsIHRoaXMuX3JlZnJlc2hCdXR0b25DbGlja2VkLCB0aGlzKTsKQEAgLTM1LDgg KzM1LDYgQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVDb250ZW50VmlldyA9IGZ1bmN0aW9u KHJlcHJlc2VudGVkT2JqZWN0KQogICAgIHRoaXMudXBkYXRlKCk7CiB9OwogCi1XZWJJbnNwZWN0 b3IuRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lID0gImRhdGFiYXNlLXRh YmxlIjsKLQogV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUg PSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlQ29udGVudFZp ZXcsCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJvdG90eXBlLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVi dWdnZXJEYXNoYm9hcmRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmpzCmluZGV4IDQ2ZWY4MDEuLmFiYTI2ZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rl YnVnZ2VyRGFzaGJvYXJkVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZWJ1Z2dlckRhc2hib2FyZFZpZXcuanMKQEAgLTQxLDE2ICs0MSwxNiBA QCBXZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNoYm9hcmRWaWV3ID0gY2xhc3MgRGVidWdnZXJEYXNo Ym9hcmRWaWV3IGV4dGVuZHMgV2ViSW5zcAogICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFk ZE5hdmlnYXRpb25JdGVtKHRoaXMuX2RlYnVnZ2VyUmVzdW1lQnV0dG9uSXRlbSk7CiAKICAgICAg ICAgdmFyIG1lc3NhZ2UgPSB0aGlzLl9tZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwotICAgICAgICBtZXNzYWdlLmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyRGFzaGJvYXJkVmlldy5NZXNzYWdlU3R5bGVDbGFzc05hbWUpOworICAgICAgICBt ZXNzYWdlLmNsYXNzTGlzdC5hZGQoIm1lc3NhZ2UiKTsKICAgICAgICAgbWVzc2FnZS50aXRsZSA9 IG1lc3NhZ2UudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRlYnVnZ2VyIFBh dXNlZCIpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQobWVzc2FnZSk7CiAKICAg ICAgICAgdmFyIGRpdmlkZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 Ci0gICAgICAgIGRpdmlkZXJFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyRGFzaGJvYXJkVmlldy5EaXZpZGVyU3R5bGVDbGFzc05hbWUpOworICAgICAgICBkaXZpZGVy RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJkaXZpZGVyIik7CiAgICAgICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZChkaXZpZGVyRWxlbWVudCk7CiAKICAgICAgICAgdmFyIGxvY2F0aW9uRWxlbWVu dCA9IHRoaXMuX2xvY2F0aW9uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwotICAgICAgICBsb2NhdGlvbkVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuRGVi dWdnZXJEYXNoYm9hcmRWaWV3LkxvY2F0aW9uU3R5bGVDbGFzc05hbWUpOworICAgICAgICBsb2Nh dGlvbkVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibG9jYXRpb24iKTsKICAgICAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKGxvY2F0aW9uRWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fcmVidWls ZExvY2F0aW9uKCk7CkBAIC04MCwxMiArODAsMTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyRGFz aGJvYXJkVmlldyA9IGNsYXNzIERlYnVnZ2VyRGFzaGJvYXJkVmlldyBleHRlbmRzIFdlYkluc3AK ICAgICAgICAgdGhpcy5fbG9jYXRpb25FbGVtZW50LmFwcGVuZENoaWxkKGljb25FbGVtZW50KTsK IAogICAgICAgICB2YXIgaWNvbkltYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImltZyIpOwotICAgICAgICBpY29uSW1hZ2VFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rv ci5EZWJ1Z2dlckRhc2hib2FyZFZpZXcuSWNvblN0eWxlQ2xhc3NOYW1lOworICAgICAgICBpY29u SW1hZ2VFbGVtZW50LmNsYXNzTmFtZSA9ICJpY29uIjsKICAgICAgICAgaWNvbkVsZW1lbnQuYXBw ZW5kQ2hpbGQoaWNvbkltYWdlRWxlbWVudCk7CiAKICAgICAgICAgdmFyIG5hbWVFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIG5hbWVFbGVtZW50LmFwcGVu ZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKGZ1bmN0aW9uTmFtZSkpOwotICAgICAgICBu YW1lRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRhc2hib2FyZFZp ZXcuRnVuY3Rpb25OYW1lU3R5bGVDbGFzc05hbWUpOworICAgICAgICBuYW1lRWxlbWVudC5jbGFz c0xpc3QuYWRkKCJmdW5jdGlvbi1uYW1lIik7CiAgICAgICAgIHRoaXMuX2xvY2F0aW9uRWxlbWVu dC5hcHBlbmRDaGlsZChuYW1lRWxlbWVudCk7CiAKICAgICAgICAgdmFyIHNvdXJjZUNvZGVMb2Nh dGlvbiA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2FsbEZyYW1lLnNvdXJj ZUNvZGVMb2NhdGlvbjsKQEAgLTEwMiw5ICsxMDIsMyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJE YXNoYm9hcmRWaWV3ID0gY2xhc3MgRGVidWdnZXJEYXNoYm9hcmRWaWV3IGV4dGVuZHMgV2ViSW5z cAogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNoYm9hcmRWaWV3LkZ1bmN0aW9uSWNvblN0eWxl Q2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkNhbGxGcmFtZVZpZXcuRnVuY3Rpb25JY29uU3R5bGVD bGFzc05hbWU7CiBXZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNoYm9hcmRWaWV3LkV2ZW50TGlzdGVu ZXJJY29uU3R5bGVDbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ2FsbEZyYW1lVmlldy5FdmVudExp c3RlbmVySWNvblN0eWxlQ2xhc3NOYW1lOwotCi1XZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNoYm9h cmRWaWV3Lkljb25TdHlsZUNsYXNzTmFtZSA9ICJpY29uIjsKLVdlYkluc3BlY3Rvci5EZWJ1Z2dl ckRhc2hib2FyZFZpZXcuTWVzc2FnZVN0eWxlQ2xhc3NOYW1lID0gIm1lc3NhZ2UiOwotV2ViSW5z cGVjdG9yLkRlYnVnZ2VyRGFzaGJvYXJkVmlldy5EaXZpZGVyU3R5bGVDbGFzc05hbWUgPSAiZGl2 aWRlciI7Ci1XZWJJbnNwZWN0b3IuRGVidWdnZXJEYXNoYm9hcmRWaWV3LkxvY2F0aW9uU3R5bGVD bGFzc05hbWUgPSAibG9jYXRpb24iOwotV2ViSW5zcGVjdG9yLkRlYnVnZ2VyRGFzaGJvYXJkVmll dy5GdW5jdGlvbk5hbWVTdHlsZUNsYXNzTmFtZSA9ICJmdW5jdGlvbi1uYW1lIjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0 aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWls c1NlY3Rpb24uanMKaW5kZXggMzY4Y2Q3NC4uODRiM2EzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24u anMKQEAgLTM2LDcgKzM2LDcgQEAgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uID0gY2xhc3Mg RGV0YWlsc1NlY3Rpb24gZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgdGhp cy5faGVhZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAg ICB0aGlzLl9oZWFkZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGVh ZGVyRWxlbWVudENsaWNrZWQuYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMuX2hlYWRlckVsZW1l bnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uLkhlYWRlckVsZW1lbnRT dHlsZUNsYXNzTmFtZTsKKyAgICAgICAgdGhpcy5faGVhZGVyRWxlbWVudC5jbGFzc05hbWUgPSAi aGVhZGVyIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9oZWFkZXJF bGVtZW50KTsKIAogICAgICAgICBpZiAob3B0aW9uc0VsZW1lbnQgaW5zdGFuY2VvZiBIVE1MRWxl bWVudCkgewpAQCAtNTAsNyArNTAsNyBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24gPSBj bGFzcyBEZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAg dGhpcy5faGVhZGVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl90aXRsZUVsZW1lbnQpOwogCiAg ICAgICAgIHRoaXMuX2NvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7Ci0gICAgICAgIHRoaXMuX2NvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rv ci5EZXRhaWxzU2VjdGlvbi5Db250ZW50RWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICB0 aGlzLl9jb250ZW50RWxlbWVudC5jbGFzc05hbWUgPSAiY29udGVudCI7CiAgICAgICAgIHRoaXMu X2VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY29udGVudEVsZW1lbnQpOwogCiAgICAgICAgIHRo aXMuX2dlbmVyYXRlRGlzY2xvc3VyZVRyaWFuZ2xlc0lmTmVlZGVkKCk7CkBAIC0xNjAsOSArMTYw LDYgQEAgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uID0gY2xhc3MgRGV0YWlsc1NlY3Rpb24g ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgfQogfTsKIAotV2ViSW5zcGVjdG9yLkRl dGFpbHNTZWN0aW9uLkhlYWRlckVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJoZWFkZXIiOwotV2Vi SW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uLlRpdGxlRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gInRp dGxlIjsKLVdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbi5Db250ZW50RWxlbWVudFN0eWxlQ2xh c3NOYW1lID0gImNvbnRlbnQiOwogV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uLkNvbGxhcHNl ZFN0eWxlQ2xhc3NOYW1lID0gImNvbGxhcHNlZCI7CiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rp b24uTW91c2VPdmVyT3B0aW9uc0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJtb3VzZS1vdmVyLW9w dGlvbnMtZWxlbWVudCI7CiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24uRGlzY2xvc3VyZVRy aWFuZ2xlT3BlbkNhbnZhc0lkZW50aWZpZXIgPSAiZGV0YWlscy1zZWN0aW9uLWRpc2Nsb3N1cmUt dHJpYW5nbGUtb3BlbiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvblNpbXBsZVJvdy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxlUm93LmpzCmlu ZGV4IGU0NDljNzUuLmI2YmVlZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxlUm93LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxl Um93LmpzCkBAIC0zMiwxMSArMzIsMTEgQEAgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2lt cGxlUm93ID0gY2xhc3MgRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3cgZXh0ZW5kcyBXZWIKICAgICAg ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInNpbXBsZSIpOwogCiAgICAgICAgIHRoaXMu X2xhYmVsRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICB0 aGlzLl9sYWJlbEVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9u U2ltcGxlUm93LkxhYmVsRWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICB0aGlzLl9sYWJl bEVsZW1lbnQuY2xhc3NOYW1lID0gImxhYmVsIjsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2xhYmVsRWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fdmFsdWVFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIHRoaXMuX3ZhbHVlRWxl bWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3cuVmFs dWVFbGVtZW50U3R5bGVDbGFzc05hbWU7CisgICAgICAgIHRoaXMuX3ZhbHVlRWxlbWVudC5jbGFz c05hbWUgPSAidmFsdWUiOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f dmFsdWVFbGVtZW50KTsKIAogICAgICAgICAvLyBXb3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2Js ZW0vMTI2Njg4NzA+IFRyaXBsZS1jbGlja2luZyB0ZXh0IHdpdGhpbiBhCkBAIC0xMTMsNSArMTEz LDMgQEAgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93ID0gY2xhc3MgRGV0YWls c1NlY3Rpb25TaW1wbGVSb3cgZXh0ZW5kcyBXZWIKIAogV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0 aW9uU2ltcGxlUm93LkRhdGFTdHlsZUNsYXNzTmFtZSA9ICJkYXRhIjsKIFdlYkluc3BlY3Rvci5E ZXRhaWxzU2VjdGlvblNpbXBsZVJvdy5FbXB0eVN0eWxlQ2xhc3NOYW1lID0gImVtcHR5IjsKLVdl Ykluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdy5MYWJlbEVsZW1lbnRTdHlsZUNsYXNz TmFtZSA9ICJsYWJlbCI7Ci1XZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3cuVmFs dWVFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAidmFsdWUiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb250UmVzb3Vy Y2VDb250ZW50Vmlldy5qcwppbmRleCBiY2I1YWFlLi5mNDFlYzI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb250UmVzb3VyY2VDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G b250UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXZWJJbnNwZWN0 b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKIHsKLSAgICBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldy5jYWxsKHRoaXMsIHJlc291cmNlLCBXZWJJ bnNwZWN0b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUpOworICAgIFdl Ykluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LmNhbGwodGhpcywgcmVzb3VyY2UsICJmb250 Iik7CiAKICAgICB0aGlzLl9zdHlsZUVsZW1lbnQgPSBudWxsOwogICAgIHRoaXMuX3ByZXZpZXdF bGVtZW50ID0gbnVsbDsKQEAgLTMzLDE2ICszMyw2IEBAIFdlYkluc3BlY3Rvci5Gb250UmVzb3Vy Y2VDb250ZW50VmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQogCiBXZWJJbnNwZWN0b3IuRm9udFJl c291cmNlQ29udGVudFZpZXcuX3VuaXF1ZUZvbnRJZGVudGlmaWVyID0gMDsKIAotV2ViSW5zcGVj dG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lID0gImZvbnQiOwotV2Vi SW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LlByZXZpZXdFbGVtZW50U3R5bGVDbGFz c05hbWUgPSAicHJldmlldyI7Ci1XZWJJbnNwZWN0b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcu TGluZUVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJsaW5lIjsKLVdlYkluc3BlY3Rvci5Gb250UmVz b3VyY2VDb250ZW50Vmlldy5Db250ZW50RWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gImNvbnRlbnQi OwotV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3Lk1ldHJpY0VsZW1lbnRTdHls ZUNsYXNzTmFtZSA9ICJtZXRyaWMiOwotV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRW aWV3LlRvcE1ldHJpY0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJ0b3AiOwotV2ViSW5zcGVjdG9y LkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LlhIZWlnaHRNZXRyaWNFbGVtZW50U3R5bGVDbGFzc05h bWUgPSAieGhlaWdodCI7Ci1XZWJJbnNwZWN0b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcuTWlk ZGxlTWV0cmljRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gIm1pZGRsZSI7Ci1XZWJJbnNwZWN0b3Iu Rm9udFJlc291cmNlQ29udGVudFZpZXcuQmFzZWxpbmVNZXRyaWNFbGVtZW50U3R5bGVDbGFzc05h bWUgPSAiYmFzZWxpbmUiOwotV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LkJv dHRvbU1ldHJpY0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJib3R0b20iOwogV2ViSW5zcGVjdG9y LkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LlByZXZpZXdMaW5lcyA9IFsiQUJDREVGR0hJSktMTSIs ICJOT1BRUlNUVVZXWFlaIiwgImFiY2RlZmdoaWprbG0iLCAibm9wcXJzdHV2d3h5eiIsICIxMjM0 NTY3ODkwIl07CiAKIFdlYkluc3BlY3Rvci5Gb250UmVzb3VyY2VDb250ZW50Vmlldy5NYXhpbXVt Rm9udFNpemUgPSA3MjsKQEAgLTk2LDI5ICs4NiwyOSBAQCBXZWJJbnNwZWN0b3IuRm9udFJlc291 cmNlQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgZG9jdW1lbnQuaGVhZC5h cHBlbmRDaGlsZCh0aGlzLl9zdHlsZUVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX3ByZXZpZXdF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIHRoaXMuX3By ZXZpZXdFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5Gb250UmVzb3VyY2VDb250ZW50 Vmlldy5QcmV2aWV3RWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICB0aGlzLl9wcmV2aWV3 RWxlbWVudC5jbGFzc05hbWUgPSAicHJldmlldyI7CiAgICAgICAgIHRoaXMuX3ByZXZpZXdFbGVt ZW50LnN0eWxlLmZvbnRGYW1pbHkgPSB1bmlxdWVGb250TmFtZTsKIAogICAgICAgICBmdW5jdGlv biBjcmVhdGVNZXRyaWNFbGVtZW50KGNsYXNzTmFtZSkKICAgICAgICAgewogICAgICAgICAgICAg dmFyIG1ldHJpY0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAg ICAgICAgIG1ldHJpY0VsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJj ZUNvbnRlbnRWaWV3Lk1ldHJpY0VsZW1lbnRTdHlsZUNsYXNzTmFtZSArICIgIiArIGNsYXNzTmFt ZTsKKyAgICAgICAgICAgIG1ldHJpY0VsZW1lbnQuY2xhc3NOYW1lID0gIm1ldHJpYyAiICsgY2xh c3NOYW1lOwogICAgICAgICAgICAgcmV0dXJuIG1ldHJpY0VsZW1lbnQ7CiAgICAgICAgIH0KIAog ICAgICAgICB2YXIgbGluZXMgPSBXZWJJbnNwZWN0b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcu UHJldmlld0xpbmVzOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxpbmVzLmxlbmd0aDsg KytpKSB7CiAgICAgICAgICAgICB2YXIgbGluZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKLSAgICAgICAgICAgIGxpbmVFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3Bl Y3Rvci5Gb250UmVzb3VyY2VDb250ZW50Vmlldy5MaW5lRWxlbWVudFN0eWxlQ2xhc3NOYW1lOwor ICAgICAgICAgICAgbGluZUVsZW1lbnQuY2xhc3NOYW1lID0gImxpbmUiOwogCi0gICAgICAgICAg ICBsaW5lRWxlbWVudC5hcHBlbmRDaGlsZChjcmVhdGVNZXRyaWNFbGVtZW50KFdlYkluc3BlY3Rv ci5Gb250UmVzb3VyY2VDb250ZW50Vmlldy5Ub3BNZXRyaWNFbGVtZW50U3R5bGVDbGFzc05hbWUp KTsKLSAgICAgICAgICAgIGxpbmVFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZU1ldHJpY0VsZW1l bnQoV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LlhIZWlnaHRNZXRyaWNFbGVt ZW50U3R5bGVDbGFzc05hbWUpKTsKLSAgICAgICAgICAgIGxpbmVFbGVtZW50LmFwcGVuZENoaWxk KGNyZWF0ZU1ldHJpY0VsZW1lbnQoV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3 Lk1pZGRsZU1ldHJpY0VsZW1lbnRTdHlsZUNsYXNzTmFtZSkpOwotICAgICAgICAgICAgbGluZUVs ZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlTWV0cmljRWxlbWVudChXZWJJbnNwZWN0b3IuRm9udFJl c291cmNlQ29udGVudFZpZXcuQmFzZWxpbmVNZXRyaWNFbGVtZW50U3R5bGVDbGFzc05hbWUpKTsK LSAgICAgICAgICAgIGxpbmVFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZU1ldHJpY0VsZW1lbnQo V2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LkJvdHRvbU1ldHJpY0VsZW1lbnRT dHlsZUNsYXNzTmFtZSkpOworICAgICAgICAgICAgbGluZUVsZW1lbnQuYXBwZW5kQ2hpbGQoY3Jl YXRlTWV0cmljRWxlbWVudCgidG9wIikpOworICAgICAgICAgICAgbGluZUVsZW1lbnQuYXBwZW5k Q2hpbGQoY3JlYXRlTWV0cmljRWxlbWVudCgieGhlaWdodCIpKTsKKyAgICAgICAgICAgIGxpbmVF bGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZU1ldHJpY0VsZW1lbnQoIm1pZGRsZSIpKTsKKyAgICAg ICAgICAgIGxpbmVFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZU1ldHJpY0VsZW1lbnQoImJhc2Vs aW5lIikpOworICAgICAgICAgICAgbGluZUVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlTWV0cmlj RWxlbWVudCgiYm90dG9tIikpOwogCiAgICAgICAgICAgICB2YXIgY29udGVudEVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgIGNvbnRlbnRFbGVtZW50 LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5Gb250UmVzb3VyY2VDb250ZW50Vmlldy5Db250ZW50 RWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICAgICAgY29udGVudEVsZW1lbnQuY2xhc3NO YW1lID0gImNvbnRlbnQiOwogICAgICAgICAgICAgY29udGVudEVsZW1lbnQudGV4dENvbnRlbnQg PSBsaW5lc1tpXTsKICAgICAgICAgICAgIGxpbmVFbGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnRF bGVtZW50KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuanMKaW5k ZXggY2ZiNGYwZS4uMzdhMjBhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IaWVyYXJjaGljYWxQYXRoQ29t cG9uZW50LmpzCkBAIC00OCwyMSArNDgsMjEgQEAgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBh dGhDb21wb25lbnQgPSBjbGFzcyBIaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50IGV4dGVuZHMKIAog ICAgICAgICBpZiAoIXRleHRPbmx5KSB7CiAgICAgICAgICAgICB0aGlzLl9pY29uRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwotICAgICAgICAgICAgdGhpcy5faWNvbkVs ZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQu SWNvbkVsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICAgICAgICAgIHRoaXMuX2ljb25FbGVtZW50 LmNsYXNzTmFtZSA9ICJpY29uIjsKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5faWNvbkVsZW1lbnQpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHRoaXMu X2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBv bmVudC5UZXh0T25seVN0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICB0aGlzLl90aXRsZUVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdGhpcy5fdGl0bGVF bGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50 LlRpdGxlRWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQu Y2xhc3NOYW1lID0gInRpdGxlIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLl90aXRsZUVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX3RpdGxlQ29udGVudEVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdGhpcy5fdGl0bGVDb250 ZW50RWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBv bmVudC5UaXRsZUNvbnRlbnRFbGVtZW50U3R5bGVDbGFzc05hbWU7CisgICAgICAgIHRoaXMuX3Rp dGxlQ29udGVudEVsZW1lbnQuY2xhc3NOYW1lID0gImNvbnRlbnQiOwogICAgICAgICB0aGlzLl90 aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdGl0bGVDb250ZW50RWxlbWVudCk7CiAKICAg ICAgICAgdGhpcy5fc2VwYXJhdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwotICAgICAgICB0aGlzLl9zZXBhcmF0b3JFbGVtZW50LmNsYXNzTmFtZSA9IFdlYkluc3Bl Y3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlNlcGFyYXRvckVsZW1lbnRTdHlsZUNsYXNz TmFtZTsKKyAgICAgICAgdGhpcy5fc2VwYXJhdG9yRWxlbWVudC5jbGFzc05hbWUgPSAic2VwYXJh dG9yIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zZXBhcmF0b3JF bGVtZW50KTsKIAogICAgICAgICB0aGlzLl9zZWxlY3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgic2VsZWN0Iik7CkBAIC0xOTgsNyArMTk4LDcgQEAgV2ViSW5zcGVjdG9yLkhpZXJh cmNoaWNhbFBhdGhDb21wb25lbnQgPSBjbGFzcyBIaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50IGV4 dGVuZHMKICAgICB7CiAgICAgICAgIGlmIChmbGFnKSB7CiAgICAgICAgICAgICB0aGlzLl9zZWxl Y3RvckFycm93c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsKLSAgICAg ICAgICAgIHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0 b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5TZWxlY3RvckFycm93c0VsZW1lbnRTdHlsZUNs YXNzTmFtZTsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudC5jbGFzc05h bWUgPSAic2VsZWN0b3ItYXJyb3dzIjsKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuaW5zZXJ0 QmVmb3JlKHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudCwgdGhpcy5fc2VwYXJhdG9yRWxlbWVu dCk7CiAKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0 b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5TaG93U2VsZWN0b3JBcnJvd3NTdHlsZUNsYXNz TmFtZSk7CkBAIC0zMTYsMTMgKzMxNiw4IEBAIFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRo Q29tcG9uZW50ID0gY2xhc3MgSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudCBleHRlbmRzCiAKIFdl Ykluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LkhpZGRlblN0eWxlQ2xhc3NOYW1l ID0gImhpZGRlbiI7CiBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5Db2xs YXBzZWRTdHlsZUNsYXNzTmFtZSA9ICJjb2xsYXBzZWQiOwotV2ViSW5zcGVjdG9yLkhpZXJhcmNo aWNhbFBhdGhDb21wb25lbnQuSWNvbkVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJpY29uIjsKIFdl Ykluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlRleHRPbmx5U3R5bGVDbGFzc05h bWUgPSAidGV4dC1vbmx5IjsKIFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50 LlNob3dTZWxlY3RvckFycm93c1N0eWxlQ2xhc3NOYW1lID0gInNob3ctc2VsZWN0b3ItYXJyb3dz IjsKLVdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlRpdGxlRWxlbWVudFN0 eWxlQ2xhc3NOYW1lID0gInRpdGxlIjsKLVdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29t cG9uZW50LlRpdGxlQ29udGVudEVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJjb250ZW50IjsKLVdl Ykluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlNlbGVjdG9yQXJyb3dzRWxlbWVu dFN0eWxlQ2xhc3NOYW1lID0gInNlbGVjdG9yLWFycm93cyI7Ci1XZWJJbnNwZWN0b3IuSGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudC5TZXBhcmF0b3JFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAic2Vw YXJhdG9yIjsKIAogV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuTWluaW11 bVdpZHRoID0gMzI7CiBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5NaW5p bXVtV2lkdGhDb2xsYXBzZWQgPSAyNDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVk RGF0YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LmpzCmluZGV4IGJiN2NhZjAuLjVkNzg0Y2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lu ZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVD b250ZW50Vmlldy5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFi YXNlT2JqZWN0U3RvcmVDb250ZW50VmlldyA9IGZ1bmN0aW9uKG9iamVjdFN0b3JlT3JJbmRleAog ewogICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5jYWxsKHRoaXMsIG9iamVjdFN0b3JlT3JJ bmRleCk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuSW5k ZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSk7CisgICAg dGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImluZGV4ZWQtZGF0YWJhc2Utb2JqZWN0LXN0b3Jl Iik7CiAKICAgICBpZiAob2JqZWN0U3RvcmVPckluZGV4IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlKSB7CiAgICAgICAgIHRoaXMuX29iamVjdFN0b3Jl ID0gb2JqZWN0U3RvcmVPckluZGV4OwpAQCAtNzcsOCArNzcsNiBAQCBXZWJJbnNwZWN0b3IuSW5k ZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50VmlldyA9IGZ1bmN0aW9uKG9iamVjdFN0b3Jl T3JJbmRleAogICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLl9yZWZyZXNoQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiB9OwogCi1XZWJJbnNwZWN0b3IuSW5k ZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSA9ICJpbmRl eGVkLWRhdGFiYXNlLW9iamVjdC1zdG9yZSI7Ci0KIFdlYkluc3BlY3Rvci5JbmRleGVkRGF0YWJh c2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3Rvcjog V2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcsCiAgICAg X19wcm90b19fOiBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJvdG90eXBlLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxp bmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzCmluZGV4IGY3NDg5ZGMuLmYwYmYw MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAg LTI3LDcgKzI3LDcgQEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9 IGZ1bmN0aW9uKHRpbWVsaW5lKQogewogICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 R3JhcGguY2FsbCh0aGlzLCB0aW1lbGluZSk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0 LmFkZChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLlN0eWxlQ2xhc3NO YW1lKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibGF5b3V0Iik7CiAKICAgICB0 aGlzLl9sYXlvdXRUaW1lbGluZSA9IHRpbWVsaW5lOwogICAgIHRoaXMuX2xheW91dFRpbWVsaW5l LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lLkV2ZW50LlJlY29yZEFkZGVk LCB0aGlzLl9sYXlvdXRUaW1lbGluZVJlY29yZEFkZGVkLCB0aGlzKTsKQEAgLTM3LDggKzM3LDYg QEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGZ1bmN0aW9uKHRp bWVsaW5lKQogICAgIHRoaXMucmVzZXQoKTsKIH07CiAKLVdlYkluc3BlY3Rvci5MYXlvdXRUaW1l bGluZU92ZXJ2aWV3R3JhcGguU3R5bGVDbGFzc05hbWUgPSAibGF5b3V0IjsKLQogV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgY29uc3Ry dWN0b3I6IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGgsCiAgICAgX19w cm90b19fOiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCmluZGV4IDg1Njc3 OGIuLjM0ODM5NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdH cmFwaC5qcwpAQCAtMjgsNyArMjgsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lT3Zl cnZpZXdHcmFwaCA9IGZ1bmN0aW9uKHRpbWVsaW5lKQogewogICAgIFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3R3JhcGguY2FsbCh0aGlzLCB0aW1lbGluZSk7CiAKLSAgICB0aGlzLmVsZW1l bnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdHcmFw aC5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoIm5ldHdv cmsiKTsKIAogICAgIHRpbWVsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lLkV2ZW50LlJlY29yZEFkZGVkLCB0aGlzLl9uZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCwg dGhpcyk7CiAgICAgdGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxp bmUuRXZlbnQuVGltZXNVcGRhdGVkLCB0aGlzLm5lZWRzTGF5b3V0LCB0aGlzKTsKQEAgLTM2LDcg KzM2LDYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBmdW5j dGlvbih0aW1lbGluZSkKICAgICB0aGlzLnJlc2V0KCk7CiB9OwogCi1XZWJJbnNwZWN0b3IuTmV0 d29ya1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5TdHlsZUNsYXNzTmFtZSA9ICJuZXR3b3JrIjsKIFdl Ykluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLkdyYXBoUm93U3R5bGVDbGFz c05hbWUgPSAiZ3JhcGgtcm93IjsKIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVPdmVydmll d0dyYXBoLkJhclN0eWxlQ2xhc3NOYW1lID0gImJhciI7CiBXZWJJbnNwZWN0b3IuTmV0d29ya1Rp bWVsaW5lT3ZlcnZpZXdHcmFwaC5JbmFjdGl2ZUJhclN0eWxlQ2xhc3NOYW1lID0gImluYWN0aXZl IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKaW5kZXggMmYwZDI2Ny4uZTliMGFl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv T3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKQEAgLTQ0LDcgKzQ0LDcgQEAg V2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nLCBl eHRyYUFyZ3VtZW50cykKICAgICB0aGlzLl9jdXJyZW50VGltZU1hcmtlciA9IG5ldyBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNYXJrZXIoMCwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFya2VyLlR5cGUu Q3VycmVudFRpbWUpOwogICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuYWRkTWFya2VyKHRoaXMuX2N1 cnJlbnRUaW1lTWFya2VyKTsKIAotICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYklu c3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhpcy5l bGVtZW50LmNsYXNzTGlzdC5hZGQoIm92ZXJ2aWV3Iik7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQpOwogCiAgICAgdGhpcy5fbmV0d29ya1RpbWVs aW5lID0gcmVjb3JkaW5nLnRpbWVsaW5lcy5nZXQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk LlR5cGUuTmV0d29yayk7CkBAIC01NSw4ICs1NSw2IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1Rp bWVsaW5lVmlldyA9IGZ1bmN0aW9uKHJlY29yZGluZywgZXh0cmFBcmd1bWVudHMpCiAgICAgdGhp cy5fcGVuZGluZ1JlcHJlc2VudGVkT2JqZWN0cyA9IFtdOwogfTsKIAotV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3VGltZWxpbmVWaWV3LlN0eWxlQ2xhc3NOYW1lID0gIm92ZXJ2aWV3IjsKLQogV2ViSW5z cGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3Rv cjogV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LAogICAgIF9fcHJvdG9fXzogV2Vi SW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRh aWxzU2VjdGlvbi5qcwppbmRleCBiYTViNjIzLi42OTAzZDM2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9u LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2Jl U2V0RGV0YWlsc1NlY3Rpb24uanMKQEAgLTE0OSw0ICsxNDksMyBAQCBXZWJJbnNwZWN0b3IuUHJv YmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZVBvcG92ZXJFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAi cHJvYmUtcAogV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVDbGVhclNh bXBsZXNTdHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1jbGVhci1zYW1wbGVzIjsKIFdlYkluc3BlY3Rv ci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlByb2JlUmVtb3ZlU3R5bGVDbGFzc05hbWUgPSAicHJv YmUtcmVtb3ZlIjsKIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlNlY3Rpb25P cHRpb25zU3R5bGVDbGFzc05hbWUgPSAib3B0aW9ucyI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXRE ZXRhaWxzU2VjdGlvbi5TdHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1zZXQiOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xl LmpzCmluZGV4IGNhYWFjNjAuLjk5MDkwZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKQEAgLTQyLDcg KzQyLDcgQEAgV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xp c3QuYWRkKCJxdWljay1jb25zb2xlIik7CiAKICAgICAgICAgdGhpcy5wcm9tcHQgPSBuZXcgV2Vi SW5zcGVjdG9yLkNvbnNvbGVQcm9tcHQobnVsbCwgInRleHQvamF2YXNjcmlwdCIpOwotICAgICAg ICB0aGlzLnByb21wdC5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlF1aWNrQ29u c29sZS5UZXh0UHJvbXB0U3R5bGVDbGFzc05hbWUpOworICAgICAgICB0aGlzLnByb21wdC5lbGVt ZW50LmNsYXNzTGlzdC5hZGQoInRleHQtcHJvbXB0Iik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5wcm9tcHQuZWxlbWVudCk7CiAKICAgICAgICAgLy8gRklYTUU6IENv ZGVNaXJyb3IgNCBoYXMgYSBkZWZhdWx0ICJFc2MiIGtleSBoYW5kbGVyIHRoYXQgYWx3YXlzIHBy ZXZlbnRzIGRlZmF1bHQuCkBAIC0zNDAsOSArMzQwLDYgQEAgV2ViSW5zcGVjdG9yLlF1aWNrQ29u c29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIH07 CiAKIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuU2hvd2luZ0xvZ0NsYXNzTmFtZSA9ICJzaG93 aW5nLWxvZyI7Ci1XZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLk5hdmlnYXRpb25CYXJDb250YWlu ZXJTdHlsZUNsYXNzTmFtZSA9ICJuYXZpZ2F0aW9uLWJhci1jb250YWluZXIiOwotV2ViSW5zcGVj dG9yLlF1aWNrQ29uc29sZS5OYXZpZ2F0aW9uQmFyU3BhY2VyU3R5bGVDbGFzc05hbWUgPSAibmF2 aWdhdGlvbi1iYXItc3BhY2VyIjsKLVdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUuVGV4dFByb21w dFN0eWxlQ2xhc3NOYW1lID0gInRleHQtcHJvbXB0IjsKIAogV2ViSW5zcGVjdG9yLlF1aWNrQ29u c29sZS5Ub29sYmFyU2luZ2xlTGluZUhlaWdodCA9IDIxOwogV2ViSW5zcGVjdG9yLlF1aWNrQ29u c29sZS5Ub29sYmFyUHJvbXB0UGFkZGluZyA9IDQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXBsYXlEYXNoYm9hcmRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVwbGF5RGFzaGJvYXJkVmll dy5qcwppbmRleCA0YjA3ZDM3Li41OThiNTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXBsYXlEYXNoYm9hcmRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlcGxheURhc2hib2FyZFZp ZXcuanMKQEAgLTExNCw3ICsxMTQsMyBAQCBXZWJJbnNwZWN0b3IuUmVwbGF5RGFzaGJvYXJkVmll dyA9IGNsYXNzIFJlcGxheURhc2hib2FyZFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAg ICB0aGlzLl9yZXBsYXlCdXR0b25JdGVtLnRvZ2dsZWQgPSBmYWxzZTsKICAgICB9CiB9OwotCi1X ZWJJbnNwZWN0b3IuUmVwbGF5RGFzaGJvYXJkVmlldy5SZWNvcmRpbmdDb250YWluZXJTdHlsZUNs YXNzTmFtZSA9ICJyZWNvcmRpbmctY29udGFpbmVyIjsKLVdlYkluc3BlY3Rvci5SZXBsYXlEYXNo Ym9hcmRWaWV3LlJlY29yZEJ1dHRvblN0eWxlQ2xhc3NOYW1lID0gInJlY29yZC1idXR0b24iOwot V2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcuUmVwbGF5QnV0dG9uU3R5bGVDbGFzc05h bWUgPSAicmVwbGF5LWJ1dHRvbiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCmluZGV4IDkw MWJhYWUuLjRmZTZlN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCkBAIC0yNyw3ICsy Nyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRDb250ZW50VmlldyA9IGZ1bmN0aW9uKHNjcmlwdCkK IHsKICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuY2FsbCh0aGlzLCBzY3JpcHQpOwogCi0g ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRW aWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgic2Ny aXB0Iik7CiAKICAgICAvLyBBcHBlbmQgYSBzcGlubmVyIHdoaWxlIHdhaXRpbmcgZm9yIF9jb250 ZW50V2lsbFBvcHVsYXRlLgogICAgIHZhciBzcGlubmVyID0gbmV3IFdlYkluc3BlY3Rvci5JbmRl dGVybWluYXRlUHJvZ3Jlc3NTcGlubmVyOwpAQCAtNjMsOCArNjMsNiBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0Q29udGVudFZpZXcgPSBmdW5jdGlvbihzY3JpcHQpCiAgICAgV2ViSW5zcGVjdG9yLnNo b3dKYXZhU2NyaXB0VHlwZUluZm9ybWF0aW9uU2V0dGluZy5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dKYXZhU2NyaXB0VHlwZUlu Zm9ybWF0aW9uU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwogfTsKIAotV2ViSW5zcGVjdG9yLlNjcmlw dENvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lID0gInNjcmlwdCI7Ci0KIFdlYkluc3BlY3Rvci5T Y3JpcHRDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3Bl Y3Rvci5TY3JpcHRDb250ZW50VmlldywKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVP dmVydmlld0dyYXBoLmpzCmluZGV4IDM3ODdhMzMuLmY5ZGJhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lT3ZlcnZp ZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAgLTI3LDcgKzI3LDcgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGZ1bmN0aW9uKHRpbWVsaW5lKQog ewogICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3R3JhcGguY2FsbCh0aGlzLCB0aW1l bGluZSk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuU2Ny aXB0VGltZWxpbmVPdmVydmlld0dyYXBoLlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLmVsZW1l bnQuY2xhc3NMaXN0LmFkZCgic2NyaXB0Iik7CiAKICAgICB0aGlzLl9zY3JpcHRUaW1lbGluZSA9 IHRpbWVsaW5lOwogICAgIHRoaXMuX3NjcmlwdFRpbWVsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lLkV2ZW50LlJlY29yZEFkZGVkLCB0aGlzLl9zY3JpcHRUaW1lbGlu ZVJlY29yZEFkZGVkLCB0aGlzKTsKQEAgLTM3LDggKzM3LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGZ1bmN0aW9uKHRpbWVsaW5lKQogICAgIHRoaXMucmVz ZXQoKTsKIH07CiAKLVdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguU3R5 bGVDbGFzc05hbWUgPSAic2NyaXB0IjsKLQogV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lT3Zl cnZpZXdHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5T Y3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGgsCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcwpp bmRleCA5ODE4MDI0Li45NmFlNDA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UZXh0Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dENvbnRlbnRWaWV3LmpzCkBAIC0yNyw3 ICsyNyw3IEBAIFdlYkluc3BlY3Rvci5UZXh0Q29udGVudFZpZXcgPSBmdW5jdGlvbihzdHJpbmcs IG1pbWVUeXBlKQogewogICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5jYWxsKHRoaXMsIHN0 cmluZyk7CiAKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGV4 dENvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0 LmFkZCgidGV4dCIpOwogCiAgICAgdGhpcy5fdGV4dEVkaXRvciA9IG5ldyBXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvcjsKICAgICB0aGlzLl90ZXh0RWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlRleHRFZGl0b3IuRXZlbnQuTnVtYmVyT2ZTZWFyY2hSZXN1bHRzRGlkQ2hhbmdlLCB0 aGlzLl9udW1iZXJPZlNlYXJjaFJlc3VsdHNEaWRDaGFuZ2UsIHRoaXMpOwpAQCAtNTEsOCArNTEs NiBAQCBXZWJJbnNwZWN0b3IuVGV4dENvbnRlbnRWaWV3ID0gZnVuY3Rpb24oc3RyaW5nLCBtaW1l VHlwZSkKICAgICB0aGlzLl9zaG93VHlwZXNCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0g ZmFsc2U7CiB9OwogCi1XZWJJbnNwZWN0b3IuVGV4dENvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1l ID0gInRleHQiOwotCiBXZWJJbnNwZWN0b3IuVGV4dENvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsK ICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlRleHRDb250ZW50VmlldywKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lT3ZlcnZpZXcuanMKaW5kZXggZWE2NmI5OC4uMThjNTExYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZU92ZXJ2aWV3LmpzCkBAIC0zMywxMSArMzMsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXcgPSBmdW5jdGlvbihpZGVudGlmaWVyLCB0aW1lbGluZVJlY29yZGluZywgbWluaW11bUQK ICAgICB0aGlzLl9yZWNvcmRpbmcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxp bmVSZWNvcmRpbmcuRXZlbnQuVGltZWxpbmVSZW1vdmVkLCB0aGlzLl90aW1lbGluZVJlbW92ZWQs IHRoaXMpOwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwotICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXcuU3R5bGVDbGFzc05hbWU7CisgICAgdGhpcy5fZWxlbWVudC5jbGFzc05hbWUgPSAi dGltZWxpbmUtb3ZlcnZpZXciOwogICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi d2hlZWwiLCB0aGlzLl9oYW5kbGVXaGVlbEV2ZW50LmJpbmQodGhpcykpOwogCiAgICAgdGhpcy5f Z3JhcGhzQ29udGFpbmVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwot ICAgIHRoaXMuX2dyYXBoc0NvbnRhaW5lckVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXcuR3JhcGhzQ29udGFpbmVyU3R5bGVDbGFzc05hbWU7CisgICAgdGhp cy5fZ3JhcGhzQ29udGFpbmVyRWxlbWVudC5jbGFzc05hbWUgPSAiZ3JhcGhzLWNvbnRhaW5lciI7 CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9ncmFwaHNDb250YWluZXJFbGVt ZW50KTsKIAogICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXdHcmFwaHNNYXAgPSBuZXcgTWFwOwpA QCAtNTIsMTIgKzUyLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gZnVuY3Rp b24oaWRlbnRpZmllciwgdGltZWxpbmVSZWNvcmRpbmcsIG1pbmltdW1ECiAgICAgdGhpcy5fdGlt ZWxpbmVSdWxlci5hZGRNYXJrZXIodGhpcy5fY3VycmVudFRpbWVNYXJrZXIpOwogCiAgICAgdGhp cy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwotICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xsQ29udGFpbmVyU3R5bGVDbGFzc05hbWU7CisgICAg dGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5jbGFzc05hbWUgPSAic2Nyb2xsLWNvbnRhaW5l ciI7CiAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJz Y3JvbGwiLCB0aGlzLl9oYW5kbGVTY3JvbGxFdmVudC5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9l bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQpOwogCiAgICAg dGhpcy5fc2Nyb2xsV2lkdGhTaXplciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwot ICAgIHRoaXMuX3Njcm9sbFdpZHRoU2l6ZXIuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXcuU2Nyb2xsV2lkdGhTaXplclN0eWxlQ2xhc3NOYW1lOworICAgIHRoaXMuX3Nj cm9sbFdpZHRoU2l6ZXIuY2xhc3NOYW1lID0gInNjcm9sbC13aWR0aC1zaXplciI7CiAgICAgdGhp cy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zY3JvbGxXaWR0aFNp emVyKTsKIAogICAgIHRoaXMuX2RlZmF1bHRTZXR0aW5nc1ZhbHVlcyA9IGRlZmF1bHRTZXR0aW5n c1ZhbHVlczsKQEAgLTg1LDEwICs4NSw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 ID0gZnVuY3Rpb24oaWRlbnRpZmllciwgdGltZWxpbmVSZWNvcmRpbmcsIG1pbmltdW1ECiAgICAg ICAgIHRoaXMuX3Jlc2V0U2VsZWN0aW9uKCk7CiB9OwogCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlldy5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmlldyI7Ci1XZWJJbnNwZWN0 b3IuVGltZWxpbmVPdmVydmlldy5HcmFwaHNDb250YWluZXJTdHlsZUNsYXNzTmFtZSA9ICJncmFw aHMtY29udGFpbmVyIjsKLVdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LlNjcm9sbENvbnRh aW5lclN0eWxlQ2xhc3NOYW1lID0gInNjcm9sbC1jb250YWluZXIiOwotV2ViSW5zcGVjdG9yLlRp bWVsaW5lT3ZlcnZpZXcuU2Nyb2xsV2lkdGhTaXplclN0eWxlQ2xhc3NOYW1lID0gInNjcm9sbC13 aWR0aC1zaXplciI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5TY3JvbGxEZWx0YURl bm9taW5hdG9yID0gNTAwOwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5FdmVudCA9 IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCA4MTUwMGZjLi43ZDNi NDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCkBAIC01Myw3ICs1Myw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBmdW5jdGlvbih0aW1lbGlu ZSkKICAgICAvLyBXZWJJbnNwZWN0b3IuT2JqZWN0LmNhbGwodGhpcyk7CiAKICAgICB0aGlzLmVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0dyYXBoLlN0eWxlQ2xh c3NOYW1lKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgidGltZWxpbmUtb3ZlcnZp ZXctZ3JhcGgiKTsKIAogICAgIHRoaXMuX3plcm9UaW1lID0gMDsKICAgICB0aGlzLl9zdGFydFRp bWUgPSAwOwpAQCAtNjIsOCArNjIsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0dy YXBoID0gZnVuY3Rpb24odGltZWxpbmUpCiAgICAgdGhpcy5fdGltZWxpbmVPdmVydmlldyA9IG51 bGw7CiB9OwogCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0dyYXBoLlN0eWxlQ2xhc3NO YW1lID0gInRpbWVsaW5lLW92ZXJ2aWV3LWdyYXBoIjsKLQogV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3R3JhcGgsCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2Jq ZWN0LnByb3RvdHlwZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKaW5kZXggNTdmYzg3Mi4u ZTdmYjdkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKQEAgLTI5LDcgKzI5LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkQmFyID0gZnVuY3Rpb24ocmVjb3JkcywgcmVuZGVy TW9kZSkKICAgICAvLyBXZWJJbnNwZWN0b3IuT2JqZWN0LmNhbGwodGhpcyk7CiAKICAgICB0aGlz Ll9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5fZWxl bWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEJhci5TdHlsZUNs YXNzTmFtZSk7CisgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0aW1lbGluZS1yZWNv cmQtYmFyIik7CiAKICAgICB0aGlzLnJlbmRlck1vZGUgPSByZW5kZXJNb2RlOwogICAgIHRoaXMu cmVjb3JkcyA9IHJlY29yZHM7CkBAIC0zOCw3ICszOCw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZEJhciA9IGZ1bmN0aW9uKHJlY29yZHMsIHJlbmRlck1vZGUpCiAvLyBGSVhNRTogTW92 ZSB0byBhIFdlYkluc3BlY3Rvci5PYmplY3Qgc3ViY2xhc3MgYW5kIHdlIGNhbiByZW1vdmUgdGhp cy4KIFdlYkluc3BlY3Rvci5PYmplY3QuZGVwcmVjYXRlZEFkZENvbnN0cnVjdG9yRnVuY3Rpb25z KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEJhcik7CiAKLVdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZEJhci5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS1yZWNvcmQtYmFyIjsKIFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZEJhci5CYXJTZWdtZW50U3R5bGVDbGFzc05hbWUgPSAic2Vn bWVudCI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRCYXIuSW5hY3RpdmVTdHlsZUNsYXNz TmFtZSA9ICJpbmFjdGl2ZSI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRCYXIuVW5maW5p c2hlZFN0eWxlQ2xhc3NOYW1lID0gInVuZmluaXNoZWQiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRGcmFtZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3Jk RnJhbWUuanMKaW5kZXggMWVlYTY2Mi4uMDNhZTRlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRGcmFtZS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29y ZEZyYW1lLmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEZy YW1lID0gZnVuY3Rpb24oZ3JhcGhEYXRhU291cmNlLCByZWNvcmQpCiAgICAgLy8gV2ViSW5zcGVj dG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRGcmFtZS5TdHlsZUNsYXNzTmFtZSk7CisgICAgdGhpcy5f ZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0aW1lbGluZS1yZWNvcmQtZnJhbWUiKTsKIAogICAgIHRo aXMuX2dyYXBoRGF0YVNvdXJjZSA9IGdyYXBoRGF0YVNvdXJjZTsKICAgICB0aGlzLl9yZWNvcmQg PSByZWNvcmQgfHwgbnVsbDsKQEAgLTM4LDcgKzM4LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkRnJhbWUgPSBmdW5jdGlvbihncmFwaERhdGFTb3VyY2UsIHJlY29yZCkKIC8vIEZJWE1F OiBNb3ZlIHRvIGEgV2ViSW5zcGVjdG9yLk9iamVjdCBzdWJjbGFzcyBhbmQgd2UgY2FuIHJlbW92 ZSB0aGlzLgogV2ViSW5zcGVjdG9yLk9iamVjdC5kZXByZWNhdGVkQWRkQ29uc3RydWN0b3JGdW5j dGlvbnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkRnJhbWUpOwogCi1XZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmRGcmFtZS5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS1yZWNvcmQtZnJh bWUiOwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkRnJhbWUuTWF4aW11bVdpZHRoUGl4ZWxz ID0gMTY7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRGcmFtZS5NaW5pbXVtV2lkdGhQaXhl bHMgPSA0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5q cwppbmRleCAzZTFmZjg5Li45ZGRmNWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVj b3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTM0LDcgKzM0LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZWNvcmRpbmcsIGV4dHJhQXJndW1l bnRzKQogICAgIHRoaXMuX3JlY29yZGluZyA9IHJlY29yZGluZzsKICAgICB0aGlzLl90aW1lbGlu ZVNpZGViYXJQYW5lbCA9IGV4dHJhQXJndW1lbnRzLnRpbWVsaW5lU2lkZWJhclBhbmVsOwogCi0g ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk aW5nQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUpOworICAgIHRoaXMuZWxlbWVudC5jbGFzc0xp c3QuYWRkKCJ0aW1lbGluZS1yZWNvcmRpbmciKTsKIAogICAgIHRoaXMuX2xpbmVhclRpbWVsaW5l T3ZlcnZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmVhclRpbWVsaW5lT3ZlcnZpZXcodGhpcy5f cmVjb3JkaW5nKTsKICAgICB0aGlzLl9saW5lYXJUaW1lbGluZU92ZXJ2aWV3LmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuRXZlbnQuVGltZVJhbmdlU2VsZWN0 aW9uQ2hhbmdlZCwgdGhpcy5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCwgdGhpcyk7CkBAIC04 NCw4ICs4NCw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0g ZnVuY3Rpb24ocmVjb3JkaW5nLCBleHRyYUFyZ3VtZW50cykKICAgICB0aGlzLnNob3dPdmVydmll d1RpbWVsaW5lVmlldygpOwogfTsKIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcuU3R5bGVDbGFzc05hbWUgPSAidGltZWxpbmUtcmVjb3JkaW5nIjsKLQogV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuU2VsZWN0ZWRUaW1lbGluZVR5cGVD b29raWVLZXkgPSAidGltZWxpbmUtcmVjb3JkaW5nLWNvbnRlbnQtdmlldy1zZWxlY3RlZC10aW1l bGluZS10eXBlIjsKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3Lk92 ZXJ2aWV3VGltZWxpbmVWaWV3Q29va2llVmFsdWUgPSAidGltZWxpbmUtcmVjb3JkaW5nLWNvbnRl bnQtdmlldy1vdmVydmlldy10aW1lbGluZS12aWV3IjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKaW5k ZXggZTYxZmJmMC4uMWRiNmNlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzCkBAIC0yOSwxNCArMjks MTQgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIgPSBmdW5jdGlvbigpCiAgICAgLy8gV2Vi SW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuU3R5bGVDbGFzc05hbWU7CisgICAgdGhpcy5fZWxl bWVudC5jbGFzc05hbWUgPSAidGltZWxpbmUtcnVsZXIiOwogCiAgICAgdGhpcy5faGVhZGVyRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2hlYWRlckVs ZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuSGVhZGVyRWxlbWVu dFN0eWxlQ2xhc3NOYW1lOworICAgIHRoaXMuX2hlYWRlckVsZW1lbnQuY2xhc3NOYW1lID0gImhl YWRlciI7CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9oZWFkZXJFbGVtZW50 KTsKIAogICAgIHRoaXMuX21hcmtlcnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7Ci0gICAgdGhpcy5fbWFya2Vyc0VsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9y LlRpbWVsaW5lUnVsZXIuTWFya2Vyc0VsZW1lbnRTdHlsZUNsYXNzTmFtZTsKKyAgICB0aGlzLl9t YXJrZXJzRWxlbWVudC5jbGFzc05hbWUgPSAibWFya2VycyI7CiAgICAgdGhpcy5fZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9tYXJrZXJzRWxlbWVudCk7CiAKICAgICB0aGlzLl96ZXJvVGltZSA9 IDA7CkBAIC01NywxOSArNTcsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIgPSBmdW5j dGlvbigpCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5pbXVtTGVmdERpdmlkZXJTcGFj aW5nID0gNDg7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5pbXVtRGl2aWRlclNwYWNp bmcgPSA2NDsKIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuU3R5bGVDbGFzc05hbWUgPSAi dGltZWxpbmUtcnVsZXIiOwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuQWxsb3dzVGltZVJh bmdlU2VsZWN0aW9uU3R5bGVDbGFzc05hbWUgPSAiYWxsb3dzLXRpbWUtcmFuZ2Utc2VsZWN0aW9u IjsKLVdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkhlYWRlckVsZW1lbnRTdHlsZUNsYXNzTmFt ZSA9ICJoZWFkZXIiOwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuRGl2aWRlckVsZW1lbnRT dHlsZUNsYXNzTmFtZSA9ICJkaXZpZGVyIjsKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkRp dmlkZXJMYWJlbEVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJsYWJlbCI7CiAKLVdlYkluc3BlY3Rv ci5UaW1lbGluZVJ1bGVyLk1hcmtlcnNFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAibWFya2VycyI7 Ci1XZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5CYXNlTWFya2VyRWxlbWVudFN0eWxlQ2xhc3NO YW1lID0gIm1hcmtlciI7Ci1XZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5TaGFkZWRBcmVhRWxl bWVudFN0eWxlQ2xhc3NOYW1lID0gInNoYWRlZC1hcmVhIjsKLVdlYkluc3BlY3Rvci5UaW1lbGlu ZVJ1bGVyLlNlbGVjdGlvbkRyYWdFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAic2VsZWN0aW9uLWRy YWciOwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuU2VsZWN0aW9uSGFuZGxlRWxlbWVudFN0 eWxlQ2xhc3NOYW1lID0gInNlbGVjdGlvbi1oYW5kbGUiOwotV2ViSW5zcGVjdG9yLlRpbWVsaW5l UnVsZXIuTGVmdFNlbGVjdGlvbkVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJsZWZ0IjsKLVdlYklu c3BlY3Rvci5UaW1lbGluZVJ1bGVyLlJpZ2h0U2VsZWN0aW9uRWxlbWVudFN0eWxlQ2xhc3NOYW1l ID0gInJpZ2h0IjsKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLk1pbmltdW1TZWxlY3Rpb25U aW1lUmFuZ2UgPSAwLjAxOwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5FdmVudCA9IHsK QEAgLTEzMCwyNSArMTIxLDI1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgdGhpcy5fbW91c2VEb3duRXZlbnRMaXN0ZW5lcik7CiAKICAgICAgICAgICAgIHRoaXMu X2xlZnRTaGFkZWRBcmVhRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwot ICAgICAgICAgICAgdGhpcy5fbGVmdFNoYWRlZEFyZWFFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuU2hhZGVkQXJlYUVsZW1lbnRTdHlsZUNsYXNzTmFtZSk7 Ci0gICAgICAgICAgICB0aGlzLl9sZWZ0U2hhZGVkQXJlYUVsZW1lbnQuY2xhc3NMaXN0LmFkZChX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5MZWZ0U2VsZWN0aW9uRWxlbWVudFN0eWxlQ2xhc3NO YW1lKTsKKyAgICAgICAgICAgIHRoaXMuX2xlZnRTaGFkZWRBcmVhRWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJzaGFkZWQtYXJlYSIpOworICAgICAgICAgICAgdGhpcy5fbGVmdFNoYWRlZEFyZWFFbGVt ZW50LmNsYXNzTGlzdC5hZGQoImxlZnQiKTsKIAogICAgICAgICAgICAgdGhpcy5fcmlnaHRTaGFk ZWRBcmVhRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAg ICAgdGhpcy5fcmlnaHRTaGFkZWRBcmVhRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5UaW1lbGluZVJ1bGVyLlNoYWRlZEFyZWFFbGVtZW50U3R5bGVDbGFzc05hbWUpOwotICAgICAg ICAgICAgdGhpcy5fcmlnaHRTaGFkZWRBcmVhRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJ1bGVyLlJpZ2h0U2VsZWN0aW9uRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsK KyAgICAgICAgICAgIHRoaXMuX3JpZ2h0U2hhZGVkQXJlYUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi c2hhZGVkLWFyZWEiKTsKKyAgICAgICAgICAgIHRoaXMuX3JpZ2h0U2hhZGVkQXJlYUVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgicmlnaHQiKTsKIAogICAgICAgICAgICAgdGhpcy5fbGVmdFNlbGVjdGlv bkhhbmRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAg ICAgIHRoaXMuX2xlZnRTZWxlY3Rpb25IYW5kbGVFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUnVsZXIuU2VsZWN0aW9uSGFuZGxlRWxlbWVudFN0eWxlQ2xhc3NOYW1l KTsKLSAgICAgICAgICAgIHRoaXMuX2xlZnRTZWxlY3Rpb25IYW5kbGVFbGVtZW50LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuTGVmdFNlbGVjdGlvbkVsZW1lbnRTdHls ZUNsYXNzTmFtZSk7CisgICAgICAgICAgICB0aGlzLl9sZWZ0U2VsZWN0aW9uSGFuZGxlRWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJzZWxlY3Rpb24taGFuZGxlIik7CisgICAgICAgICAgICB0aGlzLl9s ZWZ0U2VsZWN0aW9uSGFuZGxlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsZWZ0Iik7CiAgICAgICAg ICAgICB0aGlzLl9sZWZ0U2VsZWN0aW9uSGFuZGxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJt b3VzZWRvd24iLCB0aGlzLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZURvd24uYmluZCh0aGlz KSk7CiAKICAgICAgICAgICAgIHRoaXMuX3JpZ2h0U2VsZWN0aW9uSGFuZGxlRWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAgICAgdGhpcy5fcmlnaHRTZWxl Y3Rpb25IYW5kbGVFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVs ZXIuU2VsZWN0aW9uSGFuZGxlRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKLSAgICAgICAgICAgIHRo aXMuX3JpZ2h0U2VsZWN0aW9uSGFuZGxlRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5UaW1lbGluZVJ1bGVyLlJpZ2h0U2VsZWN0aW9uRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKKyAg ICAgICAgICAgIHRoaXMuX3JpZ2h0U2VsZWN0aW9uSGFuZGxlRWxlbWVudC5jbGFzc0xpc3QuYWRk KCJzZWxlY3Rpb24taGFuZGxlIik7CisgICAgICAgICAgICB0aGlzLl9yaWdodFNlbGVjdGlvbkhh bmRsZUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmlnaHQiKTsKICAgICAgICAgICAgIHRoaXMuX3Jp Z2h0U2VsZWN0aW9uSGFuZGxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZURvd24uYmluZCh0aGlzKSk7CiAKICAgICAg ICAgICAgIHRoaXMuX3NlbGVjdGlvbkRyYWdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3Rpb25EcmFnRWxlbWVudC5jbGFzc0xp c3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLlNlbGVjdGlvbkRyYWdFbGVtZW50U3R5 bGVDbGFzc05hbWUpOworICAgICAgICAgICAgdGhpcy5fc2VsZWN0aW9uRHJhZ0VsZW1lbnQuY2xh c3NMaXN0LmFkZCgic2VsZWN0aW9uLWRyYWciKTsKIAogICAgICAgICAgICAgdGhpcy5fbmVlZHNT ZWxlY3Rpb25MYXlvdXQoKTsKICAgICAgICAgfSBlbHNlIHsKQEAgLTMwNCw3ICsyOTUsNyBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIG1hcmtlci5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hcmtlci5FdmVudC5UaW1lQ2hh bmdlZCwgdGhpcy5fdGltZWxpbmVNYXJrZXJUaW1lQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAg dmFyIG1hcmtlckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAg ICAgbWFya2VyRWxlbWVudC5jbGFzc0xpc3QuYWRkKG1hcmtlci50eXBlLCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSdWxlci5CYXNlTWFya2VyRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAg bWFya2VyRWxlbWVudC5jbGFzc0xpc3QuYWRkKG1hcmtlci50eXBlLCAibWFya2VyIik7CiAKICAg ICAgICAgdGhpcy5fbWFya2VyRWxlbWVudE1hcC5zZXQobWFya2VyLCBtYXJrZXJFbGVtZW50KTsK IAo=