136682 2014-09-09 15:10:29 -0700 Web Inspector: Fix ESLint consistent-return warnings 2014-09-10 12:15:47 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells timothy webkit-bug-importer oldest_to_newest 1034180 0 joepeck 2014-09-09 15:10:29 -0700 This warning warns about inconsistent use of "return x" and "return" within a function. This fixes all but CodeMirrorCompletionController.js warning which have key handlers that either bail or return CodeMirror.Pass. 1034181 1 237861 joepeck 2014-09-09 15:11:46 -0700 Created attachment 237861 [PATCH] Proposed Fix 1034183 2 237863 joepeck 2014-09-09 15:13:41 -0700 Created attachment 237863 [PATCH] Proposed Fix Better fix, includes the change to the eslintrc file. 1034302 3 237863 timothy 2014-09-10 08:16:18 -0700 Comment on attachment 237863 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237863&action=review > Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js:-389 > console.assert(!this._waitingForMainFrameResourceTreePayload); > - if (this._waitingForMainFrameResourceTreePayload) > - return; Why isn't the early return needed still? It would be bad to continue here. 1034357 4 237863 joepeck 2014-09-10 11:39:35 -0700 Comment on attachment 237863 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237863&action=review >> Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js:-389 >> - return; > > Why isn't the early return needed still? It would be bad to continue here. Checking all the callers, this should never be reached if this._waitingForMainFrameResourceTreePayload. So rather then return null which could throw an exception earlier on, I just left the assert. 1034364 5 237863 commit-queue 2014-09-10 12:15:43 -0700 Comment on attachment 237863 [PATCH] Proposed Fix Clearing flags on attachment: 237863 Committed r173477: <http://trac.webkit.org/changeset/173477> 1034365 6 commit-queue 2014-09-10 12:15:47 -0700 All reviewed patches have been landed. Closing bug. 237861 2014-09-09 15:11:46 -0700 2014-09-09 15:13:41 -0700 [PATCH] Proposed Fix consistent-return.patch text/plain 13131 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQwYWY0ZDguLjhlZTZiYmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA5LTA5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IEVT TGludCBjb25zaXN0ZW50LXJldHVybiB3YXJuaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2NjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyYW5j aE1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJhbmNoTWFuYWdlci5wcm90b3R5 cGUuY3JlYXRlQnJhbmNoKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Zy YW1lUmVzb3VyY2VNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3Vy Y2VNYW5hZ2VyLnByb3RvdHlwZS5fYWRkTmV3UmVzb3VyY2VUb0ZyYW1lKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTU5vZGVTdHlsZXMucHJvdG90eXBlLl9wYXJzZVN0eWxlRGVjbGFyYXRpb25QYXlsb2Fk KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25S b3cuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5w cm90b3R5cGUuX2FwcGx5VXNlcklucHV0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50 LnByb3RvdHlwZS5zaG93Q2hpbGQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVt ZW50LnByb3RvdHlwZS5fc3RhcnRFZGl0aW5nVGFyZ2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0V2ZW50TGlzdGVuZXJTZWN0aW9uR3JvdXAuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRXZlbnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5wcm90b3R5cGUuX25vZGVUZXh0T3JMaW5r KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50Vmlldy5wcm90b3R5cGUuX3Nob3dDb250 ZW50Vmlld0ZvcklkZW50aWZpZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2 aWdhdGlvbkJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyLnByb3Rv dHlwZS5pbnNlcnROYXZpZ2F0aW9uSXRlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdh dGlvbkJhci5wcm90b3R5cGUucmVtb3ZlTmF2aWdhdGlvbkl0ZW0pOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlF1 aWNrQ29uc29sZS5wcm90b3R5cGUuX2luc2VydEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 Rm9yRnJhbWUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyLnByb3RvdHlwZS5hZGRTaWRlYmFyUGFuZWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXIucHJvdG90eXBlLnJlbW92ZVNpZGViYXJQYW5l bCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLmFkZFN0eWxlQ2xhc3NUb0xpbmUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLnJlbW92ZVN0eWxl Q2xhc3NGcm9tTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5 cGUudG9nZ2xlU3R5bGVDbGFzc0ZvckxpbmUpOgorCiAyMDE0LTA5LTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IEVT TGludCBuby10cmFpbGluZy1zcGFjZXMgd2FybmluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyYW5jaE1hbmFnZXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9CcmFuY2hNYW5h Z2VyLmpzCmluZGV4IDI3M2U3NGUuLjY3ZWNkYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyYW5jaE1hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQnJhbmNoTWFu YWdlci5qcwpAQCAtNzQsNyArNzQsNyBAQCBXZWJJbnNwZWN0b3IuQnJhbmNoTWFuYWdlci5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJvbUJyYW5jaCBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5CcmFuY2gpOwogICAgICAgICBpZiAoIShmcm9tQnJhbmNoIGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLkJyYW5jaCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICByZXR1cm4gbnVsbDsKIAogICAgICAgICB2YXIgbmV3QnJhbmNoID0gZnJvbUJyYW5jaC5mb3Jr KGRpc3BsYXlOYW1lKTsKICAgICAgICAgdGhpcy5fYnJhbmNoZXMucHVzaChuZXdCcmFuY2gpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvRnJhbWVSZXNvdXJjZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5qcwppbmRleCAyYzU1NmYy Li5iZDZiMGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5q cwpAQCAtMzg1LDggKzM4NSw2IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5w cm90b3R5cGUgPSB7CiAgICAgX2FkZE5ld1Jlc291cmNlVG9GcmFtZTogZnVuY3Rpb24ocmVxdWVz dElkZW50aWZpZXIsIGZyYW1lSWRlbnRpZmllciwgbG9hZGVySWRlbnRpZmllciwgdXJsLCB0eXBl LCByZXF1ZXN0TWV0aG9kLCByZXF1ZXN0SGVhZGVycywgcmVxdWVzdERhdGEsIHRpbWVzdGFtcCwg ZnJhbWVOYW1lLCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBpbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRp b24pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fd2FpdGluZ0Zvck1haW5G cmFtZVJlc291cmNlVHJlZVBheWxvYWQpOwotICAgICAgICBpZiAodGhpcy5fd2FpdGluZ0Zvck1h aW5GcmFtZVJlc291cmNlVHJlZVBheWxvYWQpCi0gICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgdmFyIHJlc291cmNlID0gbnVsbDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwppbmRleCBkNWM1 ODAxLi5iNDJjZjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAtNjY1LDcgKzY2NSw3IEBA IFdlYkluc3BlY3Rvci5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICAgICAgdGhpcy5fcGFyc2VTdHlsZURlY2xhcmF0aW9uUGF5bG9hZChwYXlsb2FkLCBzdHlsZURl Y2xhcmF0aW9uLm5vZGUsIHN0eWxlRGVjbGFyYXRpb24uaW5oZXJpdGVkLCBzdHlsZURlY2xhcmF0 aW9uLnR5cGUsIHN0eWxlRGVjbGFyYXRpb24ub3duZXJSdWxlKTsKICAgICAgICAgICAgICAgICB9 CiAKLSAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7 CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICghc3R5bGVEZWNsYXJhdGlvbikgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94 TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKaW5kZXggZDYwN2NjZS4u MGQ0ZDdjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCkBA IC0zNzgsOCArMzc4LDExIEBAIFdlYkluc3BlY3Rvci5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93 LnByb3RvdHlwZSA9IHsKIAogICAgIF9hcHBseVVzZXJJbnB1dDogZnVuY3Rpb24oZWxlbWVudCwg dXNlcklucHV0LCBwcmV2aW91c0NvbnRlbnQsIGNvbnRleHQsIGNvbW1pdEVkaXRvcikKICAgICB7 Ci0gICAgICAgIGlmIChjb21taXRFZGl0b3IgJiYgdXNlcklucHV0ID09PSBwcmV2aW91c0NvbnRl bnQpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fZWRpdGluZ0NhbmNlbGxlZChlbGVtZW50LCBj b250ZXh0KTsgLy8gbm90aGluZyBjaGFuZ2VkLCBzbyBjYW5jZWwKKyAgICAgICAgaWYgKGNvbW1p dEVkaXRvciAmJiB1c2VySW5wdXQgPT09IHByZXZpb3VzQ29udGVudCkgeworICAgICAgICAgICAg Ly8gTm90aGluZyBjaGFuZ2VkLCBzbyBjYW5jZWwuCisgICAgICAgICAgICB0aGlzLl9lZGl0aW5n Q2FuY2VsbGVkKGVsZW1lbnQsIGNvbnRleHQpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICB9CiAKICAgICAgICAgaWYgKGNvbnRleHQuYm94ICE9PSAicG9zaXRpb24iICYmICghdXNlcklu cHV0IHx8IHVzZXJJbnB1dCA9PT0gIlx1MjAxMiIpKQogICAgICAgICAgICAgdXNlcklucHV0ID0g IjBweCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IGM0NmNkNmEuLjM4NjkxYWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVF bGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVFbGVtZW50LmpzCkBAIC0xNjcsOCArMTY3LDkgQEAgV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIHNob3dDaGlsZDogZnVuY3Rpb24oaW5kZXgp CiAgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fZWxlbWVudENsb3NlVGFnKTsK ICAgICAgICAgaWYgKHRoaXMuX2VsZW1lbnRDbG9zZVRhZykKLSAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBpZiAoaW5kZXggPj0gdGhpcy5l eHBhbmRlZENoaWxkcmVuTGltaXQpIHsKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkQ2hpbGRy ZW5MaW1pdCA9IGluZGV4ICsgMTsKQEAgLTUzNyw3ICs1MzgsNyBAQCBXZWJJbnNwZWN0b3IuRE9N VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIF9zdGFydEVkaXRpbmdUYXJnZXQ6IGZ1bmN0 aW9uKGV2ZW50VGFyZ2V0KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxpbmUuc2Vs ZWN0ZWRET01Ob2RlKCkgIT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3QpCi0gICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgaWYgKHRoaXMucmVw cmVzZW50ZWRPYmplY3Qubm9kZVR5cGUoKSAhPT0gTm9kZS5FTEVNRU5UX05PREUgJiYgdGhpcy5y ZXByZXNlbnRlZE9iamVjdC5ub2RlVHlwZSgpICE9PSBOb2RlLlRFWFRfTk9ERSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTYxMyw3ICs2MTQsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJl ZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIF9zdGFydEVkaXRpbmc6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIGlmICh0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVkRE9NTm9kZSgpICE9PSB0 aGlzLnJlcHJlc2VudGVkT2JqZWN0KQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgICAgIHZhciBsaXN0SXRlbSA9IHRoaXMuX2xpc3RJdGVtTm9k ZTsKIApAQCAtNjI5LDcgKzYzMCw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgdGV4dE5vZGUgPSBsaXN0SXRlbS5nZXRFbGVtZW50 c0J5Q2xhc3NOYW1lKCJodG1sLXRleHQtbm9kZSIpWzBdOwogICAgICAgICAgICAgaWYgKHRleHRO b2RlKQogICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydEVkaXRpbmdUZXh0Tm9kZSh0 ZXh0Tm9kZSk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzCmluZGV4IDUzOGE4ZGEu LjM2ZThmYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzCkBAIC0xMDUsNyArMTA1LDcgQEAgV2Vi SW5zcGVjdG9yLkVkaXRpbmdDb25maWcucHJvdG90eXBlID0gewogV2ViSW5zcGVjdG9yLnN0YXJ0 RWRpdGluZyA9IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbmZpZykKIHsKICAgICBpZiAoIVdlYkluc3Bl Y3Rvci5tYXJrQmVpbmdFZGl0ZWQoZWxlbWVudCwgdHJ1ZSkpCi0gICAgICAgIHJldHVybjsKKyAg ICAgICAgcmV0dXJuIG51bGw7CiAKICAgICBjb25maWcgPSBjb25maWcgfHwgbmV3IFdlYkluc3Bl Y3Rvci5FZGl0aW5nQ29uZmlnKGZ1bmN0aW9uKCkge30sIGZ1bmN0aW9uKCkge30pOwogICAgIHZh ciBjb21taXR0ZWRDYWxsYmFjayA9IGNvbmZpZy5jb21taXRIYW5kbGVyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRXZlbnRMaXN0ZW5lclNl Y3Rpb25Hcm91cC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0V2ZW50TGlzdGVuZXJTZWN0aW9uR3JvdXAuanMKaW5kZXggNGQ0ZDI5NS4uNDE4ZmRiMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRXZlbnRM aXN0ZW5lclNlY3Rpb25Hcm91cC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9FdmVudExpc3RlbmVyU2VjdGlvbkdyb3VwLmpzCkBAIC00Miw4ICs0Miw5 IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2VjdGlvbkdyb3VwLnByb3RvdHlwZSA9IHsK ICAgICBfbm9kZVRleHRPckxpbms6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBub2Rl ID0gdGhpcy5fZXZlbnRMaXN0ZW5lci5ub2RlOworICAgICAgICBjb25zb2xlLmFzc2VydChub2Rl KTsKICAgICAgICAgaWYgKCFub2RlKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg cmV0dXJuICIiOwogCiAgICAgICAgIGlmIChub2RlLm5vZGVUeXBlKCkgPT09IE5vZGUuRE9DVU1F TlRfTk9ERSkKICAgICAgICAgICAgIHJldHVybiAiZG9jdW1lbnQiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lQ29udGVu dFZpZXcuanMKaW5kZXggZDk2ZjMyYy4uNDg0NWY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZUNvbnRlbnRWaWV3 LmpzCkBAIC0xNzksNyArMTc5LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcucHJv dG90eXBlID0gewogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0VG9T aG93KTsKICAgICAgICAgaWYgKCFyZXByZXNlbnRlZE9iamVjdFRvU2hvdykKLSAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAgICAgIHRoaXMuX2N1cnJl bnRDb250ZW50Vmlld1NldHRpbmcudmFsdWUgPSBpZGVudGlmaWVyOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJh ci5qcwppbmRleCA4M2Q5N2YzLi5hMjFiMWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKQEAgLTc3 LDcgKzc3LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXIucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgY29uc29sZS5hc3NlcnQobmF2aWdhdGlvbkl0ZW0gaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvbkl0ZW0pOwogICAgICAgICBpZiAoIShuYXZpZ2F0aW9uSXRlbSBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uSXRlbSkpCi0gICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICBpZiAobmF2aWdhdGlvbkl0 ZW0ucGFyZW50TmF2aWdhdGlvbkJhcikKICAgICAgICAgICAgIG5hdmlnYXRpb25JdGVtLnBhcmVu dE5hdmlnYXRpb25CYXIucmVtb3ZlTmF2aWdhdGlvbkl0ZW0obmF2aWdhdGlvbkl0ZW0pOwpAQCAt MTExLDcgKzExMSw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyLnByb3RvdHlwZSA9IHsK ICAgICB7CiAgICAgICAgIHZhciBuYXZpZ2F0aW9uSXRlbSA9IHRoaXMuX2ZpbmROYXZpZ2F0aW9u SXRlbShuYXZpZ2F0aW9uSXRlbU9ySWRlbnRpZmllck9ySW5kZXgpOwogICAgICAgICBpZiAoIW5h dmlnYXRpb25JdGVtKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51 bGw7CiAKICAgICAgICAgbmF2aWdhdGlvbkl0ZW0uX3BhcmVudE5hdmlnYXRpb25CYXIgPSBudWxs OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9RdWlja0NvbnNvbGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9RdWlja0NvbnNvbGUuanMKaW5kZXggZDYzMTkwNy4uNDI0ZGM1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29u c29sZS5qcwpAQCAtMjQ2LDEyICsyNDYsMTMgQEAgV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5w cm90b3R5cGUgPSB7CiAKICAgICBfaW5zZXJ0RXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRG b3JGcmFtZTogZnVuY3Rpb24oZnJhbWUsIHNraXBSZWJ1aWxkKQogICAgIHsKKyAgICAgICAgY29u c29sZS5hc3NlcnQoIWZyYW1lLmlzTWFpbkZyYW1lKCkpOwogICAgICAgICBpZiAoZnJhbWUuaXNN YWluRnJhbWUoKSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxs OwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9mcmFtZUlkZW50aWZpZXJUb0V4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50TWFwW2ZyYW1lLmlkXSk7CiAgICAgICAgIGlmICh0aGlz Ll9mcmFtZUlkZW50aWZpZXJUb0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50TWFwW2ZyYW1l LmlkXSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAg ICAgICAgIHZhciBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMuX2NyZWF0ZUV4 ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50RnJvbUZyYW1lKGZyYW1lKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMKaW5k ZXggOWIwODcyYy4uMzFmZjMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzCkBAIC03OCwxMSArNzgsMTEgQEAgV2ViSW5z cGVjdG9yLlNpZGViYXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoc2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lbCk7CiAg ICAgICAgIGlmICghKHNpZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TaWRlYmFy UGFuZWwpKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAK ICAgICAgICAgY29uc29sZS5hc3NlcnQoIXNpZGViYXJQYW5lbC5wYXJlbnRTaWRlYmFyKTsKICAg ICAgICAgaWYgKHNpZGViYXJQYW5lbC5wYXJlbnRTaWRlYmFyKQotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKICAgICAgICAgc2lkZWJhclBhbmVsLl9wYXJl bnRTaWRlYmFyID0gdGhpczsKIApAQCAtOTgsNyArOTgsNyBAQCBXZWJJbnNwZWN0b3IuU2lkZWJh ci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgc2lkZWJhclBhbmVsID0gdGhpcy5m aW5kU2lkZWJhclBhbmVsKHNpZGViYXJQYW5lbE9ySWRlbnRpZmllck9ySW5kZXgpOwogICAgICAg ICBpZiAoIXNpZGViYXJQYW5lbCkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJl dHVybiBudWxsOwogCiAgICAgICAgIHNpZGViYXJQYW5lbC53aWxsUmVtb3ZlKCk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0 b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRp dG9yLmpzCmluZGV4IDUwY2FlYzcuLjA0ZGRiYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcwpAQCAtNTYzLDcg KzU2Myw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIGxpbmVIYW5kbGUgPSB0aGlzLl9jb2RlTWlycm9yLmdldExpbmVIYW5kbGUobGluZU51bWJl cik7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGxpbmVIYW5kbGUpOwogICAgICAgICBpZiAoIWxp bmVIYW5kbGUpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsK IAogICAgICAgICByZXR1cm4gdGhpcy5fY29kZU1pcnJvci5hZGRMaW5lQ2xhc3MobGluZUhhbmRs ZSwgIndyYXAiLCBzdHlsZUNsYXNzTmFtZSk7CiAgICAgfSwKQEAgLTU3Myw3ICs1NzMsNyBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBsaW5lSGFu ZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKGxpbmVOdW1iZXIpOwogICAgICAg ICBjb25zb2xlLmFzc2VydChsaW5lSGFuZGxlKTsKICAgICAgICAgaWYgKCFsaW5lSGFuZGxlKQot ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKICAgICAgICAg cmV0dXJuIHRoaXMuX2NvZGVNaXJyb3IucmVtb3ZlTGluZUNsYXNzKGxpbmVIYW5kbGUsICJ3cmFw Iiwgc3R5bGVDbGFzc05hbWUpOwogICAgIH0sCkBAIC01ODMsNyArNTgzLDcgQEAgV2ViSW5zcGVj dG9yLlRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbGluZUhhbmRsZSA9IHRo aXMuX2NvZGVNaXJyb3IuZ2V0TGluZUhhbmRsZShsaW5lTnVtYmVyKTsKICAgICAgICAgY29uc29s ZS5hc3NlcnQobGluZUhhbmRsZSk7CiAgICAgICAgIGlmICghbGluZUhhbmRsZSkKLSAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICByZXR1cm4g dGhpcy5fY29kZU1pcnJvci50b2dnbGVMaW5lQ2xhc3MobGluZUhhbmRsZSwgIndyYXAiLCBzdHls ZUNsYXNzTmFtZSk7CiAgICAgfSwK 237863 2014-09-09 15:13:41 -0700 2014-09-10 12:15:43 -0700 [PATCH] Proposed Fix better.patch text/plain 13545 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvLmVzbGludHJjCmluZGV4IDViYjNjMDIuLjNkNDhiNDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJLy5lc2xpbnRyYwpAQCAtNTgsNiArNTgsNyBAQAogICAgICJydWxlcyI6IHsKICAgICAgICAg ImVxZXFlcSI6IDIsCiAgICAgICAgICJjdXJseSI6IDAsCisgICAgICAgICJjb25zaXN0ZW50LXJl dHVybiI6IDIsCiAgICAgICAgICJuby1leHRyYS1zZW1pIjogMiwKICAgICAgICAgInF1b3RlcyI6 IFsyLCAiZG91YmxlIl0sCiAgICAgICAgICJuby10cmFpbGluZy1zcGFjZXMiOiAyLApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKaW5kZXggZDBhZjRkOC4uYjU0MjcxOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTQtMDktMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggRVNMaW50IGNv bnNpc3RlbnQtcmV0dXJuIHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzY2ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIC5lc2xpbnRyYzoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0JyYW5jaE1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJhbmNo TWFuYWdlci5wcm90b3R5cGUuY3JlYXRlQnJhbmNoKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5fYWRkTmV3UmVzb3VyY2VUb0ZyYW1l KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMucHJvdG90eXBlLl9wYXJzZVN0eWxlRGVj bGFyYXRpb25QYXlsb2FkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVs RGV0YWlsc1NlY3Rpb25Sb3cuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRh aWxzU2VjdGlvblJvdy5wcm90b3R5cGUuX2FwcGx5VXNlcklucHV0KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5zaG93Q2hpbGQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5fc3RhcnRFZGl0aW5nVGFyZ2V0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZyk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qczoKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0V2ZW50TGlzdGVuZXJTZWN0aW9uR3JvdXAuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5wcm90b3R5cGUu X25vZGVUZXh0T3JMaW5rKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50Vmlldy5wcm90 b3R5cGUuX3Nob3dDb250ZW50Vmlld0ZvcklkZW50aWZpZXIpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZp Z2F0aW9uQmFyLnByb3RvdHlwZS5pbnNlcnROYXZpZ2F0aW9uSXRlbSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvbkJhci5wcm90b3R5cGUucmVtb3ZlTmF2aWdhdGlvbkl0ZW0pOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2luc2VydEV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv U2lkZWJhci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyLnByb3RvdHlwZS5hZGRT aWRlYmFyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXIucHJvdG90eXBlLnJl bW92ZVNpZGViYXJQYW5lbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRp dG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLmFkZFN0 eWxlQ2xhc3NUb0xpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90 eXBlLnJlbW92ZVN0eWxlQ2xhc3NGcm9tTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvci5wcm90b3R5cGUudG9nZ2xlU3R5bGVDbGFzc0ZvckxpbmUpOgorCiAyMDE0LTA5LTA4 ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogRml4IEVTTGludCBuby10cmFpbGluZy1zcGFjZXMgd2FybmluZ3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyYW5j aE1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9CcmFuY2hNYW5hZ2VyLmpzCmluZGV4IDI3M2U3NGUuLjY3ZWNkYjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyYW5jaE1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQnJhbmNoTWFuYWdlci5qcwpAQCAtNzQsNyArNzQsNyBAQCBXZWJJbnNwZWN0b3IuQnJh bmNoTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJvbUJy YW5jaCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5CcmFuY2gpOwogICAgICAgICBpZiAoIShmcm9t QnJhbmNoIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkJyYW5jaCkpCi0gICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICB2YXIgbmV3QnJhbmNoID0g ZnJvbUJyYW5jaC5mb3JrKGRpc3BsYXlOYW1lKTsKICAgICAgICAgdGhpcy5fYnJhbmNoZXMucHVz aChuZXdCcmFuY2gpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRnJhbWVSZXNvdXJjZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5q cwppbmRleCAyYzU1NmYyLi5iZDZiMGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9GcmFtZVJl c291cmNlTWFuYWdlci5qcwpAQCAtMzg1LDggKzM4NSw2IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJl c291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgX2FkZE5ld1Jlc291cmNlVG9GcmFtZTog ZnVuY3Rpb24ocmVxdWVzdElkZW50aWZpZXIsIGZyYW1lSWRlbnRpZmllciwgbG9hZGVySWRlbnRp ZmllciwgdXJsLCB0eXBlLCByZXF1ZXN0TWV0aG9kLCByZXF1ZXN0SGVhZGVycywgcmVxdWVzdERh dGEsIHRpbWVzdGFtcCwgZnJhbWVOYW1lLCBmcmFtZVNlY3VyaXR5T3JpZ2luLCBpbml0aWF0b3JT b3VyY2VDb2RlTG9jYXRpb24pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5f d2FpdGluZ0Zvck1haW5GcmFtZVJlc291cmNlVHJlZVBheWxvYWQpOwotICAgICAgICBpZiAodGhp cy5fd2FpdGluZ0Zvck1haW5GcmFtZVJlc291cmNlVHJlZVBheWxvYWQpCi0gICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgdmFyIHJlc291cmNlID0gbnVsbDsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxl cy5qcwppbmRleCBkNWM1ODAxLi5iNDJjZjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAt NjY1LDcgKzY2NSw3IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICAgICAgdGhpcy5fcGFyc2VTdHlsZURlY2xhcmF0aW9uUGF5bG9hZChw YXlsb2FkLCBzdHlsZURlY2xhcmF0aW9uLm5vZGUsIHN0eWxlRGVjbGFyYXRpb24uaW5oZXJpdGVk LCBzdHlsZURlY2xhcmF0aW9uLnR5cGUsIHN0eWxlRGVjbGFyYXRpb24ub3duZXJSdWxlKTsKICAg ICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAg ICAgcmV0dXJuIG51bGw7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICghc3R5bGVE ZWNsYXJhdGlvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMK aW5kZXggZDYwN2NjZS4uMGQ0ZDdjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNT ZWN0aW9uUm93LmpzCkBAIC0zNzgsOCArMzc4LDExIEBAIFdlYkluc3BlY3Rvci5Cb3hNb2RlbERl dGFpbHNTZWN0aW9uUm93LnByb3RvdHlwZSA9IHsKIAogICAgIF9hcHBseVVzZXJJbnB1dDogZnVu Y3Rpb24oZWxlbWVudCwgdXNlcklucHV0LCBwcmV2aW91c0NvbnRlbnQsIGNvbnRleHQsIGNvbW1p dEVkaXRvcikKICAgICB7Ci0gICAgICAgIGlmIChjb21taXRFZGl0b3IgJiYgdXNlcklucHV0ID09 PSBwcmV2aW91c0NvbnRlbnQpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fZWRpdGluZ0NhbmNl bGxlZChlbGVtZW50LCBjb250ZXh0KTsgLy8gbm90aGluZyBjaGFuZ2VkLCBzbyBjYW5jZWwKKyAg ICAgICAgaWYgKGNvbW1pdEVkaXRvciAmJiB1c2VySW5wdXQgPT09IHByZXZpb3VzQ29udGVudCkg eworICAgICAgICAgICAgLy8gTm90aGluZyBjaGFuZ2VkLCBzbyBjYW5jZWwuCisgICAgICAgICAg ICB0aGlzLl9lZGl0aW5nQ2FuY2VsbGVkKGVsZW1lbnQsIGNvbnRleHQpOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CiAKICAgICAgICAgaWYgKGNvbnRleHQuYm94ICE9PSAicG9zaXRp b24iICYmICghdXNlcklucHV0IHx8IHVzZXJJbnB1dCA9PT0gIlx1MjAxMiIpKQogICAgICAgICAg ICAgdXNlcklucHV0ID0gIjBweCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IGM0NmNkNmEu LjM4NjkxYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCkBAIC0xNjcsOCArMTY3LDkgQEAgV2Vi SW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIHNob3dDaGlsZDog ZnVuY3Rpb24oaW5kZXgpCiAgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fZWxl bWVudENsb3NlVGFnKTsKICAgICAgICAgaWYgKHRoaXMuX2VsZW1lbnRDbG9zZVRhZykKLSAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBpZiAo aW5kZXggPj0gdGhpcy5leHBhbmRlZENoaWxkcmVuTGltaXQpIHsKICAgICAgICAgICAgIHRoaXMu X2V4cGFuZGVkQ2hpbGRyZW5MaW1pdCA9IGluZGV4ICsgMTsKQEAgLTUzNyw3ICs1MzgsNyBAQCBX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIF9zdGFydEVkaXRp bmdUYXJnZXQ6IGZ1bmN0aW9uKGV2ZW50VGFyZ2V0KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMu dHJlZU91dGxpbmUuc2VsZWN0ZWRET01Ob2RlKCkgIT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3Qp Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAg ICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZVR5cGUoKSAhPT0gTm9kZS5FTEVNRU5U X05PREUgJiYgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlVHlwZSgpICE9PSBOb2RlLlRFWFRf Tk9ERSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTYxMyw3ICs2MTQsNyBAQCBXZWJJ bnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIF9zdGFydEVkaXRpbmc6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVk RE9NTm9kZSgpICE9PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0KQotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIHZhciBsaXN0SXRlbSA9IHRo aXMuX2xpc3RJdGVtTm9kZTsKIApAQCAtNjI5LDcgKzYzMCw3IEBAIFdlYkluc3BlY3Rvci5ET01U cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgdGV4dE5vZGUgPSBsaXN0 SXRlbS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJodG1sLXRleHQtbm9kZSIpWzBdOwogICAgICAg ICAgICAgaWYgKHRleHROb2RlKQogICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydEVk aXRpbmdUZXh0Tm9kZSh0ZXh0Tm9kZSk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FZGl0aW5nU3VwcG9ydC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0Lmpz CmluZGV4IDUzOGE4ZGEuLjM2ZThmYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzCkBAIC0xMDUs NyArMTA1LDcgQEAgV2ViSW5zcGVjdG9yLkVkaXRpbmdDb25maWcucHJvdG90eXBlID0gewogV2Vi SW5zcGVjdG9yLnN0YXJ0RWRpdGluZyA9IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbmZpZykKIHsKICAg ICBpZiAoIVdlYkluc3BlY3Rvci5tYXJrQmVpbmdFZGl0ZWQoZWxlbWVudCwgdHJ1ZSkpCi0gICAg ICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIG51bGw7CiAKICAgICBjb25maWcgPSBjb25maWcg fHwgbmV3IFdlYkluc3BlY3Rvci5FZGl0aW5nQ29uZmlnKGZ1bmN0aW9uKCkge30sIGZ1bmN0aW9u KCkge30pOwogICAgIHZhciBjb21taXR0ZWRDYWxsYmFjayA9IGNvbmZpZy5jb21taXRIYW5kbGVy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RXZlbnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0V2ZW50TGlzdGVuZXJTZWN0aW9uR3JvdXAuanMKaW5kZXggNGQ0ZDI5 NS4uNDE4ZmRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRXZlbnRMaXN0ZW5lclNlY3Rpb25Hcm91cC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FdmVudExpc3RlbmVyU2VjdGlvbkdyb3VwLmpz CkBAIC00Miw4ICs0Miw5IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2VjdGlvbkdyb3Vw LnByb3RvdHlwZSA9IHsKICAgICBfbm9kZVRleHRPckxpbms6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIHZhciBub2RlID0gdGhpcy5fZXZlbnRMaXN0ZW5lci5ub2RlOworICAgICAgICBjb25z b2xlLmFzc2VydChub2RlKTsKICAgICAgICAgaWYgKCFub2RlKQotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgcmV0dXJuICIiOwogCiAgICAgICAgIGlmIChub2RlLm5vZGVUeXBlKCkg PT09IE5vZGUuRE9DVU1FTlRfTk9ERSkKICAgICAgICAgICAgIHJldHVybiAiZG9jdW1lbnQiOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJh bWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZyYW1lQ29udGVudFZpZXcuanMKaW5kZXggZDk2ZjMyYy4uNDg0NWY5OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G cmFtZUNvbnRlbnRWaWV3LmpzCkBAIC0xNzksNyArMTc5LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1l Q29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJl c2VudGVkT2JqZWN0VG9TaG93KTsKICAgICAgICAgaWYgKCFyZXByZXNlbnRlZE9iamVjdFRvU2hv dykKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAg ICAgIHRoaXMuX2N1cnJlbnRDb250ZW50Vmlld1NldHRpbmcudmFsdWUgPSBpZGVudGlmaWVyOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O YXZpZ2F0aW9uQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmF2aWdhdGlvbkJhci5qcwppbmRleCA4M2Q5N2YzLi5hMjFiMWEyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRp b25CYXIuanMKQEAgLTc3LDcgKzc3LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXIucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQobmF2aWdhdGlvbkl0ZW0g aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvbkl0ZW0pOwogICAgICAgICBpZiAoIShu YXZpZ2F0aW9uSXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uSXRlbSkpCi0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICBp ZiAobmF2aWdhdGlvbkl0ZW0ucGFyZW50TmF2aWdhdGlvbkJhcikKICAgICAgICAgICAgIG5hdmln YXRpb25JdGVtLnBhcmVudE5hdmlnYXRpb25CYXIucmVtb3ZlTmF2aWdhdGlvbkl0ZW0obmF2aWdh dGlvbkl0ZW0pOwpAQCAtMTExLDcgKzExMSw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFy LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBuYXZpZ2F0aW9uSXRlbSA9IHRoaXMu X2ZpbmROYXZpZ2F0aW9uSXRlbShuYXZpZ2F0aW9uSXRlbU9ySWRlbnRpZmllck9ySW5kZXgpOwog ICAgICAgICBpZiAoIW5hdmlnYXRpb25JdGVtKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgcmV0dXJuIG51bGw7CiAKICAgICAgICAgbmF2aWdhdGlvbkl0ZW0uX3BhcmVudE5hdmln YXRpb25CYXIgPSBudWxsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKaW5kZXggZDYzMTkwNy4uNDI0ZGM1 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UXVpY2tDb25zb2xlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1F1aWNrQ29uc29sZS5qcwpAQCAtMjQ2LDEyICsyNDYsMTMgQEAgV2ViSW5zcGVjdG9y LlF1aWNrQ29uc29sZS5wcm90b3R5cGUgPSB7CiAKICAgICBfaW5zZXJ0RXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnRGb3JGcmFtZTogZnVuY3Rpb24oZnJhbWUsIHNraXBSZWJ1aWxkKQogICAg IHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoIWZyYW1lLmlzTWFpbkZyYW1lKCkpOwogICAgICAg ICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIHJldHVybiBudWxsOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9mcmFtZUlk ZW50aWZpZXJUb0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50TWFwW2ZyYW1lLmlkXSk7CiAg ICAgICAgIGlmICh0aGlzLl9mcmFtZUlkZW50aWZpZXJUb0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50TWFwW2ZyYW1lLmlkXSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJl dHVybiBudWxsOwogCiAgICAgICAgIHZhciBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9 IHRoaXMuX2NyZWF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50RnJvbUZyYW1lKGZyYW1l KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NpZGViYXIuanMKaW5kZXggOWIwODcyYy4uMzFmZjMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzCkBAIC03OCwxMSAr NzgsMTEgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQoc2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNp ZGViYXJQYW5lbCk7CiAgICAgICAgIGlmICghKHNpZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdlYklu c3BlY3Rvci5TaWRlYmFyUGFuZWwpKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg cmV0dXJuIG51bGw7CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXNpZGViYXJQYW5lbC5wYXJl bnRTaWRlYmFyKTsKICAgICAgICAgaWYgKHNpZGViYXJQYW5lbC5wYXJlbnRTaWRlYmFyKQotICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKICAgICAgICAgc2lk ZWJhclBhbmVsLl9wYXJlbnRTaWRlYmFyID0gdGhpczsKIApAQCAtOTgsNyArOTgsNyBAQCBXZWJJ bnNwZWN0b3IuU2lkZWJhci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgc2lkZWJh clBhbmVsID0gdGhpcy5maW5kU2lkZWJhclBhbmVsKHNpZGViYXJQYW5lbE9ySWRlbnRpZmllck9y SW5kZXgpOwogICAgICAgICBpZiAoIXNpZGViYXJQYW5lbCkKLSAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAgICAgIHNpZGViYXJQYW5lbC53aWxsUmVt b3ZlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UZXh0RWRpdG9yLmpzCmluZGV4IDUwY2FlYzcuLjA0ZGRiYWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRv ci5qcwpAQCAtNTYzLDcgKzU2Myw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdmFyIGxpbmVIYW5kbGUgPSB0aGlzLl9jb2RlTWlycm9yLmdldExpbmVI YW5kbGUobGluZU51bWJlcik7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGxpbmVIYW5kbGUpOwog ICAgICAgICBpZiAoIWxpbmVIYW5kbGUpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICByZXR1cm4gbnVsbDsKIAogICAgICAgICByZXR1cm4gdGhpcy5fY29kZU1pcnJvci5hZGRMaW5l Q2xhc3MobGluZUhhbmRsZSwgIndyYXAiLCBzdHlsZUNsYXNzTmFtZSk7CiAgICAgfSwKQEAgLTU3 Myw3ICs1NzMsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHZhciBsaW5lSGFuZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKGxpbmVO dW1iZXIpOwogICAgICAgICBjb25zb2xlLmFzc2VydChsaW5lSGFuZGxlKTsKICAgICAgICAgaWYg KCFsaW5lSGFuZGxlKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51 bGw7CiAKICAgICAgICAgcmV0dXJuIHRoaXMuX2NvZGVNaXJyb3IucmVtb3ZlTGluZUNsYXNzKGxp bmVIYW5kbGUsICJ3cmFwIiwgc3R5bGVDbGFzc05hbWUpOwogICAgIH0sCkBAIC01ODMsNyArNTgz LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIg bGluZUhhbmRsZSA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0TGluZUhhbmRsZShsaW5lTnVtYmVyKTsK ICAgICAgICAgY29uc29sZS5hc3NlcnQobGluZUhhbmRsZSk7CiAgICAgICAgIGlmICghbGluZUhh bmRsZSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgICAgICByZXR1cm4gdGhpcy5fY29kZU1pcnJvci50b2dnbGVMaW5lQ2xhc3MobGluZUhhbmRs ZSwgIndyYXAiLCBzdHlsZUNsYXNzTmFtZSk7CiAgICAgfSwK