144646 2015-05-05 16:22:38 -0700 Web Inspector: DOMStorage exception and issue with sessionStorage 2015-05-06 05:56:45 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck andersca commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1091937 0 joepeck 2015-05-05 16:22:38 -0700 * SUMMARY DOMStorage exception and issue with sessionStorage. * ISSUES 1. "Session Storage" is showing localStorage 2. Sorting appears to be broken 3. Uncaught exception reloading theverge.com CONSOLE ERROR Uncaught exception in inspector page while handling event DOMStorage.domStorageItemUpdated: TypeError: undefined is not an object (evaluating 'this._dataGrid.children') itemUpdated @ Views/DOMStorageContentView.js:130:45 * dispatch @ Base/Object.js:124:55 * dispatchEventToListeners @ Base/Object.js:131:17 * itemUpdated @ Models/DOMStorageObject.js:121:38 * itemUpdated @ Controllers/StorageManager.js:124:61 * domStorageItemUpdated @ Protocol/DOMStorageObserver.js:60:48 * dispatchEvent @ Protocol/InspectorBackend.js:353:42 * _dispatchEvent @ Protocol/InspectorBackend.js:233:32 * dispatch @ Protocol/InspectorBackend.js:88:32 * dispatchNextQueuedMessageFromBackend @ Protocol/MessageDispatcher.js:42:34 1091939 1 webkit-bug-importer 2015-05-05 16:23:06 -0700 <rdar://problem/20827909> 1091944 2 252421 joepeck 2015-05-05 16:28:16 -0700 Created attachment 252421 [PATCH] Proposed Fix 1092138 3 252421 commit-queue 2015-05-06 05:56:41 -0700 Comment on attachment 252421 [PATCH] Proposed Fix Clearing flags on attachment: 252421 Committed r183867: <http://trac.webkit.org/changeset/183867> 1092139 4 commit-queue 2015-05-06 05:56:45 -0700 All reviewed patches have been landed. Closing bug. 252421 2015-05-05 16:28:16 -0700 2015-05-06 05:56:41 -0700 [PATCH] Proposed Fix fixes.patch text/plain 11245 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGIxYzk1Li43ODk1N2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTUtMDUtMDUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBET01TdG9yYWdlIGV4Y2VwdGlvbiBhbmQgaXNzdWUgd2l0 aCBzZXNzaW9uU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ0NjQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6ZmluZFN0b3JhZ2VBcmVhKToK KyAgICAgICAgUmV0dXJuIHNlc3Npb24gc3RvcmFnZSBpZiB0aGUgaWRlbnRpZmllciBzYXlzIG5v dCBsb2NhbCBzdG9yYWdlLgorCisyMDE1LTA1LTA1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ3Jhc2ggdW5kZXIgV2ViQ29y ZTo6ZG9tV2luZG93RnJvbUV4ZWNTdGF0ZSByZWxvYWRpbmcgcGFnZSB3aXRoIGluc3BlY3RvciBv cGVuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ2 MzYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0 b3JhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50LmNwcAppbmRleCA4ZTUyM2ZmLi40OGRkM2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcApAQCAtNDIs NiArNDIsNyBAQAogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3Jp Z2luLmgiCiAjaW5jbHVkZSAiU3RvcmFnZS5oIgorI2luY2x1ZGUgIlN0b3JhZ2VOYW1lc3BhY2Uu aCIKICNpbmNsdWRlICJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIKICNpbmNsdWRlICJWb2lk Q2FsbGJhY2suaCIKICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmREaXNwYXRj aGVycy5oPgpAQCAtMTk4LDYgKzE5OSw4IEBAIFJlZlB0cjxTdG9yYWdlQXJlYT4gSW5zcGVjdG9y RE9NU3RvcmFnZUFnZW50OjpmaW5kU3RvcmFnZUFyZWEoRXJyb3JTdHJpbmcmIGVycm9yCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAorICAgIGlmICghaXNMb2NhbFN0b3JhZ2UpCisg ICAgICAgIHJldHVybiBtX3BhZ2VBZ2VudC0+cGFnZSgpLT5zZXNzaW9uU3RvcmFnZSgpLT5zdG9y YWdlQXJlYSh0YXJnZXRGcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSk7CiAgICAg cmV0dXJuIG1fcGFnZUFnZW50LT5wYWdlKCktPnN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcigpLmxv Y2FsU3RvcmFnZUFyZWEoKnRhcmdldEZyYW1lLT5kb2N1bWVudCgpKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKaW5kZXggZDM0ZjkwOC4uNmEwMTQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTUtMDUtMDUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBET01TdG9yYWdlIGV4Y2Vw dGlvbiBhbmQgaXNzdWUgd2l0aCBzZXNzaW9uU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NjQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3Jh Z2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVu dFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90 b3R5cGUuX3BvcHVsYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVu dFZpZXcucHJvdG90eXBlLnJlc2V0KTogRGVsZXRlZC4KKyAgICAgICAgQWx3YXlzIGhhdmUgdGhl IGRhdGFncmlkIGJlIGF2YWlsYWJsZSB3aXRoIGEgZGVmYXVsdCBzb3J0LgorCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc29ydERhdGFHcmlk LmNvbXBhcmF0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmll dy5wcm90b3R5cGUuX3NvcnREYXRhR3JpZCk6CisgICAgICAgIFNpbXBsaWZ5IGFuZCBjb3JyZWN0 IHRoZSBvcmRlci4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmll dy5wcm90b3R5cGUuY2xlYW51cCk6CisgICAgICAgIENsZWFudXAgc29tZSB1c2VzIG9mIGRlbGV0 ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNvcnROb2Rlc0ltbWVkaWF0ZWx5KToK KyAgICAgICAgUHJvdmlkZSBhIHdheSB0byBzb3J0IGltbWVkaWF0ZWx5IHdpdGhvdXQgYSB2aXNp YmxlIGRlbGF5LgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9z b3J0Tm9kZXNDYWxsYmFjayk6CisgICAgICAgIENsZWFudXAgc29tZSBkZWFkIGNvZGUgdG8gc2lt cGxpZnkgc29ydGluZy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90 b3R5cGUuX2F0dGFjaCk6CisgICAgICAgIFdoZW4gc29ydGluZywgdGhlIGNoaWxkcmVuIGxpc3Qg ZG9lcyBub3QgbWF0Y2ggdGhlIGNoaWxkIG5vZGUgbGlzdCwKKyAgICAgICAgc28gZW5zdXJlIHRo YXQgcGxhY2Vob2xkZXIgbm9kZXMgYXJlIGFkZGVkIHRvIHRoZSBlbmQuCisKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5QbGFjZWhvbGRlckRhdGFHcmlkTm9kZS5wcm90b3R5cGUubWFrZU5vcm1hbCk6 CisgICAgICAgIENsZWFudXAgc29tZSB1c2VzIG9mIGRlbGV0ZS4KKwogMjAxNS0wNS0wNSAgVGlt b3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogRml4IHNvbWUgaXNzdWVzIHdpdGggU2VhcmNoIHRhYnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VD b250ZW50Vmlldy5qcwppbmRleCA3Nzc1ZmM2Li4wOWY5MWJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3Rv cmFnZUNvbnRlbnRWaWV3LmpzCkBAIC0zNSw3ICszNSwxOCBAQCBXZWJJbnNwZWN0b3IuRE9NU3Rv cmFnZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiAgICAgcmVwcmVz ZW50ZWRPYmplY3QuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9iamVj dC5FdmVudC5JdGVtUmVtb3ZlZCwgdGhpcy5pdGVtUmVtb3ZlZCwgdGhpcyk7CiAgICAgcmVwcmVz ZW50ZWRPYmplY3QuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9iamVj dC5FdmVudC5JdGVtVXBkYXRlZCwgdGhpcy5pdGVtVXBkYXRlZCwgdGhpcyk7CiAKLSAgICB0aGlz LnJlc2V0KCk7CisgICAgdmFyIGNvbHVtbnMgPSB7fTsKKyAgICBjb2x1bW5zLmtleSA9IHt0aXRs ZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJLZXkiKSwgc29ydGFibGU6IHRydWV9OworICAgIGNv bHVtbnMudmFsdWUgPSB7dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVmFsdWUiKSwgc29y dGFibGU6IHRydWV9OworCisgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRh dGFHcmlkKGNvbHVtbnMsIHRoaXMuX2VkaXRpbmdDYWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLl9k ZWxldGVDYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIg PSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAgICB0aGlzLl9k YXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJrZXkiOworICAgIHRoaXMuX2RhdGFHcmlk LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2Vk LCB0aGlzLl9zb3J0RGF0YUdyaWQsIHRoaXMpOworCisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQpOworCisgICAgdGhpcy5fcG9wdWxhdGUoKTsKIH07 CiAKIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcuU3R5bGVDbGFzc05hbWUgPSAi ZG9tLXN0b3JhZ2UiOwpAQCAtNTAsNDAgKzYxLDYgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQdWJsaWMKIAotICAgIHJlc2V0OiBm dW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmdldEVudHJp ZXMoZnVuY3Rpb24oZXJyb3IsIGVudHJpZXMpIHsKLSAgICAgICAgICAgIGlmIChlcnJvcikKLSAg ICAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgICAgIGlmICghdGhpcy5fZGF0YUdyaWQp IHsKLSAgICAgICAgICAgICAgICB2YXIgY29sdW1ucyA9IHt9OwotICAgICAgICAgICAgICAgIGNv bHVtbnMua2V5ID0ge3RpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIktleSIpLCBzb3J0YWJs ZTogdHJ1ZX07Ci0gICAgICAgICAgICAgICAgY29sdW1ucy52YWx1ZSA9IHt0aXRsZTogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJWYWx1ZSIpLCBzb3J0YWJsZTogdHJ1ZX07Ci0KLSAgICAgICAgICAg ICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywg dGhpcy5fZWRpdGluZ0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJp bmQodGhpcykpOwotICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlzLl9zb3J0RGF0 YUdyaWQsIHRoaXMpOwotCi0gICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBj b25zb2xlLmFzc2VydCh0aGlzLl9kYXRhR3JpZCk7Ci0KLSAgICAgICAgICAgIHZhciBub2RlcyA9 IFtdOwotICAgICAgICAgICAgZm9yICh2YXIgZW50cnkgb2YgZW50cmllcykgewotICAgICAgICAg ICAgICAgIGlmICghZW50cnlbMF0gfHwgIWVudHJ5WzFdKQotICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgICAgICAgICB2YXIgZGF0YSA9IHtrZXk6IGVudHJ5WzBdLCB2YWx1 ZTogZW50cnlbMV19OwotICAgICAgICAgICAgICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rv ci5EYXRhR3JpZE5vZGUoZGF0YSwgZmFsc2UpOwotICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmFwcGVuZENoaWxkKG5vZGUpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICB0aGlz Ll9zb3J0RGF0YUdyaWQoKTsKLSAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZFBsYWNlaG9s ZGVyTm9kZSgpOwotICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQudXBkYXRlTGF5b3V0KCk7Ci0g ICAgICAgIH0uYmluZCh0aGlzKSk7Ci0gICAgfSwKLQogICAgIHNhdmVUb0Nvb2tpZTogZnVuY3Rp b24oY29va2llKQogICAgIHsKICAgICAgICAgY29va2llLnR5cGUgPSBXZWJJbnNwZWN0b3IuQ29u dGVudFZpZXdDb29raWVUeXBlLkRPTVN0b3JhZ2U7CkBAIC0xNTgsMTkgKzEzNSwzNyBAQCBXZWJJ bnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIC8vIFBy aXZhdGUKIAorICAgIF9wb3B1bGF0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5y ZXByZXNlbnRlZE9iamVjdC5nZXRFbnRyaWVzKGZ1bmN0aW9uKGVycm9yLCBlbnRyaWVzKSB7Cisg ICAgICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg ICAgICB2YXIgbm9kZXMgPSBbXTsKKyAgICAgICAgICAgIGZvciAodmFyIGVudHJ5IG9mIGVudHJp ZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWVudHJ5WzBdIHx8ICFlbnRyeVsxXSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgdmFyIGRhdGEgPSB7a2V5 OiBlbnRyeVswXSwgdmFsdWU6IGVudHJ5WzFdfTsKKyAgICAgICAgICAgICAgICB2YXIgbm9kZSA9 IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKGRhdGEsIGZhbHNlKTsKKyAgICAgICAgICAg ICAgICB0aGlzLl9kYXRhR3JpZC5hcHBlbmRDaGlsZChub2RlKTsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgdGhpcy5fc29ydERhdGFHcmlkKCk7CisgICAgICAgICAgICB0aGlzLl9kYXRh R3JpZC5hZGRQbGFjZWhvbGRlck5vZGUoKTsKKyAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVw ZGF0ZUxheW91dCgpOworICAgICAgICB9LmJpbmQodGhpcykpOworICAgIH0sCisKICAgICBfc29y dERhdGFHcmlkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2RhdGFHcmlk LnNvcnRPcmRlcikKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB2YXIgc29ydENvbHVt bklkZW50aWZpZXIgPSB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciB8fCAia2V5 IjsKIAogICAgICAgICBmdW5jdGlvbiBjb21wYXJhdG9yKGEsIGIpCiAgICAgICAgIHsKLSAgICAg ICAgICAgIHJldHVybiBiLmRhdGFbc29ydENvbHVtbklkZW50aWZpZXJdLmxvY2FsZUNvbXBhcmUo YS5kYXRhW3NvcnRDb2x1bW5JZGVudGlmaWVyXSk7CisgICAgICAgICAgICByZXR1cm4gYS5kYXRh W3NvcnRDb2x1bW5JZGVudGlmaWVyXS5sb2NhbGVDb21wYXJlKGIuZGF0YVtzb3J0Q29sdW1uSWRl bnRpZmllcl0pOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE5vZGVz KGNvbXBhcmF0b3IsIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlcik7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnROb2Rlc0ltbWVkaWF0ZWx5KGNvbXBhcmF0b3IpOwogICAgIH0sCiAKICAgICBf ZGVsZXRlQ2FsbGJhY2s6IGZ1bmN0aW9uKG5vZGUpCkBAIC0yMTAsOSArMjA1LDkgQEAgV2ViSW5z cGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBl ZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkRPTVN0b3Jh Z2VDb250ZW50Vmlldy5NaXNzaW5nS2V5U3R5bGVDbGFzc05hbWUpOwogICAgICAgICAgICAgZWRp dGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5ET01TdG9yYWdl Q29udGVudFZpZXcuTWlzc2luZ1ZhbHVlU3R5bGVDbGFzc05hbWUpOwogICAgICAgICAgICAgZWRp dGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5ET01TdG9yYWdl Q29udGVudFZpZXcuRHVwbGljYXRlS2V5U3R5bGVDbGFzc05hbWUpOwotICAgICAgICAgICAgZGVs ZXRlIGVkaXRpbmdOb2RlLl9faGFzVW5jb21taXR0ZWRFZGl0czsKLSAgICAgICAgICAgIGRlbGV0 ZSBlZGl0aW5nTm9kZS5fX29yaWdpbmFsS2V5OwotICAgICAgICAgICAgZGVsZXRlIGVkaXRpbmdO b2RlLl9fb3JpZ2luYWxWYWx1ZTsKKyAgICAgICAgICAgIGVkaXRpbmdOb2RlLl9faGFzVW5jb21t aXR0ZWRFZGl0cyA9IHVuZGVmaW5lZDsKKyAgICAgICAgICAgIGVkaXRpbmdOb2RlLl9fb3JpZ2lu YWxLZXkgPSB1bmRlZmluZWQ7CisgICAgICAgICAgICBlZGl0aW5nTm9kZS5fX29yaWdpbmFsVmFs dWUgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiByZXN0b3JlT3Jp Z2luYWxWYWx1ZXMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwppbmRleCA1Mjc1OWFiLi41ZThjMTQ1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5q cwpAQCAtODMyLDIyICs4MzIsMjggQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5fc29ydE5vZGVzUmVxdWVzdElkID0gd2luZG93LnJlcXVlc3RBbmlt YXRpb25GcmFtZSh0aGlzLl9zb3J0Tm9kZXNDYWxsYmFjay5iaW5kKHRoaXMsIGNvbXBhcmF0b3Ip KTsKICAgICB9LAogCisgICAgc29ydE5vZGVzSW1tZWRpYXRlbHk6IGZ1bmN0aW9uKGNvbXBhcmF0 b3IpCisgICAgeworICAgICAgICB0aGlzLl9zb3J0Tm9kZXNDYWxsYmFjayhjb21wYXJhdG9yKTsK KyAgICB9LAorCiAgICAgX3NvcnROb2Rlc0NhbGxiYWNrOiBmdW5jdGlvbihjb21wYXJhdG9yKQog ICAgIHsKICAgICAgICAgZnVuY3Rpb24gY29tcGFyYXRvcldyYXBwZXIoYVJvdywgYlJvdykKICAg ICAgICAgewotICAgICAgICAgICAgdmFyIHJldmVyc2VGYWN0b3IgPSB0aGlzLnNvcnRPcmRlciAh PT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcgPyAtMSA6IDE7CiAg ICAgICAgICAgICB2YXIgYU5vZGUgPSBhUm93Ll9kYXRhR3JpZE5vZGU7CiAgICAgICAgICAgICB2 YXIgYk5vZGUgPSBiUm93Ll9kYXRhR3JpZE5vZGU7Ci0gICAgICAgICAgICBpZiAoYU5vZGUuX2Rh dGEuc3VtbWFyeVJvdyB8fCBhTm9kZS5pc1BsYWNlaG9sZGVyTm9kZSkKKworICAgICAgICAgICAg aWYgKGFOb2RlLmlzUGxhY2Vob2xkZXJOb2RlKQogICAgICAgICAgICAgICAgIHJldHVybiAxOwot ICAgICAgICAgICAgaWYgKGJOb2RlLl9kYXRhLnN1bW1hcnlSb3cgfHwgYk5vZGUuaXNQbGFjZWhv bGRlck5vZGUpCisgICAgICAgICAgICBpZiAoYk5vZGUuaXNQbGFjZWhvbGRlck5vZGUpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIC0xOwogCisgICAgICAgICAgICB2YXIgcmV2ZXJzZUZhY3RvciA9 IHRoaXMuc29ydE9yZGVyICE9PSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2Vu ZGluZyA/IC0xIDogMTsKICAgICAgICAgICAgIHJldHVybiByZXZlcnNlRmFjdG9yICogY29tcGFy YXRvcihhTm9kZSwgYk5vZGUpOwogICAgICAgICB9CiAKLSAgICAgICAgZGVsZXRlIHRoaXMuX3Nv cnROb2Rlc1JlcXVlc3RJZDsKKyAgICAgICAgdGhpcy5fc29ydE5vZGVzUmVxdWVzdElkID0gdW5k ZWZpbmVkOwogCiAgICAgICAgIGlmICh0aGlzLl9lZGl0aW5nKSB7CiAgICAgICAgICAgICB0aGlz Ll9zb3J0QWZ0ZXJFZGl0aW5nQ2FsbGJhY2sgPSB0aGlzLnNvcnROb2Rlcy5iaW5kKHRoaXMsIGNv bXBhcmF0b3IpOwpAQCAtMTgyMywxMSArMTgyOSwxMyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWRO b2RlLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgbmV4dEVsZW1lbnQgPSBudWxsOwogCi0g ICAgICAgIHZhciBwcmV2aW91c0dyaWROb2RlID0gdGhpcy50cmF2ZXJzZVByZXZpb3VzTm9kZSh0 cnVlLCB0cnVlKTsKLSAgICAgICAgaWYgKHByZXZpb3VzR3JpZE5vZGUgJiYgcHJldmlvdXNHcmlk Tm9kZS5lbGVtZW50LnBhcmVudE5vZGUpCi0gICAgICAgICAgICBuZXh0RWxlbWVudCA9IHByZXZp b3VzR3JpZE5vZGUuZWxlbWVudC5uZXh0U2libGluZzsKLSAgICAgICAgZWxzZSBpZiAoIXByZXZp b3VzR3JpZE5vZGUpCi0gICAgICAgICAgICBuZXh0RWxlbWVudCA9IHRoaXMuZGF0YUdyaWQuZGF0 YVRhYmxlQm9keUVsZW1lbnQuZmlyc3RDaGlsZDsKKyAgICAgICAgaWYgKCF0aGlzLmlzUGxhY2Vo b2xkZXJOb2RlKSB7CisgICAgICAgICAgICB2YXIgcHJldmlvdXNHcmlkTm9kZSA9IHRoaXMudHJh dmVyc2VQcmV2aW91c05vZGUodHJ1ZSwgdHJ1ZSk7CisgICAgICAgICAgICBpZiAocHJldmlvdXNH cmlkTm9kZSAmJiBwcmV2aW91c0dyaWROb2RlLmVsZW1lbnQucGFyZW50Tm9kZSkKKyAgICAgICAg ICAgICAgICBuZXh0RWxlbWVudCA9IHByZXZpb3VzR3JpZE5vZGUuZWxlbWVudC5uZXh0U2libGlu ZzsKKyAgICAgICAgICAgIGVsc2UgaWYgKCFwcmV2aW91c0dyaWROb2RlKQorICAgICAgICAgICAg ICAgIG5leHRFbGVtZW50ID0gdGhpcy5kYXRhR3JpZC5kYXRhVGFibGVCb2R5RWxlbWVudC5maXJz dENoaWxkOworICAgICAgICB9CiAKICAgICAgICAgLy8gSWYgdGhlcmUgaXMgbm8gbmV4dCBncmlk IG5vZGUsIHRoZW4gYXBwZW5kIGJlZm9yZSB0aGUgbGFzdCBjaGlsZCBzaW5jZSB0aGUgbGFzdCBj aGlsZCBpcyB0aGUgZmlsbGVyIHJvdy4KICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5kYXRh R3JpZC5kYXRhVGFibGVCb2R5RWxlbWVudC5sYXN0Q2hpbGQuY2xhc3NMaXN0LmNvbnRhaW5zKCJm aWxsZXIiKSk7CkBAIC0xODk2LDcgKzE5MDQsNiBAQCBXZWJJbnNwZWN0b3IuUGxhY2Vob2xkZXJE YXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogCiAgICAgbWFrZU5vcm1hbDogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgZGVsZXRlIHRoaXMuaXNQbGFjZWhvbGRlck5vZGU7Ci0gICAgICAgIGRl bGV0ZSB0aGlzLm1ha2VOb3JtYWw7CisgICAgICAgIHRoaXMuaXNQbGFjZWhvbGRlck5vZGUgPSBm YWxzZTsKICAgICB9CiB9Cg==