173987 2017-06-29 12:57:31 -0700 Web Inspector: Cleanup unused/invalid parameters for TreeElements 2017-07-28 12:40:02 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=173807 InRadar P2 Normal --- 1 hi hi bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1324060 0 hi 2017-06-29 12:57:31 -0700 . 1324104 1 314169 hi 2017-06-29 14:34:40 -0700 Created attachment 314169 Patch 1332981 2 314169 bburg 2017-07-28 10:00:03 -0700 Comment on attachment 314169 Patch r=me, nice cleanup 1332986 3 314169 commit-queue 2017-07-28 10:27:47 -0700 Comment on attachment 314169 Patch Clearing flags on attachment: 314169 Committed r220004: <http://trac.webkit.org/changeset/220004> 1332987 4 commit-queue 2017-07-28 10:27:48 -0700 All reviewed patches have been landed. Closing bug. 1333046 5 webkit-bug-importer 2017-07-28 12:40:02 -0700 <rdar://problem/33596120> 314169 2017-06-29 14:34:40 -0700 2017-07-28 10:27:47 -0700 Patch 173987.diff text/plain 25599 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi44MjdmZjExNDFkMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENs ZWFudXAgdW51c2VkL2ludmFsaWQgcGFyYW1ldGVycyBmb3IgVHJlZUVsZW1lbnRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5ODcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVHJlZUVsZW1lbnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HZW5l cmFsVHJlZUVsZW1lbnQuanM6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxp Y2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ1NTU3R5bGVTaGVldFRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvQ2FsbEZyYW1lVHJlZUVsZW1lbnQuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50Rmxvd1RyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRE9NTm9kZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRGF0YWJhc2VUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0ZvbGRlclRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRnJhbWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0lu ZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlSW5kZXhUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlVHJlZUVsZW1lbnQu anM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VUcmVlRWxl bWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0lzc3VlVHJlZUVsZW1lbnQu anM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlQmFzZVRyZWVFbGVt ZW50LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZU5vZGVUcmVlRWxl bWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1l bnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxlbWVudC5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVFbGVtZW50 LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRyZWVFbGVtZW50 LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlTWFwUmVzb3VyY2VUcmVl RWxlbWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VUcmVlRWxl bWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkVHJl ZUVsZW1lbnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UeXBlVHJlZUVsZW1l bnQuanM6CisKIDIwMTctMDYtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9yeSB1 c2VkIGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVUcmVlRWxlbWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFt ZVRyZWVFbGVtZW50LmpzCmluZGV4IDliMzQ2Y2IzNzc2Li43MzJjZTU0MGMzMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25D YWNoZUZyYW1lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTI5 LDcgKzI5LDkgQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50 ID0gY2xhc3MgQXBwbGljYXRpb25DYWNoZUZyYW1lVHJlZUUKICAgICB7CiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkFwcGxp Y2F0aW9uQ2FjaGVGcmFtZSk7CiAKLSAgICAgICAgc3VwZXIoImFwcGxpY2F0aW9uLWNhY2hlLWZy YW1lIiwgIiIsICIiLCByZXByZXNlbnRlZE9iamVjdCwgZmFsc2UpOworICAgICAgICBjb25zdCB0 aXRsZSA9IG51bGw7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0gbnVsbDsKKyAgICAgICAgc3Vw ZXIoImFwcGxpY2F0aW9uLWNhY2hlLWZyYW1lIiwgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRl ZE9iamVjdCk7CiAKICAgICAgICAgdGhpcy51cGRhdGVUaXRsZXMoKTsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50 VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuanMKaW5kZXggMGM4ODExMmM2Y2QuLmMyNGY0MDI0MTdi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9C cmVha3BvaW50VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCkBAIC0zMiw3ICszMiw4IEBA IFdlYkluc3BlY3Rvci5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJl ZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIGlmICghY2xhc3NOYW1lKQogICAgICAg ICAgICAgY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5HZW5l cmljTGluZUljb25TdHlsZUNsYXNzTmFtZTsKIAotICAgICAgICBzdXBlcihbImJyZWFrcG9pbnQi LCBjbGFzc05hbWVdLCB0aXRsZSwgbnVsbCwgYnJlYWtwb2ludCwgZmFsc2UpOworICAgICAgICBj b25zdCBzdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIHN1cGVyKFsiYnJlYWtwb2ludCIsIGNsYXNz TmFtZV0sIHRpdGxlLCBzdWJ0aXRsZSwgYnJlYWtwb2ludCk7CiAKICAgICAgICAgdGhpcy5fYnJl YWtwb2ludCA9IGJyZWFrcG9pbnQ7CiAgICAgICAgIHRoaXMuX3Byb2JlU2V0ID0gbnVsbDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlU2hlZXRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NTU1N0eWxlU2hlZXRUcmVlRWxlbWVudC5qcwppbmRleCA5ZjY2NjM2NmQ1Yy4u NzhlYmFlMWYyMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NTU1N0eWxlU2hlZXRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZVNoZWV0VHJlZUVsZW1lbnQuanMK QEAgLTMwLDEwICszMCw2IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0VHJlZUVsZW1lbnQg PSBjbGFzcyBDU1NTdHlsZVNoZWV0VHJlZUVsZW1lbnQgZXh0ZW5kcyBXCiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHN0eWxlU2hlZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVl dCk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHN0eWxlU2hlZXQuaXNJbnNwZWN0b3JTdHlsZVNo ZWV0KCkpOwogCi0gICAgICAgIGNvbnN0IGNsYXNzTmFtZXMgPSBbInN0eWxlc2hlZXQiLCAic3R5 bGVzaGVldC1pY29uIl07Ci0gICAgICAgIGNvbnN0IHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJJbnNwZWN0b3IgU3R5bGUgU2hlZXQiKTsKLSAgICAgICAgY29uc3Qgc3VidGl0bGUgPSBu dWxsOwotICAgICAgICBjb25zdCBoYXNDaGlsZHJlbiA9IGZhbHNlOwotICAgICAgICBzdXBlcihz dHlsZVNoZWV0LCBjbGFzc05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHN0eWxlU2hlZXQsIGhhc0No aWxkcmVuKTsKKyAgICAgICAgc3VwZXIoc3R5bGVTaGVldCwgWyJzdHlsZXNoZWV0IiwgInN0eWxl c2hlZXQtaWNvbiJdLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkluc3BlY3RvciBTdHlsZSBTaGVl dCIpKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ2FsbEZyYW1lVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYWxsRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCA1 MGVkODc3YmE1OS4uZTZhYjhmODllMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbGxGcmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbGxGcmFtZVRyZWVFbGVtZW50 LmpzCkBAIC0zMSw4ICszMSw4IEBAIFdlYkluc3BlY3Rvci5DYWxsRnJhbWVUcmVlRWxlbWVudCA9 IGNsYXNzIENhbGxGcmFtZVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICAgICAg bGV0IGNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DYWxsRnJhbWVWaWV3Lmljb25DbGFzc05hbWVG b3JDYWxsRnJhbWUoY2FsbEZyYW1lKTsKICAgICAgICAgbGV0IHRpdGxlID0gY2FsbEZyYW1lLmZ1 bmN0aW9uTmFtZSB8fCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1vdXMgZnVuY3Rpb24p Iik7Ci0KLSAgICAgICAgc3VwZXIoWyJjYWxsLWZyYW1lIiwgY2xhc3NOYW1lXSwgdGl0bGUsIG51 bGwsIGNhbGxGcmFtZSwgZmFsc2UpOworICAgICAgICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7Cisg ICAgICAgIHN1cGVyKFsiY2FsbC1mcmFtZSIsIGNsYXNzTmFtZV0sIHRpdGxlLCBzdWJ0aXRsZSwg Y2FsbEZyYW1lKTsKIAogICAgICAgICB0aGlzLl9jYWxsRnJhbWUgPSBjYWxsRnJhbWU7CiAgICAg ICAgIHRoaXMuX2lzQWN0aXZlQ2FsbEZyYW1lID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Rmxvd1RyZWVFbGVtZW50 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEZs b3dUcmVlRWxlbWVudC5qcwppbmRleCA0ZmUyY2M1ZTNhOS4uMmZjOGYzZDFkM2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRGbG93 VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29udGVudEZsb3dUcmVlRWxlbWVudC5qcwpAQCAtMzQsNiArMzQsNyBAQCBXZWJJbnNw ZWN0b3IuQ29udGVudEZsb3dUcmVlRWxlbWVudCA9IGNsYXNzIENvbnRlbnRGbG93VHJlZUVsZW1l bnQgZXh0ZW5kcyBXZWJJbgogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQocmVwcmVzZW50 ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3cpOwogCi0gICAgICAg IHN1cGVyKCJjb250ZW50LWZsb3ctaWNvbiIsIHJlcHJlc2VudGVkT2JqZWN0Lm5hbWUsIG51bGws IHJlcHJlc2VudGVkT2JqZWN0LCBmYWxzZSk7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0gbnVs bDsKKyAgICAgICAgc3VwZXIoImNvbnRlbnQtZmxvdy1pY29uIiwgcmVwcmVzZW50ZWRPYmplY3Qu bmFtZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZVRyZWVF bGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N Tm9kZVRyZWVFbGVtZW50LmpzCmluZGV4IDdkNWQyZGUxNjFjLi5iOWRmMTIyMGQ5YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZVRy ZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTU5vZGVUcmVlRWxlbWVudC5qcwpAQCAtMjksNyArMjksOCBAQCBXZWJJbnNwZWN0b3Iu RE9NTm9kZVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NTm9kZVRyZWVFbGVtZW50IGV4dGVuZHMgV2Vi SW5zcGVjdG9yLgogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoZG9tTm9kZSBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5ET01Ob2RlKTsKIAotICAgICAgICBzdXBlcigiZG9tLW5vZGUiLCBk b21Ob2RlLmRpc3BsYXlOYW1lLCBudWxsLCBkb21Ob2RlLCB0cnVlKTsKKyAgICAgICAgY29uc3Qg c3VidGl0bGUgPSBudWxsOworICAgICAgICBzdXBlcigiZG9tLW5vZGUiLCBkb21Ob2RlLmRpc3Bs YXlOYW1lLCBzdWJ0aXRsZSwgZG9tTm9kZSwge2hhc0NoaWxkcmVuOiB0cnVlfSk7CiAKICAgICAg ICAgdGhpcy5zdGF0dXMgPSBXZWJJbnNwZWN0b3IubGlua2lmeU5vZGVSZWZlcmVuY2VFbGVtZW50 KGRvbU5vZGUsIFdlYkluc3BlY3Rvci5jcmVhdGVHb1RvQXJyb3dCdXR0b24oKSk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YWJhc2VUYWJsZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50LmpzCmluZGV4IDFiOTc2YmQwNjNl Li43OTM3MDkwYjk2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVUcmVlRWxlbWVudC5q cwpAQCAtMjksNiArMjksNyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50 ID0gY2xhc3MgRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50IGV4dGVuZHMgVwogICAgIHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuRGF0YWJhc2VUYWJsZU9iamVjdCk7CiAKLSAgICAgICAgc3VwZXIoImRhdGFiYXNlLXRhYmxl LWljb24iLCByZXByZXNlbnRlZE9iamVjdC5uYW1lLCBudWxsLCByZXByZXNlbnRlZE9iamVjdCwg ZmFsc2UpOworICAgICAgICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIHN1cGVyKCJk YXRhYmFzZS10YWJsZS1pY29uIiwgcmVwcmVzZW50ZWRPYmplY3QubmFtZSwgc3VidGl0bGUsIHJl cHJlc2VudGVkT2JqZWN0KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUcmVlRWxlbWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVHJlZUVsZW1lbnQu anMKaW5kZXggOGRlNzA5NWE5YmQuLjg3Njc4ZmU2ODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRyZWVFbGVtZW50LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVHJl ZUVsZW1lbnQuanMKQEAgLTI5LDcgKzI5LDggQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVHJlZUVs ZW1lbnQgPSBjbGFzcyBEYXRhYmFzZVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAg ICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLkRhdGFiYXNlT2JqZWN0KTsKIAotICAgICAgICBzdXBlcigiZGF0YWJhc2Ut aWNvbiIsIHJlcHJlc2VudGVkT2JqZWN0Lm5hbWUsIG51bGwsIHJlcHJlc2VudGVkT2JqZWN0LCB0 cnVlKTsKKyAgICAgICAgY29uc3Qgc3VidGl0bGUgPSBudWxsOworICAgICAgICBzdXBlcigiZGF0 YWJhc2UtaWNvbiIsIHJlcHJlc2VudGVkT2JqZWN0Lm5hbWUsIHN1YnRpdGxlLCByZXByZXNlbnRl ZE9iamVjdCwge2hhc0NoaWxkcmVuOiB0cnVlfSk7CiAKICAgICAgICAgdGhpcy5oYXNDaGlsZHJl biA9IGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Gb2xkZXJUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlclRyZWVFbGVtZW50LmpzCmluZGV4IDdlYjEwZmRmMGU4 Li5lYzY2NzhkMDY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRm9sZGVyVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyVHJlZUVsZW1lbnQuanMKQEAgLTMxLDggKzMx LDcgQEAgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50ID0gY2xhc3MgRm9sZGVyVHJlZUVs ZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuR2UKIAogICAgICAgICBjb25zdCBjbGFzc05hbWVz ID0gW1dlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudC5Gb2xkZXJJY29uU3R5bGVDbGFzc05h bWVdOwogICAgICAgICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7Ci0gICAgICAgIGNvbnN0IGhhc0No aWxkcmVuID0gdHJ1ZTsKLSAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywgdGl0bGUsIHN1YnRpdGxl LCByZXByZXNlbnRlZE9iamVjdCwgaGFzQ2hpbGRyZW4pOworICAgICAgICBzdXBlcihjbGFzc05h bWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0LCB7aGFzQ2hpbGRyZW46IHRy dWV9KTsKICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKaW5k ZXggZDJjYzA5YTE5NzQuLmUxNDRmZTgxZDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVF bGVtZW50LmpzCkBAIC0yNSw5ICsyNSw5IEBACiAKIFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJl ZUVsZW1lbnQgPSBjbGFzcyBGb2xkZXJpemVkVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuR2VuZXJhbFRyZWVFbGVtZW50CiB7Ci0gICAgY29uc3RydWN0b3IoY2xhc3NOYW1lcywgdGl0 bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCwgaGFzQ2hpbGRyZW4pCisgICAgY29uc3Ry dWN0b3IoY2xhc3NOYW1lcywgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCkKICAg ICB7Ci0gICAgICAgIHN1cGVyKGNsYXNzTmFtZXMsIHRpdGxlLCBzdWJ0aXRsZSwgcmVwcmVzZW50 ZWRPYmplY3QsIGhhc0NoaWxkcmVuKTsKKyAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywgdGl0bGUs IHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCk7CiAKICAgICAgICAgdGhpcy5zaG91bGRSZWZy ZXNoQ2hpbGRyZW4gPSB0cnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCA4OTJj NWVmMWI2ZS4uMzYwMGY2Yzc2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwpAQCAtMjUs MTEgKzI1LDExIEBACiAKIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50ID0gY2xhc3MgRnJh bWVUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50CiB7 Ci0gICAgY29uc3RydWN0b3IoZnJhbWUsIHJlcHJlc2VudGVkT2JqZWN0KQorICAgIGNvbnN0cnVj dG9yKGZyYW1lKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJhbWUgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuRnJhbWUpOwogCi0gICAgICAgIHN1cGVyKGZyYW1lLm1haW5SZXNvdXJj ZSwgcmVwcmVzZW50ZWRPYmplY3QgfHwgZnJhbWUpOworICAgICAgICBzdXBlcihmcmFtZS5tYWlu UmVzb3VyY2UsIGZyYW1lKTsKIAogICAgICAgICB0aGlzLl9mcmFtZSA9IGZyYW1lOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFs VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKaW5kZXggZWU4MWEzZmI1NmMuLjQwOTgwYzNlYTI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5l cmFsVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzCkBAIC0yNSw5ICsyNSw5IEBACiAKIFdlYklu c3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQgPSBjbGFzcyBHZW5lcmFsVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnQKIHsKLSAgICBjb25zdHJ1Y3RvcihjbGFzc05h bWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0LCBoYXNDaGlsZHJlbikKKyAg ICBjb25zdHJ1Y3RvcihjbGFzc05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2Jq ZWN0LCBvcHRpb25zKQogICAgIHsKLSAgICAgICAgc3VwZXIoIiIsIHJlcHJlc2VudGVkT2JqZWN0 LCBoYXNDaGlsZHJlbik7CisgICAgICAgIHN1cGVyKCIiLCByZXByZXNlbnRlZE9iamVjdCwgb3B0 aW9ucyk7CiAKICAgICAgICAgdGhpcy5jbGFzc05hbWVzID0gY2xhc3NOYW1lczsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERh dGFiYXNlT2JqZWN0U3RvcmVJbmRleFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVJbmRleFRy ZWVFbGVtZW50LmpzCmluZGV4IDRlOGJiNjgwZmQ3Li40NjUxMzk0MDJkYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNl T2JqZWN0U3RvcmVJbmRleFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlSW5kZXhUcmVl RWxlbWVudC5qcwpAQCAtMjksNyArMjksOCBAQCBXZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNl T2JqZWN0U3RvcmVJbmRleFRyZWVFbGVtZW50ID0gY2xhc3MgSW5kZXhlZERhdGFiYXNlTwogICAg IHsKICAgICAgICAgY29uc29sZS5hc3NlcnQob2JqZWN0U3RvcmVJbmRleCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZUluZGV4KTsKIAotICAgICAgICBz dXBlcigiZGF0YWJhc2UtdGFibGUtaWNvbiIsIG9iamVjdFN0b3JlSW5kZXgubmFtZSwgbnVsbCwg b2JqZWN0U3RvcmVJbmRleCwgZmFsc2UpOworICAgICAgICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7 CisgICAgICAgIHN1cGVyKCJkYXRhYmFzZS10YWJsZS1pY29uIiwgb2JqZWN0U3RvcmVJbmRleC5u YW1lLCBzdWJ0aXRsZSwgb2JqZWN0U3RvcmVJbmRleCk7CiAKICAgICAgICAgdGhpcy5fb2JqZWN0 U3RvcmVJbmRleCA9IG9iamVjdFN0b3JlSW5kZXg7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0 U3RvcmVUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlVHJlZUVsZW1lbnQuanMKaW5kZXggMWVj YTAwODA4MGIuLmU3NmIxYmViZTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZVRyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4 ZWREYXRhYmFzZU9iamVjdFN0b3JlVHJlZUVsZW1lbnQuanMKQEAgLTI5LDcgKzI5LDggQEAgV2Vi SW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlVHJlZUVsZW1lbnQgPSBjbGFzcyBJ bmRleGVkRGF0YWJhc2VPYmplY3QKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG9iamVj dFN0b3JlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3Jl KTsKIAotICAgICAgICBzdXBlcigiZGF0YWJhc2UtdGFibGUtaWNvbiIsIG9iamVjdFN0b3JlLm5h bWUsIG51bGwsIG9iamVjdFN0b3JlLCAhIW9iamVjdFN0b3JlLmluZGV4ZXMubGVuZ3RoKTsKKyAg ICAgICAgY29uc3Qgc3VidGl0bGUgPSBudWxsOworICAgICAgICBzdXBlcigiZGF0YWJhc2UtdGFi bGUtaWNvbiIsIG9iamVjdFN0b3JlLm5hbWUsIHN1YnRpdGxlLCBvYmplY3RTdG9yZSwge2hhc0No aWxkcmVuOiAhIW9iamVjdFN0b3JlLmluZGV4ZXMubGVuZ3RofSk7CiAKICAgICAgICAgdGhpcy5f b2JqZWN0U3RvcmUgPSBvYmplY3RTdG9yZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJhc2VUcmVlRWxlbWVu dC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWRE YXRhYmFzZVRyZWVFbGVtZW50LmpzCmluZGV4IDdhYjU0ZDY4NzBjLi5mZmYyOWJlYmRiYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhl ZERhdGFiYXNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlVHJlZUVsZW1lbnQuanMKQEAgLTI5LDcgKzI5 LDggQEAgV2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZVRyZWVFbGVtZW50ID0gY2xhc3MgSW5k ZXhlZERhdGFiYXNlVHJlZUVsZW1lbnQgZXh0ZW4KICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KGluZGV4ZWREYXRhYmFzZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5JbmRleGVkRGF0YWJh c2UpOwogCi0gICAgICAgIHN1cGVyKCJkYXRhYmFzZS1pY29uIiwgaW5kZXhlZERhdGFiYXNlLm5h bWUsIG51bGwsIGluZGV4ZWREYXRhYmFzZSwgISFpbmRleGVkRGF0YWJhc2Uub2JqZWN0U3RvcmVz Lmxlbmd0aCk7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0gbnVsbDsKKyAgICAgICAgc3VwZXIo ImRhdGFiYXNlLWljb24iLCBpbmRleGVkRGF0YWJhc2UubmFtZSwgc3VidGl0bGUsIGluZGV4ZWRE YXRhYmFzZSwge2hhc0NoaWxkcmVuOiAhIWluZGV4ZWREYXRhYmFzZS5vYmplY3RTdG9yZXMubGVu Z3RofSk7CiAKICAgICAgICAgdGhpcy5faW5kZXhlZERhdGFiYXNlID0gaW5kZXhlZERhdGFiYXNl OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0lzc3VlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Jc3N1ZVRyZWVFbGVtZW50LmpzCmluZGV4IGI4ZDkxZjM0YzA2Li40YmU1 ODFjNzE0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvSXNzdWVUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Jc3N1ZVRyZWVFbGVtZW50LmpzCkBAIC0zNyw3ICszNyw5IEBAIFdl Ykluc3BlY3Rvci5Jc3N1ZVRyZWVFbGVtZW50ID0gY2xhc3MgSXNzdWVUcmVlRWxlbWVudCBleHRl bmRzIFdlYkluc3BlY3Rvci5HZW5lCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0g ICAgICAgIHN1cGVyKFtXZWJJbnNwZWN0b3IuSXNzdWVUcmVlRWxlbWVudC5TdHlsZUNsYXNzTmFt ZSwgbGV2ZWxTdHlsZUNsYXNzTmFtZV0sIG51bGwsIG51bGwsIGlzc3VlTWVzc2FnZSwgZmFsc2Up OworICAgICAgICBjb25zdCB0aXRsZSA9IG51bGw7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0g bnVsbDsKKyAgICAgICAgc3VwZXIoW1dlYkluc3BlY3Rvci5Jc3N1ZVRyZWVFbGVtZW50LlN0eWxl Q2xhc3NOYW1lLCBsZXZlbFN0eWxlQ2xhc3NOYW1lXSwgdGl0bGUsIHN1YnRpdGxlLCBpc3N1ZU1l c3NhZ2UpOwogCiAgICAgICAgIHRoaXMuX2lzc3VlTWVzc2FnZSA9IGlzc3VlTWVzc2FnZTsKICAg ICAgICAgdGhpcy5fdXBkYXRlVGl0bGVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlQmFzZVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZUJhc2VU cmVlRWxlbWVudC5qcwppbmRleCBkMDM3MGM4ZDZhYS4uNzk2Nzk2NTIzODMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVCYXNl VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvT2JqZWN0VHJlZUJhc2VUcmVlRWxlbWVudC5qcwpAQCAtMzEsNyArMzEsMTAgQEAgV2Vi SW5zcGVjdG9yLk9iamVjdFRyZWVCYXNlVHJlZUVsZW1lbnQgPSBjbGFzcyBPYmplY3RUcmVlQmFz ZVRyZWVFbGVtZW50IGV4dGVuZHMKICAgICAgICAgY29uc29sZS5hc3NlcnQocHJvcGVydHlQYXRo IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aCk7CiAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KCFwcm9wZXJ0eSB8fCBwcm9wZXJ0eSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Qcm9w ZXJ0eURlc2NyaXB0b3IpOwogCi0gICAgICAgIHN1cGVyKG51bGwsIG51bGwsIG51bGwsIHJlcHJl c2VudGVkT2JqZWN0LCBmYWxzZSk7CisgICAgICAgIGNvbnN0IGNsYXNzTmFtZXMgPSBudWxsOwor ICAgICAgICBjb25zdCB0aXRsZSA9IG51bGw7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0gbnVs bDsKKyAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRl ZE9iamVjdCk7CiAKICAgICAgICAgdGhpcy5fcHJvcGVydHkgPSBwcm9wZXJ0eTsKICAgICAgICAg dGhpcy5fcHJvcGVydHlQYXRoID0gcHJvcGVydHlQYXRoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZU5vZGVUcmVlRWxlbWVudC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVOb2Rl VHJlZUVsZW1lbnQuanMKaW5kZXggOGQxNmQ0YzFmMjQuLjM2ZjY3ZDU3ODdiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlTm9kZVRy ZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Byb2ZpbGVOb2RlVHJlZUVsZW1lbnQuanMKQEAgLTcyLDkgKzcyLDcgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVOb2RlVHJlZUVsZW1lbnQgPSBjbGFzcyBQcm9maWxlTm9kZVRyZWVFbGVtZW50 IGV4dGVuZHMgV2ViSW4KICAgICAgICAgaWYgKHByb2ZpbGVOb2RlLmZ1bmN0aW9uTmFtZSAmJiBw cm9maWxlTm9kZS5mdW5jdGlvbk5hbWUuc3RhcnRzV2l0aCgib24iKSAmJiBwcm9maWxlTm9kZS5m dW5jdGlvbk5hbWUubGVuZ3RoID49IDUpCiAgICAgICAgICAgICBjbGFzc05hbWUgPSBXZWJJbnNw ZWN0b3IuQ2FsbEZyYW1lVmlldy5FdmVudExpc3RlbmVySWNvblN0eWxlQ2xhc3NOYW1lOwogCi0g ICAgICAgIHZhciBoYXNDaGlsZHJlbiA9ICEhcHJvZmlsZU5vZGUuY2hpbGROb2Rlcy5sZW5ndGg7 Ci0KLSAgICAgICAgc3VwZXIoW2NsYXNzTmFtZV0sIHRpdGxlLCBzdWJ0aXRsZSwgcHJvZmlsZU5v ZGUsIGhhc0NoaWxkcmVuKTsKKyAgICAgICAgc3VwZXIoW2NsYXNzTmFtZV0sIHRpdGxlLCBzdWJ0 aXRsZSwgcHJvZmlsZU5vZGUsIHtoYXNDaGlsZHJlbjogISFwcm9maWxlTm9kZS5jaGlsZE5vZGVz Lmxlbmd0aH0pOwogCiAgICAgICAgIHRoaXMuX3Byb2ZpbGVOb2RlID0gcHJvZmlsZU5vZGU7CiAg ICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1l bnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZVRyZWVFbGVtZW50LmpzCmluZGV4IDYyNzIyNjE1MDRiLi40OGQ4ZTczMjJlZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVl RWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCkBAIC0yOSw3ICsyOSw5IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRyZWVFbGVtZW50ID0gY2xhc3MgUmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdl Ykluc3BlY3RvCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChyZXNvdXJjZSBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSk7CiAKLSAgICAgICAgc3VwZXIocmVzb3VyY2UsIFsi cmVzb3VyY2UiLCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25T dHlsZUNsYXNzTmFtZSwgcmVzb3VyY2UudHlwZV0sICIiLCAiIiwgcmVwcmVzZW50ZWRPYmplY3Qg fHwgcmVzb3VyY2UsIGZhbHNlKTsKKyAgICAgICAgY29uc3QgdGl0bGUgPSBudWxsOworICAgICAg ICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIHN1cGVyKHJlc291cmNlLCBbInJlc291 cmNlIiwgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQuUmVzb3VyY2VJY29uU3R5bGVD bGFzc05hbWUsIHJlc291cmNlLnR5cGVdLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2Jq ZWN0IHx8IHJlc291cmNlKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZShyZXNvdXJj ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2NyaXB0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxlbWVudC5qcwppbmRleCA2ZmNlYjQ0ZDNhOS4u YWM0NjdjYzBhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRyZWVFbGVtZW50LmpzCkBAIC0yOSwxNCArMjks MTYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRyZWVFbGVtZW50ID0gY2xhc3MgU2NyaXB0VHJlZUVs ZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuU28KICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KHNjcmlwdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHQpOwogCi0gICAgICAgIHN1 cGVyKHNjcmlwdCwgInNjcmlwdCIsIG51bGwsIG51bGwsIHNjcmlwdCwgZmFsc2UpOworICAgICAg ICBjb25zdCB0aXRsZSA9IG51bGw7CisgICAgICAgIGNvbnN0IHN1YnRpdGxlID0gbnVsbDsKKyAg ICAgICAgc3VwZXIoc2NyaXB0LCAic2NyaXB0IiwgdGl0bGUsIHN1YnRpdGxlKTsKIAogICAgICAg ICB0aGlzLm1haW5UaXRsZSA9IHNjcmlwdC5kaXNwbGF5TmFtZTsKIAogICAgICAgICBpZiAoc2Ny aXB0LnVybCAmJiAhc2NyaXB0LmR5bmFtaWNhbGx5QWRkZWRTY3JpcHRFbGVtZW50KSB7CiAgICAg ICAgICAgICAvLyBTaG93IHRoZSBob3N0IGFzIHRoZSBzdWJ0aXRsZSBpZiBpdCBpcyBkaWZmZXJl bnQgZnJvbSB0aGUgbWFpbiB0aXRsZS4KLSAgICAgICAgICAgIHZhciBzdWJ0aXRsZSA9IFdlYklu c3BlY3Rvci5kaXNwbGF5TmFtZUZvckhvc3Qoc2NyaXB0LnVybENvbXBvbmVudHMuaG9zdCk7Ci0g ICAgICAgICAgICB0aGlzLnN1YnRpdGxlID0gdGhpcy5tYWluVGl0bGUgIT09IHN1YnRpdGxlID8g c3VidGl0bGUgOiBudWxsOworICAgICAgICAgICAgbGV0IGhvc3QgPSBXZWJJbnNwZWN0b3IuZGlz cGxheU5hbWVGb3JIb3N0KHNjcmlwdC51cmxDb21wb25lbnRzLmhvc3QpOworICAgICAgICAgICAg dGhpcy5zdWJ0aXRsZSA9IHRoaXMubWFpblRpdGxlICE9PSBob3N0ID8gaG9zdCA6IG51bGw7CiAK ICAgICAgICAgICAgIHRoaXMudG9vbHRpcCA9IHNjcmlwdC51cmw7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVF bGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Vh cmNoUmVzdWx0VHJlZUVsZW1lbnQuanMKaW5kZXggNjdjZDQ3MzM0YjguLmQ0MjEzNGQ1NGU2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFy Y2hSZXN1bHRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC5qcwpAQCAtMzAsOCArMzAsOCBA QCBXZWJJbnNwZWN0b3IuU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQgPSBjbGFzcyBTZWFyY2hSZXN1 bHRUcmVlRWxlbWVudCBleHRlbmRzIFdlYgogICAgICAgICBjb25zb2xlLmFzc2VydChyZXByZXNl bnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5ET01TZWFyY2hNYXRjaE9iamVjdCB8 fCByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlU2Vh cmNoTWF0Y2hPYmplY3QpOwogCiAgICAgICAgIHZhciB0aXRsZSA9IFdlYkluc3BlY3Rvci5TZWFy Y2hSZXN1bHRUcmVlRWxlbWVudC50cnVuY2F0ZUFuZEhpZ2hsaWdodFRpdGxlKHJlcHJlc2VudGVk T2JqZWN0LnRpdGxlLCByZXByZXNlbnRlZE9iamVjdC5zZWFyY2hUZXJtLCByZXByZXNlbnRlZE9i amVjdC5zb3VyY2VDb2RlVGV4dFJhbmdlKTsKLQotICAgICAgICBzdXBlcihyZXByZXNlbnRlZE9i amVjdC5jbGFzc05hbWUsIHRpdGxlLCBudWxsLCByZXByZXNlbnRlZE9iamVjdCwgZmFsc2UpOwor ICAgICAgICBjb25zdCBzdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIHN1cGVyKHJlcHJlc2VudGVk T2JqZWN0LmNsYXNzTmFtZSwgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCk7CiAg ICAgfQogCiAgICAgLy8gU3RhdGljCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVHJlZUVsZW1lbnQuanMK aW5kZXggZDAyYmNmODg5NWUuLjg3NzQ5MjUyOTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVHJlZUVsZW1lbnQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRy ZWVFbGVtZW50LmpzCkBAIC0yNSwxMSArMjUsMTEgQEAKIAogV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVUcmVlRWxlbWVudCA9IGNsYXNzIFNvdXJjZUNvZGVUcmVlRWxlbWVudCBleHRlbmRzIFdlYklu c3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQKIHsKLSAgICBjb25zdHJ1Y3Rvcihzb3VyY2VD b2RlLCBjbGFzc05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0LCBoYXND aGlsZHJlbikKKyAgICBjb25zdHJ1Y3Rvcihzb3VyY2VDb2RlLCBjbGFzc05hbWVzLCB0aXRsZSwg c3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoc291cmNlQ29kZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlKTsKIAotICAg ICAgICBzdXBlcihjbGFzc05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0 IHx8IHNvdXJjZUNvZGUsIGhhc0NoaWxkcmVuKTsKKyAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywg dGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCB8fCBzb3VyY2VDb2RlKTsKIAogICAg ICAgICB0aGlzLl91cGRhdGVTb3VyY2VDb2RlKHNvdXJjZUNvZGUpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZU1hcFJl c291cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Tb3VyY2VNYXBSZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IDA4NzIyYTJmMDUz Li45MDA1ODE4YWI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU291cmNlTWFwUmVzb3VyY2VUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VNYXBSZXNvdXJjZVRyZWVF bGVtZW50LmpzCkBAIC0yNSw3ICsyNSw3IEBACiAKIFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBSZXNv dXJjZVRyZWVFbGVtZW50ID0gY2xhc3MgU291cmNlTWFwUmVzb3VyY2VUcmVlRWxlbWVudCBleHRl bmRzIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50CiB7Ci0gICAgY29uc3RydWN0b3Io c291cmNlTWFwUmVzb3VyY2UsIHJlcHJlc2VudGVkT2JqZWN0KQorICAgIGNvbnN0cnVjdG9yKHNv dXJjZU1hcFJlc291cmNlKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoc291cmNlTWFw UmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlTWFwUmVzb3VyY2UpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9y YWdlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TdG9yYWdlVHJlZUVsZW1lbnQuanMKaW5kZXggOTM0Yzc5YzQ4OTMuLmYwMmFlYTljMmUy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T dG9yYWdlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU3RvcmFnZVRyZWVFbGVtZW50LmpzCkBAIC0yNyw3ICsyNyw4IEBAIFdlYklu c3BlY3Rvci5TdG9yYWdlVHJlZUVsZW1lbnQgPSBjbGFzcyBTdG9yYWdlVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuCiB7CiAgICAgY29uc3RydWN0b3IoY2xhc3NOYW1lcywgdGl0bGUs IHJlcHJlc2VudGVkT2JqZWN0KQogICAgIHsKLSAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywgdGl0 bGUsIG51bGwsIHJlcHJlc2VudGVkT2JqZWN0LCBmYWxzZSk7CisgICAgICAgIGNvbnN0IHN1YnRp dGxlID0gbnVsbDsKKyAgICAgICAgc3VwZXIoY2xhc3NOYW1lcywgdGl0bGUsIHN1YnRpdGxlLCBy ZXByZXNlbnRlZE9iamVjdCk7CiAKICAgICAgICAgdGhpcy5mbGF0dGVuZWQgPSBmYWxzZTsKICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5qcwppbmRleCBiOTc4 MjVlMTU0Ny4uOTJhYzBmZGY1OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRUcmVl RWxlbWVudC5qcwpAQCAtNTUsNyArNTUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRU cmVlRWxlbWVudCA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQgZXh0ZW5kcwogICAg ICAgICBsZXQgaWNvblN0eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50 Vmlldy5pY29uQ2xhc3NOYW1lRm9yUmVjb3JkKHRpbWVsaW5lUmVjb3JkKTsKICAgICAgICAgbGV0 IHRpdGxlID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxheU5hbWVG b3JSZWNvcmQodGltZWxpbmVSZWNvcmQpOwogCi0gICAgICAgIHN1cGVyKFtpY29uU3R5bGVDbGFz c10sIHRpdGxlLCBzdWJ0aXRsZSwgcmVwcmVzZW50ZWRPYmplY3QgfHwgdGltZWxpbmVSZWNvcmQs IGZhbHNlKTsKKyAgICAgICAgc3VwZXIoW2ljb25TdHlsZUNsYXNzXSwgdGl0bGUsIHN1YnRpdGxl LCByZXByZXNlbnRlZE9iamVjdCB8fCB0aW1lbGluZVJlY29yZCk7CiAKICAgICAgICAgdGhpcy5f cmVjb3JkID0gdGltZWxpbmVSZWNvcmQ7CiAgICAgICAgIHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlv biA9IHNvdXJjZUNvZGVMb2NhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanMKaW5kZXggYTgxYzI5YzJkMTAu LmQyZTA5NDY0YmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcwpAQCAtMjgsMTIgKzI4LDEyIEBACiAKIFdl Ykluc3BlY3Rvci5UcmVlRWxlbWVudCA9IGNsYXNzIFRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogewotICAgIGNvbnN0cnVjdG9yKHRpdGxlLCByZXByZXNlbnRlZE9iamVj dCwgaGFzQ2hpbGRyZW4pCisgICAgY29uc3RydWN0b3IodGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0 LCBvcHRpb25zID0ge30pCiAgICAgewogICAgICAgICBzdXBlcigpOwogCiAgICAgICAgIHRoaXMu X3RpdGxlID0gdGl0bGU7Ci0gICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QgPSAocmVwcmVz ZW50ZWRPYmplY3QgfHwge30pOworICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0ID0gcmVw cmVzZW50ZWRPYmplY3QgfHwge307CiAKICAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QuX190cmVlRWxlbWVudElkZW50aWZpZXIpCiAgICAgICAgICAgICB0aGlzLmlkZW50aWZpZXIg PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Ll9fdHJlZUVsZW1lbnRJZGVudGlmaWVyOwpAQCAtNDYs NyArNDYsNyBAQCBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVlRWxlbWVudCBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5fc2VsZWN0YWJsZSA9IHRy dWU7CiAgICAgICAgIHRoaXMuZXhwYW5kZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5zZWxlY3Rl ZCA9IGZhbHNlOwotICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gaGFzQ2hpbGRyZW47CisgICAg ICAgIHRoaXMuaGFzQ2hpbGRyZW4gPSBvcHRpb25zLmhhc0NoaWxkcmVuOwogICAgICAgICB0aGlz LmNoaWxkcmVuID0gW107CiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUgPSBudWxsOwogICAgICAg ICB0aGlzLnBhcmVudCA9IG51bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UeXBlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UeXBlVHJlZUVsZW1lbnQuanMKaW5kZXggMDgyMzgy YjdlZTcuLjAyYTc2NzRjMzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UeXBlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHlwZVRyZWVFbGVtZW50LmpzCkBAIC0yNyw3ICsy NywxMCBAQCBXZWJJbnNwZWN0b3IuVHlwZVRyZWVFbGVtZW50ID0gY2xhc3MgVHlwZVRyZWVFbGVt ZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkdlbmVyYQogewogICAgIGNvbnN0cnVjdG9yKG5hbWUs IHN0cnVjdHVyZURlc2NyaXB0aW9uLCBpc1Byb3RvdHlwZSkKICAgICB7Ci0gICAgICAgIHN1cGVy KG51bGwsIG51bGwsIG51bGwsIHN0cnVjdHVyZURlc2NyaXB0aW9uIHx8IG51bGwsIGZhbHNlKTsK KyAgICAgICAgY29uc3QgY2xhc3NOYW1lcyA9IG51bGw7CisgICAgICAgIGNvbnN0IHRpdGxlID0g bnVsbDsKKyAgICAgICAgY29uc3Qgc3VidGl0bGUgPSBudWxsOworICAgICAgICBzdXBlcihjbGFz c05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHN0cnVjdHVyZURlc2NyaXB0aW9uIHx8IG51bGwpOwog CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFzdHJ1Y3R1cmVEZXNjcmlwdGlvbiB8fCBzdHJ1Y3R1 cmVEZXNjcmlwdGlvbiBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TdHJ1Y3R1cmVEZXNjcmlwdGlv bik7CiAK