100371 2012-10-25 05:48:38 -0700 Web Inspector: JsDoc-annotate Audits panel code 2012-10-26 02:06:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 100337 0 eustas.bug eustas.bug apavlov bweinstein caseq eustas.bug joepeck keishi loislo pfeldman pmuellr rik vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 750717 0 eustas.bug 2012-10-25 05:48:38 -0700 This is a preparation step for ongoing refactoring. It is much easier to read doctyped code. 750731 1 170622 eustas.bug 2012-10-25 06:08:04 -0700 Created attachment 170622 Patch 751580 2 170622 apavlov 2012-10-25 23:14:13 -0700 Comment on attachment 170622 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170622&action=review > Source/WebCore/inspector/front-end/AuditsPanel.js:320 > + ruleResultCallback(result); Have you made sure none of the callbacks use "this"? 751674 3 170622 eustas.bug 2012-10-26 01:20:55 -0700 Comment on attachment 170622 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170622&action=review >> Source/WebCore/inspector/front-end/AuditsPanel.js:320 >> + ruleResultCallback(result); > > Have you made sure none of the callbacks use "this"? There is only one callback and it is already bound to its issuer object, so applying here has no effect. 751709 4 170622 webkit.review.bot 2012-10-26 02:06:50 -0700 Comment on attachment 170622 Patch Clearing flags on attachment: 170622 Committed r132588: <http://trac.webkit.org/changeset/132588> 751710 5 webkit.review.bot 2012-10-26 02:06:55 -0700 All reviewed patches have been landed. Closing bug. 170622 2012-10-25 06:08:04 -0700 2012-10-26 02:06:50 -0700 Patch bug-100371-20121025170637.patch text/plain 22757 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwNDU4YjY3N2MwZmQx MjUyZjdjZjQ2Y2RjOGRjMzRhYTJhNmEwNS4uODU3YTRkMWZmZThjMjc5NGMzMTBiNzhlM2U4ZGE5 NTUxMmJmZWQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTI1ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBEb2N0eXBlIEF1ZGl0cyBwYW5lbCBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAzNzEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgcHJlcGFyYXRpb24gc3RlcCBmb3Ig b25nb2luZyByZWZhY3RvcmluZy4KKyAgICAgICAgSXQgaXMgbXVjaCBlYXNpZXIgdG8gcmVhZCBk b2N0eXBlZCBjb2RlLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVz LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuTWluaW1pemVEbnNMb29rdXBz UnVsZS5wcm90b3R5cGUuZG9SdW4pOgorICAgICAgICBSZXBsYWNlZCAidW5kZWZpbmVkIiB3aXRo ICJudWxsIgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRDYXRlZ29yeS5wcm90b3R5cGUuY2FsbGJhY2tXcmFw cGVyKToKKyAgICAgICAgUmVtb3ZlZCBjYWxsYmFjayBwYXJhbWV0ZXIgaW5kaXJlY3Rpb24uICAg ICAgICAKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQucHJvdG90eXBlLmFk ZEZvcm1hdHRlZCk6CisgICAgICAgIENvbnZlcnRlZCBwcml2YXRlIGluc3RhbmNlIGZ1bmN0aW9u IHRvIHNjb3BlZCBmdW5jdGlvbi4KKwogMjAxMi0xMC0yMyAgQWxleGFuZGVyIFBhdmxvdiAgPGFw YXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERyYWcgYW5kIGRy b3AgcHJvcGVydHkgdmFsdWUgZnJvbSBJbnNwZWN0b3IgaXMgbm90IHdvcmtpbmcgYXMgZXhwZWN0 ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRM YXVuY2hlclZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0 TGF1bmNoZXJWaWV3LmpzCmluZGV4IDI5MzlmMWIyMTYyODEzZWMyMDRjNWRhZjgxZmFlYjk1MjZl YzVlMTguLjQ4YTU5OTBiYTZiYTc4NDQ5YzBlNmFjZDU0YzU5ZTI5Y2YxOGRjZmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRMYXVuY2hlclZpZXcu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdExhdW5jaGVy Vmlldy5qcwpAQCAtODksNiArODksOSBAQCBXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVByb2dyZXNzKCk7CiAg ICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdENhdGVn b3J5fSBjYXRlZ29yeQorICAgICAqLwogICAgIGFkZENhdGVnb3J5OiBmdW5jdGlvbihjYXRlZ29y eSkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fc29ydGVkQ2F0ZWdvcmllcy5sZW5ndGgpCkBA IC0xMTMsNiArMTE2LDkgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fdXBkYXRlQnV0dG9uKCk7CiAgICAgfSwKIAorICAgIC8qKgor ICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gYXVkaXRSdW5uaW5nCisgICAgICovCiAgICAgX3NldEF1 ZGl0UnVubmluZzogZnVuY3Rpb24oYXVkaXRSdW5uaW5nKQogICAgIHsKICAgICAgICAgaWYgKHRo aXMuX2F1ZGl0UnVubmluZyA9PT0gYXVkaXRSdW5uaW5nKQpAQCAtMTU4LDYgKzE2NCw5IEBAIFdl Ykluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X3NldEF1ZGl0UnVubmluZyghdGhpcy5fYXVkaXRSdW5uaW5nKTsKICAgICB9LAogCisgICAgLyoq CisgICAgICogQHBhcmFtIHtib29sZWFufSBjaGVja0NhdGVnb3JpZXMKKyAgICAgKi8KICAgICBf c2VsZWN0QWxsQ2xpY2tlZDogZnVuY3Rpb24oY2hlY2tDYXRlZ29yaWVzKQogICAgIHsKICAgICAg ICAgdmFyIGNoaWxkTm9kZXMgPSB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5jaGlsZE5vZGVzOwpA QCAtMTc0LDYgKzE4MywxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVCdXR0b24oKTsKICAgICB9LAogCisgICAgLyoq CisgICAgICogQHBhcmFtIHtzdHJpbmd9IHRpdGxlCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGlk CisgICAgICovCiAgICAgX2NyZWF0ZUNhdGVnb3J5RWxlbWVudDogZnVuY3Rpb24odGl0bGUsIGlk KQogICAgIHsKICAgICAgICAgdmFyIGxhYmVsRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImxhYmVsIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0F1ZGl0UmVzdWx0Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQXVkaXRSZXN1bHRWaWV3LmpzCmluZGV4IGRiZDdhODljNzQ4ZjAwZjFlZjBlNTE1YjAyMzdh OGFmNmZjZWNkNjcuLjBhOTBiNGE2NmNkMzU0OGRmYWE0NGJlNGI3YjZiNGU1ZDExZmMwYTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSZXN1bHRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSZXN1 bHRWaWV3LmpzCkBAIC0zMSw2ICszMSw3IEBACiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQorICogQHBhcmFtIHshQXJyYXkuPCFXZWJJbnNwZWN0 b3IuQXVkaXRDYXRlZ29yeVJlc3VsdD59IGNhdGVnb3J5UmVzdWx0cwogICovCiBXZWJJbnNwZWN0 b3IuQXVkaXRSZXN1bHRWaWV3ID0gZnVuY3Rpb24oY2F0ZWdvcnlSZXN1bHRzKQogewpAQCAtNTIs NiArNTMsNyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSZXN1bHRWaWV3LnByb3RvdHlwZSA9IHsKIC8q KgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNpZGViYXJQYW5l fQorICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkF1ZGl0Q2F0ZWdvcnlSZXN1bHR9IGNhdGVnb3J5 UmVzdWx0CiAgKi8KIFdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVzdWx0UGFuZSA9IGZ1bmN0 aW9uKGNhdGVnb3J5UmVzdWx0KQogewpAQCAtODgsNiArOTAsMTAgQEAgV2ViSW5zcGVjdG9yLkF1 ZGl0Q2F0ZWdvcnlSZXN1bHRQYW5lID0gZnVuY3Rpb24oY2F0ZWdvcnlSZXN1bHQpCiB9CiAKIFdl Ykluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVzdWx0UGFuZS5wcm90b3R5cGUgPSB7CisgICAgLyoq CisgICAgICogQHBhcmFtIHsoVHJlZU91dGxpbmV8VHJlZUVsZW1lbnQpfSBwYXJlbnRUcmVlRWxl bWVudAorICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVzdWx0fSBy ZXN1bHQKKyAgICAgKi8KICAgICBfYXBwZW5kUmVzdWx0OiBmdW5jdGlvbihwYXJlbnRUcmVlRWxl bWVudCwgcmVzdWx0KQogICAgIHsKICAgICAgICAgdmFyIHRpdGxlID0gIiI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKaW5kZXggMzgzNDgy ZjViMjRlZDhiNjdkMTQzNTdkMGE2OTRjZmUzZTNjNTJhMy4uZmJjZjdiZGUyYTNkNzAzOThiM2M0 NjQ1Zjc2MDc4ODE1NTkzZTNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQXVkaXRSdWxlcy5qcwpAQCAtNDIsNiArNDIsMTIgQEAgV2ViSW5zcGVjdG9yLkF1 ZGl0UnVsZXMuQ2FjaGVhYmxlUmVzcG9uc2VDb2RlcyA9CiAgICAgMzA0OiB0cnVlIC8vIFVuZGVy bHlpbmcgcmVxdWVzdCBpcyBjYWNoZWFibGUKIH0KIAorLyoqCisgKiBAcGFyYW0geyFBcnJheS48 IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisgKiBAcGFyYW0ge0FycmF5 LjwhV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXM+fSB0eXBlcworICogQHBhcmFtIHtib29sZWFu fSBuZWVkRnVsbFJlc291cmNlcworICogQHJldHVybiB7KE9iamVjdC48c3RyaW5nLCAhQXJyYXku PCFXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+PnxPYmplY3QuPHN0cmluZywgIUFycmF5Ljxz dHJpbmc+Pil9CisgKi8KIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLmdldERvbWFpblRvUmVzb3Vy Y2VzTWFwID0gZnVuY3Rpb24ocmVxdWVzdHMsIHR5cGVzLCBuZWVkRnVsbFJlc291cmNlcykKIHsK ICAgICB2YXIgZG9tYWluVG9SZXNvdXJjZXNNYXAgPSB7fTsKQEAgLTc0LDEwICs4MCwxMCBAQCBX ZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5HemlwUnVsZSA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVj dG9yLkF1ZGl0UnVsZXMuR3ppcFJ1bGUucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBw YXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCi0gICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1bHQKKyAgICAgKiBA cGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisg ICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAg ICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJh Y2sKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAg KiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCiAgICAgICovCiAgICAg ZG9SdW46IGZ1bmN0aW9uKHJlcXVlc3RzLCByZXN1bHQsIGNhbGxiYWNrLCBwcm9ncmVzcykKICAg ICB7CkBAIC0xMzksMTAgKzE0NSwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Db21iaW5l RXh0ZXJuYWxSZXNvdXJjZXNSdWxlID0gZnVuY3Rpb24oaWQsIG5hbWUsIHR5cGUsCiAKIFdlYklu c3BlY3Rvci5BdWRpdFJ1bGVzLkNvbWJpbmVFeHRlcm5hbFJlc291cmNlc1J1bGUucHJvdG90eXBl ID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5OZXR3b3Jr UmVxdWVzdD59IHJlcXVlc3RzCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQXVkaXRSdWxl UmVzdWx0fSByZXN1bHQKKyAgICAgKiBAcGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3 b3JrUmVxdWVzdD59IHJlcXVlc3RzCisgICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkF1ZGl0 UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3Iu QXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Q cm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9 IHByb2dyZXNzCiAgICAgICovCiAgICAgZG9SdW46IGZ1bmN0aW9uKHJlcXVlc3RzLCByZXN1bHQs IGNhbGxiYWNrLCBwcm9ncmVzcykKICAgICB7CkBAIC0yMDQsMTUgKzIxMCwxNSBAQCBXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5NaW5pbWl6ZURuc0xvb2t1cHNSdWxlID0gZnVuY3Rpb24oaG9zdENv dW50VGhyZXNob2xkKSB7CiAKIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLk1pbmltaXplRG5zTG9v a3Vwc1J1bGUucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdl Ykluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCi0gICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1bHQKKyAgICAgKiBAcGFyYW0geyFBcnJheS48 IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisgICAgICogQHBhcmFtIHsh V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAgICogQHBhcmFtIHtmdW5j dGlvbihXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJhY2sKLSAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAgKiBAcGFyYW0geyFXZWJJ bnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCiAgICAgICovCiAgICAgZG9SdW46IGZ1bmN0aW9u KHJlcXVlc3RzLCByZXN1bHQsIGNhbGxiYWNrLCBwcm9ncmVzcykKICAgICB7CiAgICAgICAgIHZh ciBzdW1tYXJ5ID0gcmVzdWx0LmFkZENoaWxkKCIiKTsKLSAgICAgICAgdmFyIGRvbWFpblRvUmVz b3VyY2VzTWFwID0gV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuZ2V0RG9tYWluVG9SZXNvdXJjZXNN YXAocmVxdWVzdHMsIHVuZGVmaW5lZCwgZmFsc2UpOworICAgICAgICB2YXIgZG9tYWluVG9SZXNv dXJjZXNNYXAgPSBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5nZXREb21haW5Ub1Jlc291cmNlc01h cChyZXF1ZXN0cywgbnVsbCwgZmFsc2UpOwogICAgICAgICBmb3IgKHZhciBkb21haW4gaW4gZG9t YWluVG9SZXNvdXJjZXNNYXApIHsKICAgICAgICAgICAgIGlmIChkb21haW5Ub1Jlc291cmNlc01h cFtkb21haW5dLmxlbmd0aCA+IDEpCiAgICAgICAgICAgICAgICAgY29udGludWU7CkBAIC0yNDgs MTAgKzI1NCwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5QYXJhbGxlbGl6ZURvd25sb2Fk UnVsZSA9IGZ1bmN0aW9uKG9wdGltYWxIb3N0bmFtZUNvdW50LAogCiBXZWJJbnNwZWN0b3IuQXVk aXRSdWxlcy5QYXJhbGxlbGl6ZURvd25sb2FkUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0g ICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVz dHMKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHR9IHJlc3VsdAor ICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVx dWVzdHMKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1 bHQKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQp fSBjYWxsYmFjawotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwcm9ncmVz cworICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKICAgICAg Ki8KICAgICBkb1J1bjogZnVuY3Rpb24ocmVxdWVzdHMsIHJlc3VsdCwgY2FsbGJhY2ssIHByb2dy ZXNzKQogICAgIHsKQEAgLTMyMywxMCArMzI5LDEwIEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVz LlVudXNlZENzc1J1bGUgPSBmdW5jdGlvbigpCiAKIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlVu dXNlZENzc1J1bGUucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXku PFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCi0gICAgICogQHBhcmFtIHtX ZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1bHQKKyAgICAgKiBAcGFyYW0geyFBcnJh eS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisgICAgICogQHBhcmFt IHshV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAgICogQHBhcmFtIHtm dW5jdGlvbihXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJhY2sKLSAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAgKiBAcGFyYW0geyFX ZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCiAgICAgICovCiAgICAgZG9SdW46IGZ1bmN0 aW9uKHJlcXVlc3RzLCByZXN1bHQsIGNhbGxiYWNrLCBwcm9ncmVzcykKICAgICB7CkBAIC00NzUs MTAgKzQ4MSwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5DYWNoZUNvbnRyb2xSdWxlLk1p bGxpc1Blck1vbnRoID0gMTAwMCAqIDYwICogNjAgKiAyNCAqCiAKIFdlYkluc3BlY3Rvci5BdWRp dFJ1bGVzLkNhY2hlQ29udHJvbFJ1bGUucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBw YXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCi0gICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1bHQKKyAgICAgKiBA cGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisg ICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAg ICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJh Y2sKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAg KiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCiAgICAgICovCiAgICAg ZG9SdW46IGZ1bmN0aW9uKHJlcXVlc3RzLCByZXN1bHQsIGNhbGxiYWNrLCBwcm9ncmVzcykKICAg ICB7CkBAIC03MjgsMTAgKzczNCwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURp bWVuc2lvbnNSdWxlID0gZnVuY3Rpb24oKQogCiBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFn ZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZSA9IHsKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0Fy cmF5LjxXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+fSByZXF1ZXN0cwotICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CisgICAgICogQHBhcmFtIHsh QXJyYXkuPCFXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+fSByZXF1ZXN0cworICAgICAqIEBw YXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHR9IHJlc3VsdAogICAgICAqIEBwYXJh bSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdCl9IGNhbGxiYWNrCi0gICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCisgICAgICogQHBhcmFt IHshV2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwcm9ncmVzcwogICAgICAqLwogICAgIGRvUnVuOiBm dW5jdGlvbihyZXF1ZXN0cywgcmVzdWx0LCBjYWxsYmFjaywgcHJvZ3Jlc3MpCiAgICAgewpAQCAt ODYwLDEwICs4NjYsMTAgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZSA9 IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90 b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLk5l dHdvcmtSZXF1ZXN0Pn0gcmVxdWVzdHMKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5BdWRp dFJ1bGVSZXN1bHR9IHJlc3VsdAorICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9y Lk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVzdHMKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3Iu QXVkaXRSdWxlUmVzdWx0fSByZXN1bHQKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3Bl Y3Rvci5BdWRpdFJ1bGVSZXN1bHQpfSBjYWxsYmFjawotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlByb2dyZXNzfSBwcm9ncmVzcworICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5Qcm9n cmVzc30gcHJvZ3Jlc3MKICAgICAgKi8KICAgICBkb1J1bjogZnVuY3Rpb24ocmVxdWVzdHMsIHJl c3VsdCwgY2FsbGJhY2ssIHByb2dyZXNzKQogICAgIHsKQEAgLTk1MCwxMCArOTU2LDEwIEBAIFdl Ykluc3BlY3Rvci5BdWRpdFJ1bGVzLlN0eWxlc1NjcmlwdHNPcmRlclJ1bGUgPSBmdW5jdGlvbigp CiAKIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlN0eWxlc1NjcmlwdHNPcmRlclJ1bGUucHJvdG90 eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5OZXR3 b3JrUmVxdWVzdD59IHJlcXVlc3RzCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQXVkaXRS dWxlUmVzdWx0fSByZXN1bHQKKyAgICAgKiBAcGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rvci5O ZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCisgICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkF1 ZGl0UnVsZVJlc3VsdH0gcmVzdWx0CiAgICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0 b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuUHJvZ3Jl c3N9IHByb2dyZXNzCiAgICAgICovCiAgICAgZG9SdW46IGZ1bmN0aW9uKHJlcXVlc3RzLCByZXN1 bHQsIGNhbGxiYWNrLCBwcm9ncmVzcykKICAgICB7CkBAIC0xMDM4LDEwICsxMDQ0LDEwIEBAIFdl Ykluc3BlY3Rvci5BdWRpdFJ1bGVzLkNTU1J1bGVCYXNlID0gZnVuY3Rpb24oaWQsIG5hbWUpCiAK IFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLkNTU1J1bGVCYXNlLnByb3RvdHlwZSA9IHsKICAgICAv KioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+fSBy ZXF1ZXN0cwotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdH0gcmVz dWx0CisgICAgICogQHBhcmFtIHshQXJyYXkuPCFXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+ fSByZXF1ZXN0cworICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHR9 IHJlc3VsdAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJl c3VsdCl9IGNhbGxiYWNrCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHBy b2dyZXNzCisgICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwcm9ncmVzcwog ICAgICAqLwogICAgIGRvUnVuOiBmdW5jdGlvbihyZXF1ZXN0cywgcmVzdWx0LCBjYWxsYmFjaywg cHJvZ3Jlc3MpCiAgICAgewpAQCAtMTIwNSwxMCArMTIxMSwxMCBAQCBXZWJJbnNwZWN0b3IuQXVk aXRSdWxlcy5Db29raWVSdWxlQmFzZSA9IGZ1bmN0aW9uKGlkLCBuYW1lKQogCiBXZWJJbnNwZWN0 b3IuQXVkaXRSdWxlcy5Db29raWVSdWxlQmFzZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAg ICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVzdHMK LSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHR9IHJlc3VsdAorICAg ICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVz dHMKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0fSByZXN1bHQK ICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQpfSBj YWxsYmFjawotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwcm9ncmVzcwor ICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKICAgICAgKi8K ICAgICBkb1J1bjogZnVuY3Rpb24ocmVxdWVzdHMsIHJlc3VsdCwgY2FsbGJhY2ssIHByb2dyZXNz KQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0 c1BhbmVsLmpzCmluZGV4IDVkMDA1YTQ4NzQxMjZhZjA0MDAwMjg5ZTVjMjJkOTlkZGZjYzNkYWQu LjI2MjRkNGQxNWE1MWM0YWVlMjI2NjI5NTZlYWVlMDk4OGMxNmY4MjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwpAQCAtNzAsMTcg KzcwLDI3IEBAIFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJldHVybiBbdGhpcy5jbGVhclJlc3VsdHNCdXR0b24uZWxlbWVudF07CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEByZXR1cm4geyFPYmplY3QuPHN0cmluZywgIVdlYkluc3BlY3Rvci5BdWRp dENhdGVnb3J5Pn0KKyAgICAgKi8KICAgICBnZXQgY2F0ZWdvcmllc0J5SWQoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMuX2F1ZGl0Q2F0ZWdvcmllc0J5SWQ7CiAgICAgfSwKIAorICAgIC8q KgorICAgICAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5fSBjYXRlZ29yeQor ICAgICAqLwogICAgIGFkZENhdGVnb3J5OiBmdW5jdGlvbihjYXRlZ29yeSkKICAgICB7CiAgICAg ICAgIHRoaXMuY2F0ZWdvcmllc0J5SWRbY2F0ZWdvcnkuaWRdID0gY2F0ZWdvcnk7CiAgICAgICAg IHRoaXMuX2xhdW5jaGVyVmlldy5hZGRDYXRlZ29yeShjYXRlZ29yeSk7CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAgICAqIEByZXR1cm4ge1dlYkluc3Bl Y3Rvci5BdWRpdENhdGVnb3J5fQorICAgICAqLwogICAgIGdldENhdGVnb3J5OiBmdW5jdGlvbihp ZCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLmNhdGVnb3JpZXNCeUlkW2lkXTsKQEAgLTk2 LDYgKzEwNiwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICB9CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5z cGVjdG9yLkF1ZGl0Q2F0ZWdvcnk+fSBjYXRlZ29yaWVzCisgICAgICogQHBhcmFtIHtmdW5jdGlv bihzdHJpbmcsICFBcnJheS48IVdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVzdWx0Pil9IHJl c3VsdENhbGxiYWNrCisgICAgICovCiAgICAgX2V4ZWN1dGVBdWRpdDogZnVuY3Rpb24oY2F0ZWdv cmllcywgcmVzdWx0Q2FsbGJhY2spCiAgICAgewogICAgICAgICB0aGlzLl9wcm9ncmVzcy5zZXRU aXRsZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJ1bm5pbmcgYXVkaXQiKSk7CkBAIC0xMzMsNiAr MTQ3LDExIEBAIFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtmdW5jdGlvbigpfSBsYXVuY2hl ckNhbGxiYWNrCisgICAgICogQHBhcmFtIHtzdHJpbmd9IG1haW5SZXNvdXJjZVVSTAorICAgICAq IEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLkF1ZGl0Q2F0ZWdvcnlSZXN1bHQ+fSByZXN1 bHRzCisgICAgICovCiAgICAgX2F1ZGl0RmluaXNoZWRDYWxsYmFjazogZnVuY3Rpb24obGF1bmNo ZXJDYWxsYmFjaywgbWFpblJlc291cmNlVVJMLCByZXN1bHRzKQogICAgIHsKICAgICAgICAgdmFy IGNoaWxkcmVuID0gdGhpcy5hdWRpdFJlc3VsdHNUcmVlRWxlbWVudC5jaGlsZHJlbjsKQEAgLTE5 Niw2ICsyMTUsOSBAQCBXZWJJbnNwZWN0b3IuQXVkaXRzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICB9CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5z cGVjdG9yLkF1ZGl0Q2F0ZWdvcnlSZXN1bHQ+fSBjYXRlZ29yeVJlc3VsdHMKKyAgICAgKi8KICAg ICBzaG93UmVzdWx0czogZnVuY3Rpb24oY2F0ZWdvcnlSZXN1bHRzKQogICAgIHsKICAgICAgICAg aWYgKCFjYXRlZ29yeVJlc3VsdHMuX3Jlc3VsdFZpZXcpCkBAIC0yNDYsNiArMjY4LDcgQEAgV2Vi SW5zcGVjdG9yLkF1ZGl0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0 b3IKKyAqIEBwYXJhbSB7c3RyaW5nfSBkaXNwbGF5TmFtZQogICovCiBXZWJJbnNwZWN0b3IuQXVk aXRDYXRlZ29yeSA9IGZ1bmN0aW9uKGRpc3BsYXlOYW1lKQogewpAQCAtMjU0LDE3ICsyNzcsMjcg QEAgV2ViSW5zcGVjdG9yLkF1ZGl0Q2F0ZWdvcnkgPSBmdW5jdGlvbihkaXNwbGF5TmFtZSkKIH0K IAogV2ViSW5zcGVjdG9yLkF1ZGl0Q2F0ZWdvcnkucHJvdG90eXBlID0geworICAgIC8qKgorICAg ICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KICAgICBnZXQgaWQoKQogICAgIHsKICAgICAg ICAgLy8gdGhpcy5faWQgdmFsdWUgaXMgaW5qZWN0ZWQgYXQgY29uc3RydWN0aW9uIHRpbWUuCiAg ICAgICAgIHJldHVybiB0aGlzLl9pZDsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHJldHVy biB7c3RyaW5nfQorICAgICAqLwogICAgIGdldCBkaXNwbGF5TmFtZSgpCiAgICAgewogICAgICAg ICByZXR1cm4gdGhpcy5fZGlzcGxheU5hbWU7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBw YXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdFJ1bGV9IHJ1bGUKKyAgICAgKiBAcGFyYW0geyFXZWJJ bnNwZWN0b3IuQXVkaXRSdWxlLlNldmVyaXR5fSBzZXZlcml0eQorICAgICAqLwogICAgIGFkZFJ1 bGU6IGZ1bmN0aW9uKHJ1bGUsIHNldmVyaXR5KQogICAgIHsKICAgICAgICAgcnVsZS5zZXZlcml0 eSA9IHNldmVyaXR5OwpAQCAtMjcyLDE5ICszMDUsMTkgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0Q2F0 ZWdvcnkucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0Fy cmF5LjxXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Q+fSByZXF1ZXN0cworICAgICAqIEBwYXJh bSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVzdHMKICAgICAg KiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQpfSBydWxlUmVz dWx0Q2FsbGJhY2sKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKCl9IGNhdGVnb3J5RG9uZUNhbGxi YWNrCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCisgICAg ICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwcm9ncmVzcwogICAgICAqLwogICAg IHJ1bjogZnVuY3Rpb24ocmVxdWVzdHMsIHJ1bGVSZXN1bHRDYWxsYmFjaywgY2F0ZWdvcnlEb25l Q2FsbGJhY2ssIHByb2dyZXNzKQogICAgIHsKICAgICAgICAgdGhpcy5fZW5zdXJlSW5pdGlhbGl6 ZWQoKTsKICAgICAgICAgdmFyIHJlbWFpbmluZ1J1bGVzQ291bnQgPSB0aGlzLl9ydWxlcy5sZW5n dGg7CiAgICAgICAgIHByb2dyZXNzLnNldFRvdGFsV29yayhyZW1haW5pbmdSdWxlc0NvdW50KTsK LSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2tXcmFwcGVyKCkKKyAgICAgICAgZnVuY3Rpb24gY2Fs bGJhY2tXcmFwcGVyKHJlc3VsdCkKICAgICAgICAgewotICAgICAgICAgICAgcnVsZVJlc3VsdENh bGxiYWNrLmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7CisgICAgICAgICAgICBydWxlUmVzdWx0Q2Fs bGJhY2socmVzdWx0KTsKICAgICAgICAgICAgIHByb2dyZXNzLndvcmtlZCgpOwogICAgICAgICAg ICAgaWYgKCEtLXJlbWFpbmluZ1J1bGVzQ291bnQpCiAgICAgICAgICAgICAgICAgY2F0ZWdvcnlE b25lQ2FsbGJhY2soKTsKQEAgLTMwNSw2ICszMzgsOCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRDYXRl Z29yeS5wcm90b3R5cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0 cmluZ30gaWQKKyAqIEBwYXJhbSB7c3RyaW5nfSBkaXNwbGF5TmFtZQogICovCiBXZWJJbnNwZWN0 b3IuQXVkaXRSdWxlID0gZnVuY3Rpb24oaWQsIGRpc3BsYXlOYW1lKQogewpAQCAtMzEyLDEyICsz NDcsMTggQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZSA9IGZ1bmN0aW9uKGlkLCBkaXNwbGF5TmFt ZSkKICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lOwogfQogCisvKioKKyAqIEBl bnVtIHtzdHJpbmd9CisgKi8KIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGUuU2V2ZXJpdHkgPSB7CiAg ICAgSW5mbzogImluZm8iLAogICAgIFdhcm5pbmc6ICJ3YXJuaW5nIiwKICAgICBTZXZlcmU6ICJz ZXZlcmUiCiB9CiAKKy8qKgorICogQHR5cGUge09iamVjdC48V2ViSW5zcGVjdG9yLkF1ZGl0UnVs ZS5TZXZlcml0eSwgbnVtYmVyPn0KKyAqLwogV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZS5TZXZlcml0 eU9yZGVyID0gewogICAgICJpbmZvIjogMywKICAgICAid2FybmluZyI6IDIsCkBAIC0zMzUsMTUg KzM3NiwxOCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1lOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5BdWRpdFJ1bGUuU2V2ZXJpdHl9IHNldmVyaXR5CisgICAgICovCiAg ICAgc2V0IHNldmVyaXR5KHNldmVyaXR5KQogICAgIHsKICAgICAgICAgdGhpcy5fc2V2ZXJpdHkg PSBzZXZlcml0eTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtBcnJheS48V2Vi SW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Pn0gcmVxdWVzdHMKKyAgICAgKiBAcGFyYW0geyFBcnJh eS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdD59IHJlcXVlc3RzCiAgICAgICogQHBhcmFt IHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0KX0gY2FsbGJhY2sKLSAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qcm9ncmVzc30gcHJvZ3Jlc3MKKyAgICAgKiBAcGFyYW0g eyFXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9IHByb2dyZXNzCiAgICAgICovCiAgICAgcnVuOiBmdW5j dGlvbihyZXF1ZXN0cywgY2FsbGJhY2ssIHByb2dyZXNzKQogICAgIHsKQEAgLTM2OSw2ICs0MTMs NyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29u c3RydWN0b3IKKyAqIEBwYXJhbSB7IVdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5fSBjYXRlZ29y eQogICovCiBXZWJJbnNwZWN0b3IuQXVkaXRDYXRlZ29yeVJlc3VsdCA9IGZ1bmN0aW9uKGNhdGVn b3J5KQogewpAQCAtMzc3LDYgKzQyMiw5IEBAIFdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVz dWx0ID0gZnVuY3Rpb24oY2F0ZWdvcnkpCiB9CiAKIFdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5 UmVzdWx0LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0 b3IuQXVkaXRDYXRlZ29yeVJlc3VsdH0gcnVsZVJlc3VsdAorICAgICAqLwogICAgIGFkZFJ1bGVS ZXN1bHQ6IGZ1bmN0aW9uKHJ1bGVSZXN1bHQpCiAgICAgewogICAgICAgICB0aGlzLnJ1bGVSZXN1 bHRzLnB1c2gocnVsZVJlc3VsdCk7CkBAIC0zODUsNiArNDMzLDcgQEAgV2ViSW5zcGVjdG9yLkF1 ZGl0Q2F0ZWdvcnlSZXN1bHQucHJvdG90eXBlID0gewogCiAvKioKICAqIEBjb25zdHJ1Y3Rvcgor ICogQHBhcmFtIHsoc3RyaW5nfGJvb2xlYW58bnVtYmVyfE9iamVjdCl9IHZhbHVlCiAgKiBAcGFy YW0ge2Jvb2xlYW49fSBleHBhbmRlZAogICogQHBhcmFtIHtzdHJpbmc9fSBjbGFzc05hbWUKICAq LwpAQCAtNDAyLDYgKzQ1MSwxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0ID0gZnVu Y3Rpb24odmFsdWUsIGV4cGFuZGVkLCBjbGFzc05hbWUpCiAgICAgICAgIHRoaXMuX2Zvcm1hdHRl cnNbc3RhbmRhcmRGb3JtYXR0ZXJzW2ldXSA9IFN0cmluZy5zdGFuZGFyZEZvcm1hdHRlcnNbc3Rh bmRhcmRGb3JtYXR0ZXJzW2ldXTsKIH0KIAorLyoqCisgKiBAcGFyYW0ge3N0cmluZ30gdXJsCisg KiBAcmV0dXJuIHshRWxlbWVudH0KKyAqLwogV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZVJlc3VsdC5s aW5raWZ5RGlzcGxheU5hbWUgPSBmdW5jdGlvbih1cmwpCiB7CiAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5saW5raWZ5VVJMQXNOb2RlKHVybCwgV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJM KHVybCkpOwpAQCAtNDE0LDggKzQ2NywxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlUmVzdWx0 LnJlc291cmNlRG9tYWluID0gZnVuY3Rpb24oZG9tYWluKQogCiBXZWJJbnNwZWN0b3IuQXVkaXRS dWxlUmVzdWx0LnByb3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAcGFyYW0geyhzdHJpbmd8 Ym9vbGVhbnxudW1iZXJ8T2JqZWN0KX0gdmFsdWUKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBl eHBhbmRlZAogICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gY2xhc3NOYW1lCisgICAgICogQHJldHVy biB7IVdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHR9CiAgICAgICovCiAgICAgYWRkQ2hpbGQ6 IGZ1bmN0aW9uKHZhbHVlLCBleHBhbmRlZCwgY2xhc3NOYW1lKQogICAgIHsKQEAgLTQyNiw0MyAr NDgxLDUzIEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQucHJvdG90eXBlID0gewogICAg ICAgICByZXR1cm4gZW50cnk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3Ry aW5nfSB1cmwKKyAgICAgKi8KICAgICBhZGRVUkw6IGZ1bmN0aW9uKHVybCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLmFkZENoaWxkKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1bHQubGlu a2lmeURpc3BsYXlOYW1lKHVybCkpOworICAgICAgICB0aGlzLmFkZENoaWxkKFdlYkluc3BlY3Rv ci5BdWRpdFJ1bGVSZXN1bHQubGlua2lmeURpc3BsYXlOYW1lKHVybCkpOwogICAgIH0sCiAKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0geyFBcnJheS48c3RyaW5nPn0gdXJscworICAgICAqLwogICAg IGFkZFVSTHM6IGZ1bmN0aW9uKHVybHMpCiAgICAgewogICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHVybHMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLmFkZFVSTCh1cmxzW2ldKTsK ICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHNuaXBwZXQKKyAgICAg Ki8KICAgICBhZGRTbmlwcGV0OiBmdW5jdGlvbihzbmlwcGV0KQogICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuYWRkQ2hpbGQoc25pcHBldCwgZmFsc2UsICJzb3VyY2UtY29kZSIpOworICAgICAg ICB0aGlzLmFkZENoaWxkKHNuaXBwZXQsIGZhbHNlLCAic291cmNlLWNvZGUiKTsKICAgICB9LAog CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGZvcm1hdAogICAgICAqIEBwYXJhbSB7 Li4uKn0gdmFyYXJnCisgICAgICogQHJldHVybiB7IVdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1 bHR9CiAgICAgICovCiAgICAgYWRkRm9ybWF0dGVkOiBmdW5jdGlvbihmb3JtYXQsIHZhcmFyZykK ICAgICB7CiAgICAgICAgIHZhciBzdWJzdGl0dXRpb25zID0gQXJyYXkucHJvdG90eXBlLnNsaWNl LmNhbGwoYXJndW1lbnRzLCAxKTsKICAgICAgICAgdmFyIGZyYWdtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRG9jdW1lbnRGcmFnbWVudCgpOwogCi0gICAgICAgIHZhciBmb3JtYXR0ZWRSZXN1bHQgPSBT dHJpbmcuZm9ybWF0KGZvcm1hdCwgc3Vic3RpdHV0aW9ucywgdGhpcy5fZm9ybWF0dGVycywgZnJh Z21lbnQsIHRoaXMuX2FwcGVuZCkuZm9ybWF0dGVkUmVzdWx0OworICAgICAgICBmdW5jdGlvbiBh cHBlbmQoYSwgYikKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCEoYiBpbnN0YW5jZW9mIE5v ZGUpKQorICAgICAgICAgICAgICAgIGIgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShiKTsKKyAg ICAgICAgICAgIGEuYXBwZW5kQ2hpbGQoYik7CisgICAgICAgICAgICByZXR1cm4gYTsKKyAgICAg ICAgfQorCisgICAgICAgIHZhciBmb3JtYXR0ZWRSZXN1bHQgPSBTdHJpbmcuZm9ybWF0KGZvcm1h dCwgc3Vic3RpdHV0aW9ucywgdGhpcy5fZm9ybWF0dGVycywgZnJhZ21lbnQsIGFwcGVuZCkuZm9y bWF0dGVkUmVzdWx0OwogICAgICAgICBpZiAoZm9ybWF0dGVkUmVzdWx0IGluc3RhbmNlb2YgTm9k ZSkKICAgICAgICAgICAgIGZvcm1hdHRlZFJlc3VsdC5ub3JtYWxpemUoKTsKICAgICAgICAgcmV0 dXJuIHRoaXMuYWRkQ2hpbGQoZm9ybWF0dGVkUmVzdWx0KTsKLSAgICB9LAotCi0gICAgX2FwcGVu ZDogZnVuY3Rpb24oYSwgYikKLSAgICB7Ci0gICAgICAgIGlmICghKGIgaW5zdGFuY2VvZiBOb2Rl KSkKLSAgICAgICAgICAgIGIgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShiKTsKLSAgICAgICAg YS5hcHBlbmRDaGlsZChiKTsKLSAgICAgICAgcmV0dXJuIGE7CiAgICAgfQogfQogCkBAIC01MDUs NyArNTcwLDEwIEBAIFdlYkluc3BlY3Rvci5BdWRpdHNTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90 eXBlID0gewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3Iu U2lkZWJhclRyZWVFbGVtZW50fQotICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQXVkaXRzUGFuZWx9 IHBhbmVsCisgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuQXVkaXRzUGFuZWx9IHBhbmVsCisgKiBA cGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5UmVzdWx0Pn0gcmVzdWx0 cworICogQHBhcmFtIHtzdHJpbmd9IG1haW5SZXNvdXJjZVVSTAorICogQHBhcmFtIHtudW1iZXJ9 IG9yZGluYWwKICAqLwogV2ViSW5zcGVjdG9yLkF1ZGl0UmVzdWx0U2lkZWJhclRyZWVFbGVtZW50 ID0gZnVuY3Rpb24ocGFuZWwsIHJlc3VsdHMsIG1haW5SZXNvdXJjZVVSTCwgb3JkaW5hbCkKIHsK QEAgLTUzMiw3ICs2MDAsMTAgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UmVzdWx0U2lkZWJhclRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKIC8vIENvbnRyaWJ1dGVkIGF1ZGl0IHJ1bGVzIHNob3VsZCBn byBpbnRvIHRoaXMgbmFtZXNwYWNlLgogV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMgPSB7fTsKIAot Ly8gQ29udHJpYnV0ZWQgYXVkaXQgY2F0ZWdvcmllcyBzaG91bGQgZ28gaW50byB0aGlzIG5hbWVz cGFjZS4KKy8qKgorICogQ29udHJpYnV0ZWQgYXVkaXQgY2F0ZWdvcmllcyBzaG91bGQgZ28gaW50 byB0aGlzIG5hbWVzcGFjZS4KKyAqIEB0eXBlIHtPYmplY3QuPHN0cmluZywgZnVuY3Rpb24obmV3 OldlYkluc3BlY3Rvci5BdWRpdENhdGVnb3J5KT59CisgKi8KIFdlYkluc3BlY3Rvci5BdWRpdENh dGVnb3JpZXMgPSB7fTsKIAogaW1wb3J0U2NyaXB0KCJBdWRpdENhdGVnb3JpZXMuanMiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUeXBl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMK aW5kZXggMmY4OGE2YmJiYjU2ZGFjZGQxYzBkNzQ2YzFmOGEwNGQ0NWE2Y2Q1Yy4uYTNmMzExMGQz MGRkODU5NjQ0MDg5NjM1N2YyOWZiMDhkMTgyM2VhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKQEAgLTEwOCw3ICsxMDgsMTAg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZS5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi0v L0tlZXAgdGhlc2UgaW4gc3luYyB3aXRoIFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6cmVz b3VyY2VUeXBlSnNvbgorLyoqCisgKiBLZWVwIHRoZXNlIGluIHN5bmMgd2l0aCBXZWJDb3JlOjpJ bnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlVHlwZUpzb24KKyAqIEBlbnVtIHshV2ViSW5zcGVj dG9yLlJlc291cmNlVHlwZX0KKyAqLwogV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMgPSB7CiAg ICAgRG9jdW1lbnQ6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlKCJkb2N1bWVudCIsICJE b2N1bWVudCIsICJEb2N1bWVudHMiLCAicmdiKDQ3LDEwMiwyMzYpIiwgdHJ1ZSksCiAgICAgU3R5 bGVzaGVldDogbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGUoInN0eWxlc2hlZXQiLCAiU3R5 bGVzaGVldCIsICJTdHlsZXNoZWV0cyIsICJyZ2IoMTU3LDIzMSwxMTkpIiwgdHJ1ZSksCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMK aW5kZXggMGQzNTg0MzFlYTE3MzUyMTI2YzJjODUwZDEzZjcxMGY3Y2U5YzY0Mi4uMDFiNDdmNWQx N2ExYzdiN2EyMTMyMjZmNzJkZTdhN2M5MDU2ZmI1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qcwpAQCAtMTY1LDcgKzE2NSw3 IEBAIFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudCA9IGZ1bmN0aW9uKHN0cmlu ZykKICAqIEBwYXJhbSB7c3RyaW5nPX0gY2xhc3NlcwogICogQHBhcmFtIHtib29sZWFuPX0gaXNF eHRlcm5hbAogICogQHBhcmFtIHtzdHJpbmc9fSB0b29sdGlwVGV4dAotICogQHJldHVybiB7RWxl bWVudH0KKyAqIEByZXR1cm4geyFFbGVtZW50fQogICovCiBXZWJJbnNwZWN0b3IubGlua2lmeVVS TEFzTm9kZSA9IGZ1bmN0aW9uKHVybCwgbGlua1RleHQsIGNsYXNzZXMsIGlzRXh0ZXJuYWwsIHRv b2x0aXBUZXh0KQogewo=