178318 2017-10-14 17:40:00 -0700 Web Inspector: Storage: values truncated in Local/Session table 2019-05-17 14:41:09 -0700 1 1 1 Unclassified WebKit Web Inspector Safari 11 All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=198003 InRadar P2 Normal --- 1 webkit.org hi bburg commit-queue hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1360521 0 webkit.org 2017-10-14 17:40:00 -0700 When a Value in the Local Storage / Session Storage is long and truncated, Both "Copy Value" and "Copy Table" copy the truncated string with trailing ellipses, not the actual value. Steps to Reproduce: 1. Serialize a large object via JSON.stringify and store it via window.localStorage 2. View Local Storage in Web Inspector 3. Attempt to copy the value via "Copy Table" or "Copy Row" Expected Result: Actual value is copied Actual Result: Truncated value is copied with trailing ellipses 1360571 1 bburg 2017-10-15 11:13:07 -0700 Does this reproduce in Safari Technology Preview? 1360572 2 webkit-bug-importer 2017-10-15 11:13:25 -0700 <rdar://problem/34998581> 1360593 3 joepeck 2017-10-15 14:58:14 -0700 (In reply to Brian Burg from comment #1) > Does this reproduce in Safari Technology Preview? Yes. 1360598 4 joepeck 2017-10-15 15:06:43 -0700 DOMStorageContentView.prototype._populate creates DataGridNodes with truncated values (length 200). Copy Row then copies the DataGridNode's data values, which is this truncated string. Likewise double click to edit gets the truncated value. 1523119 5 366437 hi 2019-04-01 16:13:25 -0700 Created attachment 366437 Patch 1523125 6 366437 joepeck 2019-04-01 16:31:21 -0700 Comment on attachment 366437 Patch I believe this was done for some performance reason (when very large values are stored in the table. Does this regress something? 1527210 7 timothy 2019-04-15 10:21:30 -0700 (In reply to Joseph Pecoraro from comment #6) > Comment on attachment 366437 [details] > Patch > > I believe this was done for some performance reason (when very large values > are stored in the table. Does this regress something? Joe is right, that is why. 1527258 8 366437 joepeck 2019-04-15 11:03:39 -0700 Comment on attachment 366437 Patch Clearing review until: (1) we find a solution that solves both the performance and selection issue (2) we make a decision that selection is more important than performance 1527489 9 webkit.org 2019-04-15 15:59:06 -0700 This still affects my workflow all the time. Could the full value be re-fetched in response to a Copy command? 1527507 10 joepeck 2019-04-15 16:29:40 -0700 (In reply to Ricci Adams from comment #9) > This still affects my workflow all the time. Could the full value be > re-fetched in response to a Copy command? That is a good idea! We should be able to override Copy in this table to get the full value and not the truncated string being displayed. 1527636 11 367504 hi 2019-04-15 23:57:47 -0700 Created attachment 367504 Patch 1527807 12 367504 joepeck 2019-04-16 11:59:25 -0700 Comment on attachment 367504 Patch r=me 1527812 13 367504 commit-queue 2019-04-16 12:02:29 -0700 Comment on attachment 367504 Patch Clearing flags on attachment: 367504 Committed r244350: <https://trac.webkit.org/changeset/244350> 1527813 14 commit-queue 2019-04-16 12:02:30 -0700 All reviewed patches have been landed. Closing bug. 366437 2019-04-01 16:13:25 -0700 2019-04-15 23:57:46 -0700 Patch bug-178318-20190401161324.patch text/plain 2609 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZTZhNTNmMjYxMWQwZDY5MjFlY2E0ZDU3MTM5 MWUzMTMyM2M5M2MuLmViYTIyOGNmM2YyMmFiMjAxOGQwMjdiN2ZlYmFhNzRlNDU5ZDhiMjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA0LTAxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dG9yYWdlOiB2YWx1ZXMgdHJ1bmNhdGVkIGluIExvY2FsL1Nlc3Npb24gdGFibGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODMxOAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzQ5OTg1ODE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdJLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuaXRl bUFkZGVkKToKKyAgICAgICAgKFdJLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuaXRl bVVwZGF0ZWQpOgorICAgICAgICAoV0kuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5f cG9wdWxhdGUpOgorICAgICAgICAoV0kuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5f dHJ1bmNhdGVWYWx1ZSk6IERlbGV0ZWQuCisKIDIwMTktMDQtMDEgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENhbnZhczogYXV0by1y ZWNvcmQgYWZ0ZXIgcGFnZSBsb2FkIHNvbWV0aW1lcyBzaG93cyB0aGUgd3JvbmcgVUkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3Jh Z2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwppbmRleCA3ZDk1MWJhNjMxYWQ3NWVmMmZlYWJj ODU2NGU2N2Q3NTZhOGJkYWJjLi43OWNlMGExZTgxMzI5YTRhZDE2YTY5ZjMyZjJmZTYxMDk4NTFi YjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCkBAIC04NSw3ICs4NSw2 IEBAIFdJLkRPTVN0b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgaXRlbUFkZGVkKGV2ZW50KQogICAgIHsKICAg ICAgICAgbGV0IHtrZXksIHZhbHVlfSA9IGV2ZW50LmRhdGE7Ci0gICAgICAgIHZhbHVlID0gdGhp cy5fdHJ1bmNhdGVWYWx1ZSh2YWx1ZSk7CiAKICAgICAgICAgLy8gRW5mb3JjZSBrZXkgdW5pcXVl bmVzcy4KICAgICAgICAgZm9yIChsZXQgbm9kZSBvZiB0aGlzLl9kYXRhR3JpZC5jaGlsZHJlbikg ewpAQCAtMTAwLDcgKzk5LDYgQEAgV0kuRE9NU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9N U3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICBpdGVtVXBkYXRl ZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCB7a2V5LCB2YWx1ZX0gPSBldmVudC5kYXRhOwot ICAgICAgICB2YWx1ZSA9IHRoaXMuX3RydW5jYXRlVmFsdWUodmFsdWUpOwogCiAgICAgICAgIGxl dCBrZXlGb3VuZCA9IGZhbHNlOwogICAgICAgICBmb3IgKGxldCBjaGlsZE5vZGUgb2YgdGhpcy5f ZGF0YUdyaWQuY2hpbGRyZW4pIHsKQEAgLTEyMSwxMSArMTE5LDYgQEAgV0kuRE9NU3RvcmFnZUNv bnRlbnRWaWV3ID0gY2xhc3MgRE9NU3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVu dFZpZXcKIAogICAgIC8vIFByaXZhdGUKIAotICAgIF90cnVuY2F0ZVZhbHVlKHZhbHVlKQotICAg IHsKLSAgICAgICAgcmV0dXJuIHZhbHVlLnRydW5jYXRlKDIwMCk7Ci0gICAgfQotCiAgICAgX3Bv cHVsYXRlKCkKICAgICB7CiAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QuZ2V0RW50cmll cyhmdW5jdGlvbihlcnJvciwgZW50cmllcykgewpAQCAtMTM2LDcgKzEyOSw2IEBAIFdJLkRPTVN0 b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRWaWV3CiAgICAgICAgICAgICAgICAgaWYgKCFrZXkgfHwgIXZhbHVlKQogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgICAgIHZhbHVlID0gdGhpcy5f dHJ1bmNhdGVWYWx1ZSh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgbGV0IG5vZGUgPSBuZXcgV0ku RGF0YUdyaWROb2RlKHtrZXksIHZhbHVlfSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIHRoaXMu X2RhdGFHcmlkLmFwcGVuZENoaWxkKG5vZGUpOwogICAgICAgICAgICAgfQo= 367504 2019-04-15 23:57:47 -0700 2019-04-16 12:02:29 -0700 Patch bug-178318-20190415235747.patch text/plain 7492 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc5MzQ3NmE4MDIxY2EwNjYyYWJhYzBjMTMzZTZi MThmNmYxZDkwMjguLjFkNjgzZDU5ZTFmNDJkZTA5YWNmY2VjYTY3YmE4M2EyOGM1Y2YxZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA0LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dG9yYWdlOiB2YWx1ZXMgdHJ1bmNhdGVkIGluIExvY2FsL1Nlc3Npb24gdGFibGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODMxOAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzQ5OTg1ODE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzOgorICAg ICAgICAoV0kuRGF0YUdyaWQpOgorICAgICAgICAoV0kuRGF0YUdyaWQucHJvdG90eXBlLl9jb3B5 VGV4dEZvckRhdGFHcmlkTm9kZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZURhdGFHcmlkLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVEYXRhR3JpZCk6CisgICAgICAg IFJlZmFjdG9yIGBXSS5EYXRhR3JpZGAgY29uc3RydWN0b3IgdG8gYWxsb3cgZm9yIG1vcmUgb3B0 aW9uYWwgYXJndW1lbnRzLgorICAgICAgICBJbnRyb2R1Y2UgYSBuZXcgb3B0aW9uYWwgYXJndW1l bnQgYGNvcHlDYWxsYmFja2AgdGhhdCBjYW4gYmUgdXNlZCB0byBvdmVycmlkZSB0aGUgdGV4dCB0 aGF0CisgICAgICAgIHdvdWxkIGJlIGNvcGllZCBmb3IgYW55IGBXSS5EYXRhR3JpZE5vZGVgIGlu IGFueSBjb2x1bW4uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkRPTVN0b3JhZ2VDb250ZW50Vmlldyk6CisgICAg ICAgIChXSS5ET01TdG9yYWdlQ29udGVudFZpZXcucHJvdG90eXBlLml0ZW1BZGRlZCk6CisgICAg ICAgIChXSS5ET01TdG9yYWdlQ29udGVudFZpZXcucHJvdG90eXBlLml0ZW1VcGRhdGVkKToKKyAg ICAgICAgKFdJLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuX3BvcHVsYXRlKToKKyAg ICAgICAgKFdJLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuX2RhdGFHcmlkQ29weSk6 IEFkZGVkLgorICAgICAgICBTYXZlIHRoZSBmdWxsIG5vbi10cnVuY2F0ZWQgdmFsdWUgYXMgcGFy dCBvZiB0aGUgYFdJLkRhdGFHcmlkTm9kZWAncyBgZGF0YWAuIFdoZW4gY29weWluZywKKyAgICAg ICAgdXNlIHRoZSBmdWxsIG5vbi10cnVuY2F0ZWQgdmFsdWUgaW5zdGVhZCBvZiB3aGF0IHdhcyBz aG93biBpbiB0aGUgRE9NLgorCiAyMDE5LTA0LTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNDQyNjgpOiBD YW52YXM6IG5hdmlnYXRpb24gc2lkZWJhciBubyBsb25nZXIgYXBwZWFycwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N U3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDdkOTUxYmE2MzFhZDc1ZWYyZmVhYmM4NTY0ZTY3 ZDc1NmE4YmRhYmMuLjJjZDdlMDQyZDQ0Mzk5MTNiMTI3NTkwNDg0YTI2NjdmODUwYzk3ZTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0 b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKQEAgLTQxLDcgKzQxLDExIEBAIFdJ LkRPTVN0b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIGNvbHVtbnMua2V5ID0ge3RpdGxlOiBXSS5VSVN0 cmluZygiS2V5IiksIHNvcnRhYmxlOiB0cnVlfTsKICAgICAgICAgY29sdW1ucy52YWx1ZSA9IHt0 aXRsZTogV0kuVUlTdHJpbmcoIlZhbHVlIiksIHNvcnRhYmxlOiB0cnVlfTsKIAotICAgICAgICB0 aGlzLl9kYXRhR3JpZCA9IG5ldyBXSS5EYXRhR3JpZChjb2x1bW5zLCB0aGlzLl9lZGl0aW5nQ2Fs bGJhY2suYmluZCh0aGlzKSwgdGhpcy5fZGVsZXRlQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAg ICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdJLkRhdGFHcmlkKGNvbHVtbnMsIHsKKyAgICAgICAg ICAgIGVkaXRpbmdDYWxsYmFjazogdGhpcy5fZWRpdGluZ0NhbGxiYWNrLmJpbmQodGhpcyksCisg ICAgICAgICAgICBjb3B5Q2FsbGJhY2s6IHRoaXMuX2RhdGFHcmlkQ29weS5iaW5kKHRoaXMpLAor ICAgICAgICAgICAgZGVsZXRlQ2FsbGJhY2s6IHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhp cyksCisgICAgICAgIH0pOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXSS5E YXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0 Q29sdW1uSWRlbnRpZmllciA9ICJrZXkiOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVT ZXR0aW5ncygiZG9tLXN0b3JhZ2UtY29udGVudC12aWV3Iik7CkBAIC04NSw2ICs4OSw3IEBAIFdJ LkRPTVN0b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgaXRlbUFkZGVkKGV2ZW50KQogICAgIHsKICAgICAgICAg bGV0IHtrZXksIHZhbHVlfSA9IGV2ZW50LmRhdGE7CisgICAgICAgIGxldCBvcmlnaW5hbFZhbHVl ID0gdmFsdWU7CiAgICAgICAgIHZhbHVlID0gdGhpcy5fdHJ1bmNhdGVWYWx1ZSh2YWx1ZSk7CiAK ICAgICAgICAgLy8gRW5mb3JjZSBrZXkgdW5pcXVlbmVzcy4KQEAgLTkzLDEzICs5OCwxNCBAQCBX SS5ET01TdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBET01TdG9yYWdlQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmFwcGVuZENoaWxkKG5ldyBXSS5EYXRhR3JpZE5vZGUo e2tleSwgdmFsdWV9LCBmYWxzZSkpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5hcHBlbmRDaGls ZChuZXcgV0kuRGF0YUdyaWROb2RlKHtrZXksIHZhbHVlLCBvcmlnaW5hbFZhbHVlfSwgZmFsc2Up KTsKICAgICAgICAgdGhpcy5fc29ydERhdGFHcmlkKCk7CiAgICAgfQogCiAgICAgaXRlbVVwZGF0 ZWQoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQge2tleSwgdmFsdWV9ID0gZXZlbnQuZGF0YTsK KyAgICAgICAgbGV0IG9yaWdpbmFsVmFsdWUgPSB2YWx1ZTsKICAgICAgICAgdmFsdWUgPSB0aGlz Ll90cnVuY2F0ZVZhbHVlKHZhbHVlKTsKIAogICAgICAgICBsZXQga2V5Rm91bmQgPSBmYWxzZTsK QEAgLTExMyw2ICsxMTksNyBAQCBXSS5ET01TdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBET01T dG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgICAgICAgICAg ICAga2V5Rm91bmQgPSB0cnVlOwogICAgICAgICAgICAgICAgIGNoaWxkTm9kZS5kYXRhLnZhbHVl ID0gdmFsdWU7CisgICAgICAgICAgICAgICAgY2hpbGROb2RlLmRhdGEub3JpZ2luYWxWYWx1ZSA9 IG9yaWdpbmFsVmFsdWU7CiAgICAgICAgICAgICAgICAgY2hpbGROb2RlLnJlZnJlc2goKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTM2LDggKzE0Myw5IEBAIFdJLkRPTVN0b3JhZ2VD b250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAgICAgICAgICAgICAgICAgaWYgKCFrZXkgfHwgIXZhbHVlKQogICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKIAorICAgICAgICAgICAgICAgIGxldCBvcmlnaW5hbFZhbHVlID0g dmFsdWU7CiAgICAgICAgICAgICAgICAgdmFsdWUgPSB0aGlzLl90cnVuY2F0ZVZhbHVlKHZhbHVl KTsKLSAgICAgICAgICAgICAgICBsZXQgbm9kZSA9IG5ldyBXSS5EYXRhR3JpZE5vZGUoe2tleSwg dmFsdWV9LCBmYWxzZSk7CisgICAgICAgICAgICAgICAgbGV0IG5vZGUgPSBuZXcgV0kuRGF0YUdy aWROb2RlKHtrZXksIHZhbHVlLCBvcmlnaW5hbFZhbHVlfSwgZmFsc2UpOwogICAgICAgICAgICAg ICAgIHRoaXMuX2RhdGFHcmlkLmFwcGVuZENoaWxkKG5vZGUpOwogICAgICAgICAgICAgfQogCkBA IC0yNTMsNiArMjYxLDEzIEBAIFdJLkRPTVN0b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0 b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIGNsZWFudXAo KTsKICAgICAgICAgZG9tU3RvcmFnZS5zZXRJdGVtKGtleSwgdmFsdWUpOwogICAgIH0KKworICAg IF9kYXRhR3JpZENvcHkobm9kZSwgY29sdW1uSWRlbnRpZmllciwgdGV4dCkKKyAgICB7CisgICAg ICAgIGlmIChjb2x1bW5JZGVudGlmaWVyID09PSAidmFsdWUiICYmIG5vZGUuZGF0YS5vcmlnaW5h bFZhbHVlKQorICAgICAgICAgICAgcmV0dXJuIG5vZGUuZGF0YS5vcmlnaW5hbFZhbHVlOworICAg ICAgICByZXR1cm4gdGV4dDsKKyAgICB9CiB9OwogCiBXSS5ET01TdG9yYWdlQ29udGVudFZpZXcu RHVwbGljYXRlS2V5U3R5bGVDbGFzc05hbWUgPSAiZHVwbGljYXRlLWtleSI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCmlu ZGV4IGE1YmE1MzliOTY4YjZmMTg3YTViZmUwYTFiNDlmYTUzNDEyMjQwM2YuLjE4YzUwNGM4YjZl MDI3OGRmOTliMWNmMmYxMTRlYjIyMjJiODg3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCkBAIC0yNSw3ICsyNSw3 IEBACiAKIFdJLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXSS5WaWV3CiB7Ci0g ICAgY29uc3RydWN0b3IoY29sdW1uc0RhdGEsIGVkaXRDYWxsYmFjaywgZGVsZXRlQ2FsbGJhY2ss IHByZWZlcnJlZENvbHVtbk9yZGVyKQorICAgIGNvbnN0cnVjdG9yKGNvbHVtbnNEYXRhLCB7ZWRp dENhbGxiYWNrLCBjb3B5Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrLCBwcmVmZXJyZWRDb2x1bW5P cmRlcn0gPSB7fSkKICAgICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTEwOSw2ICsxMDksOSBA QCBXSS5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV0kuVmlldwogICAgICAgICAg ICAgdGhpcy5fZWRpdENhbGxiYWNrID0gZWRpdENhbGxiYWNrOwogICAgICAgICB9CiAKKyAgICAg ICAgaWYgKGNvcHlDYWxsYmFjaykKKyAgICAgICAgICAgIHRoaXMuX2NvcHlDYWxsYmFjayA9IGNv cHlDYWxsYmFjazsKKwogICAgICAgICBpZiAoZGVsZXRlQ2FsbGJhY2spCiAgICAgICAgICAgICB0 aGlzLl9kZWxldGVDYWxsYmFjayA9IGRlbGV0ZUNhbGxiYWNrOwogCkBAIC0xNjgsNyArMTcxLDcg QEAgV0kuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRlbmRzIFdJLlZpZXcKICAgICAgICAg ICAgIH07CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgZGF0YUdyaWQgPSBuZXcgV0kuRGF0YUdy aWQoY29sdW1uc0RhdGEsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBjb2x1bW5OYW1lcyk7CisgICAg ICAgIGxldCBkYXRhR3JpZCA9IG5ldyBXSS5EYXRhR3JpZChjb2x1bW5zRGF0YSwge3ByZWZlcnJl ZENvbHVtbk9yZGVyOiBjb2x1bW5OYW1lc30pOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHZhbHVlcy5sZW5ndGggLyBudW1Db2x1bW5zOyArK2kpIHsKICAgICAgICAgICAgIHZhciBkYXRh ID0ge307CiAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGNvbHVtbk5hbWVzLmxlbmd0 aDsgKytqKQpAQCAtMTY5Nyw3ICsxNzAwLDEyIEBAIFdJLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdy aWQgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBfY29weVRleHRGb3JEYXRhR3JpZE5vZGUobm9kZSkK ICAgICB7Ci0gICAgICAgIGxldCBmaWVsZHMgPSBub2RlLmRhdGFHcmlkLm9yZGVyZWRDb2x1bW5z Lm1hcCgoaWRlbnRpZmllcikgPT4gdGhpcy50ZXh0Rm9yRGF0YUdyaWROb2RlQ29sdW1uKG5vZGUs IGlkZW50aWZpZXIpKTsKKyAgICAgICAgbGV0IGZpZWxkcyA9IG5vZGUuZGF0YUdyaWQub3JkZXJl ZENvbHVtbnMubWFwKChpZGVudGlmaWVyKSA9PiB7CisgICAgICAgICAgICBsZXQgdGV4dCA9IHRo aXMudGV4dEZvckRhdGFHcmlkTm9kZUNvbHVtbihub2RlLCBpZGVudGlmaWVyKTsKKyAgICAgICAg ICAgIGlmICh0aGlzLl9jb3B5Q2FsbGJhY2spCisgICAgICAgICAgICAgICAgdGV4dCA9IHRoaXMu X2NvcHlDYWxsYmFjayhub2RlLCBpZGVudGlmaWVyLCB0ZXh0KTsKKyAgICAgICAgICAgIHJldHVy biB0ZXh0OworICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIGZpZWxkcy5qb2luKHRoaXMuX2Nv cHlUZXh0RGVsaW1pdGVyKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpzCmluZGV4 IGJkOTMwMDBmODA1ZmIxMzM1YjAwZjJkMTU3ZmE2YTk1NTg0OGZiYjkuLmY0Y2JhNGY3OGEwM2Ez ZTE0ZjhhZTgwYzQzN2IxYTE4OGMxMzZjYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcwpA QCAtMjUsOSArMjUsOSBAQAogCiBXSS5UaW1lbGluZURhdGFHcmlkID0gY2xhc3MgVGltZWxpbmVE YXRhR3JpZCBleHRlbmRzIFdJLkRhdGFHcmlkCiB7Ci0gICAgY29uc3RydWN0b3IoY29sdW1ucywg ZWRpdENhbGxiYWNrLCBkZWxldGVDYWxsYmFjaykKKyAgICBjb25zdHJ1Y3Rvcihjb2x1bW5zKQog ICAgIHsKLSAgICAgICAgc3VwZXIoY29sdW1ucywgZWRpdENhbGxiYWNrLCBkZWxldGVDYWxsYmFj ayk7CisgICAgICAgIHN1cGVyKGNvbHVtbnMpOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJ0aW1lbGluZSIpOwogCg==