112666 2013-03-19 00:47:11 -0700 Web Inspector: [DataGrid] Persist column widths. 2013-04-08 02:12:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 112667 113694 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 858007 0 eustas 2013-03-19 00:47:11 -0700 Column widths are often reset when user navigates between tools. Column widths should be persisted (at least while inspector is open). Related issue: Local Storage panel is not behaving properly when adding a new Key value. https://code.google.com/p/chromium/issues/detail?id=178067 861177 1 eustas 2013-03-22 00:53:15 -0700 Correction: Original issue: DevTools: column resizing isn't retained. https://code.google.com/p/chromium/issues/detail?id=129635 864381 2 195268 eustas 2013-03-27 04:03:55 -0700 Created attachment 195268 Patch 864527 3 195268 pfeldman 2013-03-27 07:28:51 -0700 Comment on attachment 195268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195268&action=review > Source/WebCore/inspector/front-end/DataGrid.js:600 > + setFamily: function(family) { setName Here and below: { should be on the next line > Source/WebCore/inspector/front-end/DataGrid.js:603 > + this._saveColumnWeights(); Why would you load and then save? > Source/WebCore/inspector/front-end/RequestCookiesView.js:-91 > - this._cookiesTable.updateWidths(); Why did this go? 865199 4 195268 eustas 2013-03-27 23:36:10 -0700 Comment on attachment 195268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195268&action=review >> Source/WebCore/inspector/front-end/DataGrid.js:600 >> + setFamily: function(family) { > > setName > Here and below: { should be on the next line OK. Done. >> Source/WebCore/inspector/front-end/DataGrid.js:603 >> + this._saveColumnWeights(); > > Why would you load and then save? Just to make sure that column widths are "persisted". I'll delete this. >> Source/WebCore/inspector/front-end/RequestCookiesView.js:-91 >> - this._cookiesTable.updateWidths(); > > Why did this go? It is useless, because column widths do not depend on table content. 865203 5 195490 eustas 2013-03-27 23:42:48 -0700 Created attachment 195490 Patch 865356 6 pfeldman 2013-03-28 05:06:31 -0700 > It is useless, because column widths do not depend on table content. They used to depend on it. Is it not the case anymore? 865365 7 195490 pfeldman 2013-03-28 05:15:04 -0700 Comment on attachment 195490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195490&action=review > Source/WebCore/inspector/front-end/DOMStorageItemsView.js:184 > + {id: "key", title: WebInspector.UIString("Key"), editable: true, weight: 30}, Why 30/70? > Source/WebCore/inspector/front-end/DOMStorageItemsView.js:202 > + dataGrid.setName("keyValue"); Should be "DOMStorageItemsView" > Source/WebCore/inspector/front-end/DataGrid.js:617 > + this.applyColumnWeights(); This looks like a change in behavior: you now apply column weights upon setName. > Source/WebCore/inspector/front-end/DataGrid.js:634 > + this._loadColumnWeights(); You want it to be reset upon each unhide (panel switch)? Does not sound right to me. 866047 8 195490 eustas 2013-03-29 02:44:47 -0700 Comment on attachment 195490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195490&action=review >> Source/WebCore/inspector/front-end/DOMStorageItemsView.js:184 >> + {id: "key", title: WebInspector.UIString("Key"), editable: true, weight: 30}, > > Why 30/70? Doesn't it look better than 50/50? >> Source/WebCore/inspector/front-end/DOMStorageItemsView.js:202 >> + dataGrid.setName("keyValue"); > > Should be "DOMStorageItemsView" Done >> Source/WebCore/inspector/front-end/DataGrid.js:617 >> + this.applyColumnWeights(); > > This looks like a change in behavior: you now apply column weights upon setName. Does it look strange? User expects to see column widths he already set. >> Source/WebCore/inspector/front-end/DataGrid.js:634 >> + this._loadColumnWeights(); > > You want it to be reset upon each unhide (panel switch)? Does not sound right to me. Not reset, but updated. When user changes column widths in data grid, he expects that all data grids with same name should be updated. I can make a shortcut, and update width only if setting value has been changed. But even so we are to check it when view unhides. 866052 9 eustas 2013-03-29 02:53:11 -0700 (In reply to comment #6) > > It is useless, because column widths do not depend on table content. > > They used to depend on it. Is it not the case anymore? Either user adjusts column widths or application do. Now user is in charge. 195268 2013-03-27 04:03:55 -0700 2013-03-27 23:42:44 -0700 Patch bug-112666-20130327145936.patch text/plain 11670 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTQ1NjIzYTFhMWUyNjAz MmIyNWFmY2EyMTY5YThkY2VkYzEyNmFhYi4uMDUzNTFlMDUyZDJiZjZiMzBmMTIzYzdiYmU5MWRj MDNjYTg2ZjMxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAzLTI3ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtEYXRhR3JpZF0gUGVyc2lzdCBjb2x1bW4gd2lkdGhzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNjY2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2F2ZSAvbG9hZCBjb2x1bW4gd2lkdGhz IHRvIHNlc3Npb24gc3RvcmFnZS4KKyAgICAgICAgVGFibGVzIHdpdGggc2FtZSBjb2x1bW5zIGFy ZSBtYXJrZWQgd2l0aCAiZmFtaWx5Ii4gVGFibGVzIGluIGZhbWlseQorICAgICAgICBzaGFyZSBj b2x1bW4gd2lkdGhzIHNldHRpbmcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rh dGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5zZXRG YW1pbHkpOgorICAgICAgICBPYnRhaW4gY29sdW1uIHdpZHRoIHNldHRpbmcuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9sb2FkQ29sdW1uV2VpZ2h0cyk6CisgICAg ICAgIExvYWQgY29sdW1uIHdpZHRocy4gCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlLl9zYXZlQ29sdW1uV2VpZ2h0cyk6CisgICAgICAgIFNhdmUgY29sdW1uIHdpZHRo cy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuc2V0IHdhc1Nob3du KToKKyAgICAgICAgUmVsb2FkIGNvbHVtbiB3aWR0aHMsIGFzIHRoZXkgY291bGQgYmUgY2hhbmdl ZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2VuZFJlc2l6ZXJE cmFnZ2luZyk6CisgICAgICAgIFNhdmUgdXBkYXRlZCBjbHVtbiB3aWR0aHMuCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T ZXR0aW5ncy5wcm90b3R5cGUuY3JlYXRlU2V0dGluZyk6CisgICAgICAgIEFkZCAic2Vzc2lvbiIg cGFyYW1ldGVyIHRvIHVzZSBzZXNzaW9uIHN0b3JhZ2UuCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db29raWVJdGVtc1ZpZXcuanM6IFVzZSBuZXcgZGF0YUdyaWQgZmVhdHVyZS4KKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qczogRGl0dG8uCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzOiBEaXR0by4K KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczogRGl0dG8uCisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanM6IERpdHRv LgorCiAyMDEzLTAzLTI3ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVwZGF0ZSBUaW1lbGluZS5UaW1lbGluZUV2ZW50IGRl ZmluaXRpb24gdG8gaW5jbHVkZSBET00gY291bnRlcnMgYW5kIG5hdGl2ZSBtZW1vcnkgc3RhdHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRl bXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVt c1ZpZXcuanMKaW5kZXggZDRjY2YzYmRmMWU5NTJhMjczMmE5YTNhMGEzMmQyZmVlMGYxMjE4My4u ZTkzMzlhMGU5OTk5NmIxYzViZjg4M2FiZTY5NGFhOGUwYTM2Nzg4ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKQEAg LTE3MywxMiArMTczLDEyIEBAIFdlYkluc3BlY3Rvci5TaW1wbGVDb29raWVzVGFibGUgPSBmdW5j dGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKIAogICAgIHZhciBjb2x1 bW5zID0gWwotICAgICAgICB7dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTmFtZSIpfSwK LSAgICAgICAge3RpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlZhbHVlIil9CisgICAgICAg IHt0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIiksIHdlaWdodDogMzB9LAorICAg ICAgICB7dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVmFsdWUiKSwgd2VpZ2h0OiA3MH0K ICAgICBdOwogCiAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlk KGNvbHVtbnMpOwotICAgIHRoaXMuX2RhdGFHcmlkLmF1dG9TaXplQ29sdW1ucygyMCwgODApOwor ICAgIHRoaXMuX2RhdGFHcmlkLnNldEZhbWlseSgic2ltcGxlQ29va2llcyIpOwogICAgIHRoaXMu X2RhdGFHcmlkLnNob3codGhpcy5lbGVtZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qcwppbmRleCA3NTZkYmFmNmE1Y2Yy NmJjY2M2YjYzZmVlOTZlODdhOGY5OThjMTNjLi5jNWI2OGQxM2Q3ZGIwMDA3ODMwYzQwMjgzOWJl Nzk3YmNlNjBhOGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZXNUYWJsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZXNUYWJsZS5qcwpAQCAtNDMsMTcgKzQzLDE4IEBAIFdlYkluc3BlY3Rvci5Db29r aWVzVGFibGUgPSBmdW5jdGlvbihleHBhbmRhYmxlLCByZWZyZXNoQ2FsbGJhY2spCiAgICAgdGhp cy5fcmVmcmVzaENhbGxiYWNrID0gcmVmcmVzaENhbGxiYWNrOwogCiAgICAgdmFyIGNvbHVtbnMg PSBbCi0gICAgICAgIHtpZDogIm5hbWUiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJO YW1lIiksIHNvcnRhYmxlOiB0cnVlLCBkaXNjbG9zdXJlOiBleHBhbmRhYmxlLCBzb3J0OiBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQuT3JkZXIuQXNjZW5kaW5nLCB3aWR0aDogIjI0JSJ9LAotICAgICAg ICB7aWQ6ICJ2YWx1ZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlZhbHVlIiksIHNv cnRhYmxlOiB0cnVlLCB3aWR0aDogIjM0JSJ9LAotICAgICAgICB7aWQ6ICJkb21haW4iLCB0aXRs ZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb21haW4iKSwgc29ydGFibGU6IHRydWUsIHdpZHRo OiAiNyUifSwKLSAgICAgICAge2lkOiAicGF0aCIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlBhdGgiKSwgc29ydGFibGU6IHRydWUsIHdpZHRoOiAiNyUifSwKLSAgICAgICAge2lkOiAi ZXhwaXJlcyIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4cGlyZXMgLyBNYXgtQWdl IiksIHNvcnRhYmxlOiB0cnVlLCB3aWR0aDogIjclIn0sCi0gICAgICAgIHtpZDogInNpemUiLCB0 aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiB0cnVlLCBhbGln bjogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkFsaWduLlJpZ2h0LCB3aWR0aDogIjclIn0sCi0gICAg ICAgIHtpZDogImh0dHBPbmx5IiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSFRUUCIp LCBzb3J0YWJsZTogdHJ1ZSwgYWxpZ246IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5BbGlnbi5DZW50 ZXIsIHdpZHRoOiAiNyUifSwKLSAgICAgICAge2lkOiAic2VjdXJlIiwgdGl0bGU6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU2VjdXJlIiksIHNvcnRhYmxlOiB0cnVlLCBhbGlnbjogV2ViSW5zcGVj dG9yLkRhdGFHcmlkLkFsaWduLkNlbnRlciwgd2lkdGg6ICI3JSJ9CisgICAgICAgIHtpZDogIm5h bWUiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIiksIHNvcnRhYmxlOiB0cnVl LCBkaXNjbG9zdXJlOiBleHBhbmRhYmxlLCBzb3J0OiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuT3Jk ZXIuQXNjZW5kaW5nLCB3ZWlnaHQ6IDI0fSwKKyAgICAgICAge2lkOiAidmFsdWUiLCB0aXRsZTog V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYWx1ZSIpLCBzb3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiAz NH0sCisgICAgICAgIHtpZDogImRvbWFpbiIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkRvbWFpbiIpLCBzb3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiA3fSwKKyAgICAgICAge2lkOiAicGF0 aCIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdGgiKSwgc29ydGFibGU6IHRydWUs IHdlaWdodDogN30sCisgICAgICAgIHtpZDogImV4cGlyZXMiLCB0aXRsZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJFeHBpcmVzIC8gTWF4LUFnZSIpLCBzb3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiA3 fSwKKyAgICAgICAge2lkOiAic2l6ZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNp emUiKSwgc29ydGFibGU6IHRydWUsIGFsaWduOiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuQWxpZ24u UmlnaHQsIHdlaWdodDogN30sCisgICAgICAgIHtpZDogImh0dHBPbmx5IiwgdGl0bGU6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiSFRUUCIpLCBzb3J0YWJsZTogdHJ1ZSwgYWxpZ246IFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5BbGlnbi5DZW50ZXIsIHdlaWdodDogN30sCisgICAgICAgIHtpZDogInNl Y3VyZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlY3VyZSIpLCBzb3J0YWJsZTog dHJ1ZSwgYWxpZ246IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5BbGlnbi5DZW50ZXIsIHdlaWdodDog N30KICAgICBdOwogCiAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFH cmlkKGNvbHVtbnMsIG51bGwsIHJlYWRPbmx5ID8gbnVsbCA6IHRoaXMuX29uRGVsZXRlQ29va2ll LmJpbmQodGhpcyksIHJlZnJlc2hDYWxsYmFjayk7CisgICAgdGhpcy5fZGF0YUdyaWQuc2V0RmFt aWx5KCJjb29raWVzVGFibGUiKTsKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuU29ydGluZ0NoYW5nZWQsIHRoaXMuX3JlYnVp bGRUYWJsZSwgdGhpcyk7CiAKICAgICB0aGlzLl9uZXh0U2VsZWN0ZWRDb29raWUgPSAvKiogQHR5 cGUgez9XZWJJbnNwZWN0b3IuQ29va2llfSAqLyAobnVsbCk7CkBAIC02MywxMiArNjQsNiBAQCBX ZWJJbnNwZWN0b3IuQ29va2llc1RhYmxlID0gZnVuY3Rpb24oZXhwYW5kYWJsZSwgcmVmcmVzaENh bGxiYWNrKQogfQogCiBXZWJJbnNwZWN0b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZSA9IHsKLSAg ICB1cGRhdGVXaWR0aHM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9kYXRh R3JpZCkKLSAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRocygpOwotICAgIH0s Ci0KICAgICAvKgogICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLkNvb2tpZT59 IGNvb2tpZXMKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwppbmRleCA5NTA2ZDk5MjYzOTRlNzA1 YWUwMmY1OWUwNzhkZDkzM2MwNjRmM2ZiLi5iODVlMDI5OTcxMTgwMzM0YjVhZWM1MjE3ZGQ4YmEw NTk0NTk3YjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzCkBAIC0xNzUsMTUgKzE3NSwxNCBAQCBXZWJJ bnNwZWN0b3IuRE9NU3RvcmFnZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhp cy5fZGF0YUdyaWQgPSB0aGlzLl9kYXRhR3JpZEZvckRPTVN0b3JhZ2VJdGVtcyhpdGVtcyk7CiAg ICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3codGhpcy5lbGVtZW50KTsKLSAgICAgICAgdGhpcy5f ZGF0YUdyaWQuYXV0b1NpemVDb2x1bW5zKDEwKTsKICAgICAgICAgdGhpcy5kZWxldGVCdXR0b24u dmlzaWJsZSA9ICh0aGlzLl9kYXRhR3JpZC5yb290Tm9kZSgpLmNoaWxkcmVuLmxlbmd0aCA+IDEp OwogICAgIH0sCiAKICAgICBfZGF0YUdyaWRGb3JET01TdG9yYWdlSXRlbXM6IGZ1bmN0aW9uKGl0 ZW1zKQogICAgIHsKICAgICAgICAgdmFyIGNvbHVtbnMgPSBbCi0gICAgICAgICAgICB7aWQ6ICJr ZXkiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJLZXkiKSwgZWRpdGFibGU6IHRydWV9 LAotICAgICAgICAgICAge2lkOiAidmFsdWUiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJWYWx1ZSIpLCBlZGl0YWJsZTogdHJ1ZX0KKyAgICAgICAgICAgIHtpZDogImtleSIsIHRpdGxl OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIktleSIpLCBlZGl0YWJsZTogdHJ1ZSwgd2VpZ2h0OiAz MH0sCisgICAgICAgICAgICB7aWQ6ICJ2YWx1ZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlZhbHVlIiksIGVkaXRhYmxlOiB0cnVlLCB3ZWlnaHQ6IDcwfQogICAgICAgICBdOwogCiAg ICAgICAgIHZhciBub2RlcyA9IFtdOwpAQCAtMjAwLDYgKzE5OSw3IEBAIFdlYkluc3BlY3Rvci5E T01TdG9yYWdlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHZh ciBkYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgdGhpcy5fZWRp dGluZ0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhpcykp OworICAgICAgICBkYXRhR3JpZC5zZXRGYW1pbHkoImtleVZhbHVlIik7CiAgICAgICAgIGxlbmd0 aCA9IG5vZGVzLmxlbmd0aDsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsZW5ndGg7ICsr aSkKICAgICAgICAgICAgIGRhdGFHcmlkLnJvb3ROb2RlKCkuYXBwZW5kQ2hpbGQobm9kZXNbaV0p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3Jp ZC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKaW5k ZXggNjdkZjM5YTc1YjNmNjg0MmUyZDE2MTQxOWExYTdmM2I3N2Y5MDYxMi4uNTRhZWYxMzBmNTJm NTQ1YmJmNDM4YjBhMjJlZWEzYmYyMjY2ODUyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCkBAIC01OTQsNiArNTk0LDQzIEBAIFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuQ29sdW1uc1Jlc2l6ZWQpOwog ICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gZmFtaWx5CisgICAgICov CisgICAgc2V0RmFtaWx5OiBmdW5jdGlvbihmYW1pbHkpIHsKKyAgICAgICAgdGhpcy5fY29sdW1u V2VpZ2h0c1NldHRpbmcgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygiZGF0 YUdyaWQtIiArIGZhbWlseSArICItY29sdW1uV2VpZ2h0cyIsIHt9LCB0cnVlKTsKKyAgICAgICAg dGhpcy5fbG9hZENvbHVtbldlaWdodHMoKTsKKyAgICAgICAgdGhpcy5fc2F2ZUNvbHVtbldlaWdo dHMoKTsKKyAgICB9LAorCisgICAgX2xvYWRDb2x1bW5XZWlnaHRzOiBmdW5jdGlvbigpIHsKKyAg ICAgICAgaWYgKCF0aGlzLl9jb2x1bW5XZWlnaHRzU2V0dGluZykKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgdmFyIHdlaWdodHMgPSB0aGlzLl9jb2x1bW5XZWlnaHRzU2V0dGluZy5nZXQo KTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9jb2x1bW5zQXJyYXkubGVuZ3Ro OyArK2kpIHsKKyAgICAgICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLl9jb2x1bW5zQXJyYXlbaV07 CisgICAgICAgICAgICB2YXIgd2VpZ2h0ID0gd2VpZ2h0c1tjb2x1bW4uaWRlbnRpZmllcl07Cisg ICAgICAgICAgICBpZiAod2VpZ2h0KQorICAgICAgICAgICAgICAgIGNvbHVtbi53ZWlnaHQgPSB3 ZWlnaHQ7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5hcHBseUNvbHVtbldlaWdodHMoKTsKKyAg ICB9LAorCisgICAgX3NhdmVDb2x1bW5XZWlnaHRzOiBmdW5jdGlvbigpIHsKKyAgICAgICAgaWYg KCF0aGlzLl9jb2x1bW5XZWlnaHRzU2V0dGluZykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgdmFyIHdlaWdodHMgPSB7fTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9j b2x1bW5zQXJyYXkubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBjb2x1bW4gPSB0aGlz Ll9jb2x1bW5zQXJyYXlbaV07CisgICAgICAgICAgICB3ZWlnaHRzW2NvbHVtbi5pZGVudGlmaWVy XSA9IGNvbHVtbi53ZWlnaHQ7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fY29sdW1uV2VpZ2h0 c1NldHRpbmcuc2V0KHdlaWdodHMpOworICAgIH0sCisKKyAgICB3YXNTaG93bjogZnVuY3Rpb24o KSB7CisgICAgICAgdGhpcy5fbG9hZENvbHVtbldlaWdodHMoKTsKKyAgICB9LAorCiAgICAgYXBw bHlDb2x1bW5XZWlnaHRzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgc3VtT2ZXZWln aHRzID0gMC4wOwpAQCAtMTA1Miw2ICsxMDg5LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZSA9IHsKICAgICBfZW5kUmVzaXplckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRSZXNpemVyID0gbnVsbDsKKyAgICAgICAgdGhpcy5f c2F2ZUNvbHVtbldlaWdodHMoKTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50cy5Db2x1bW5zUmVzaXplZCk7CiAgICAgfSwK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcwppbmRleCA5N2NjYzA4ODUwYzRmYjQwMTBkOWVhNTE4YWVlZGUxOTcxOWJhZTYyLi4wYjA0 ZDdlOTRmMDEzMjc4MDg4MDg3MWVhMzQ5MDE1ODJlMTM5YmUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMjQ3LDYgKzI0 Nyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0pOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZChjb2x1bW5zKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2V0RmFtaWx5KCJuZXR3b3JrTG9n Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2l6ZU1ldGhvZCA9IFdlYkluc3BlY3Rvci5E YXRhR3JpZC5SZXNpemVNZXRob2QuTGFzdDsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJuZXR3b3JrLWxvZy1ncmlkIik7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0 TWVudS5iaW5kKHRoaXMpLCB0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVxdWVzdENvb2tpZXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKaW5kZXggYWFmMGNlYjhlMTI5 M2UxMWY4ODZiMDMzYWRjYmI3Y2Q1MTI0ZDMwMS4uMjBlODJhYzBjNGQ4ZjI2ZGYzYWQxODdmM2M5 MDVlNDMxY2FhZjQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKQEAgLTg4LDcgKzg4LDYgQEAgV2ViSW5z cGVjdG9yLlJlcXVlc3RDb29raWVzVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhp cy5fZ290Q29va2llcyB8fCAhdGhpcy5pc1Nob3dpbmcoKSkKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgdGhpcy5fYnVpbGRDb29raWVzVGFibGUoKTsKLSAgICAgICAgdGhpcy5fY29va2ll c1RhYmxlLnVwZGF0ZVdpZHRocygpOwogICAgIH0sCiAKICAgICBfX3Byb3RvX186IFdlYkluc3Bl Y3Rvci5WaWV3LnByb3RvdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMKaW5kZXggMzgzNDhiNmE0ZjY3ZDhlMzg4ZTI4MWUzODNjNmQ1ZGQxZjY0 ZTAxNC4uZWI5ZmU5ZmJlMWNiYWUwOTE0YjY2ZTQ0ZTI0MDZkOTE0MTM2YmNlMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xMzUsMTIg KzEzNSwxMyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlID0gewogICAgIC8qKgog ICAgICAqIEBwYXJhbSB7c3RyaW5nfSBrZXkKICAgICAgKiBAcGFyYW0geyp9IGRlZmF1bHRWYWx1 ZQorICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHNlc3Npb24KICAgICAgKiBAcmV0dXJuIHshV2Vi SW5zcGVjdG9yLlNldHRpbmd9CiAgICAgICovCi0gICAgY3JlYXRlU2V0dGluZzogZnVuY3Rpb24o a2V5LCBkZWZhdWx0VmFsdWUpCisgICAgY3JlYXRlU2V0dGluZzogZnVuY3Rpb24oa2V5LCBkZWZh dWx0VmFsdWUsIHNlc3Npb24pCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3JlZ2lzdHJ5W2tl eV0pCi0gICAgICAgICAgICB0aGlzLl9yZWdpc3RyeVtrZXldID0gbmV3IFdlYkluc3BlY3Rvci5T ZXR0aW5nKGtleSwgZGVmYXVsdFZhbHVlLCB0aGlzLl9ldmVudFN1cHBvcnQsIHdpbmRvdy5sb2Nh bFN0b3JhZ2UpOworICAgICAgICAgICAgdGhpcy5fcmVnaXN0cnlba2V5XSA9IG5ldyBXZWJJbnNw ZWN0b3IuU2V0dGluZyhrZXksIGRlZmF1bHRWYWx1ZSwgdGhpcy5fZXZlbnRTdXBwb3J0LCBzZXNz aW9uID8gd2luZG93LnNlc3Npb25TdG9yYWdlIDogd2luZG93LmxvY2FsU3RvcmFnZSk7CiAgICAg ICAgIHJldHVybiB0aGlzLl9yZWdpc3RyeVtrZXldOwogICAgIH0KIH0K 195490 2013-03-27 23:42:48 -0700 2013-03-29 02:44:47 -0700 Patch bug-112666-20130328104246.patch text/plain 11679 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ1NTlmNzJmMWIyNzA1 ZDQ2MzQ5YWNhY2FhNWE4NmY1NDM4YjVlYy4uMDI4M2MyYTc3MmUyZTQyNGRiZjg0ZmZjODdlOWQ1 MWZhN2U2ZjM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAzLTI3ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtEYXRhR3JpZF0gUGVyc2lzdCBjb2x1bW4gd2lkdGhzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNjY2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2F2ZSAvbG9hZCBjb2x1bW4gd2lkdGhz IHRvIHNlc3Npb24gc3RvcmFnZS4KKyAgICAgICAgVGFibGVzIHdpdGggc2FtZSBjb2x1bW5zIGFy ZSBtYXJrZWQgd2l0aCAibmFtZSIuIFRhYmxlcyB3aXRoIHNhbWUgbmFtZQorICAgICAgICBzaGFy ZSBjb2x1bW4gd2lkdGhzIHNldHRpbmcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5z ZXROYW1lKToKKyAgICAgICAgT2J0YWluIGNvbHVtbiB3aWR0aCBzZXR0aW5nLgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fbG9hZENvbHVtbldlaWdodHMpOgorICAg ICAgICBMb2FkIGNvbHVtbiB3aWR0aHMuIAorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlk LnByb3RvdHlwZS5fc2F2ZUNvbHVtbldlaWdodHMpOgorICAgICAgICBTYXZlIGNvbHVtbiB3aWR0 aHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCB3YXNTaG93 bik6CisgICAgICAgIFJlbG9hZCBjb2x1bW4gd2lkdGhzLCBhcyB0aGV5IGNvdWxkIGJlIGNoYW5n ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9lbmRSZXNpemVy RHJhZ2dpbmcpOgorICAgICAgICBTYXZlIHVwZGF0ZWQgY2x1bW4gd2lkdGhzLgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2V0dGluZ3MucHJvdG90eXBlLmNyZWF0ZVNldHRpbmcpOgorICAgICAgICBBZGQgInNlc3Npb24i IHBhcmFtZXRlciB0byB1c2Ugc2Vzc2lvbiBzdG9yYWdlLgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzOiBVc2UgbmV3IGRhdGFHcmlkIGZlYXR1cmUuCisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanM6IERpdHRvLgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qczogRGl0dG8u CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6IERpdHRvLgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVxdWVzdENvb2tpZXNWaWV3LmpzOiBEaXR0 by4KKwogMjAxMy0wMy0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgYSB3YXkgdG8gdXBkYXRlIEdyYXBoaWNzTGF5ZXJDQSB2aXNpYmxlUmVj dHMgd2l0aG91dCBoYXZpbmcgdG8gZG8gYSBmbHVzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwppbmRleCA2NjlmNTA1MTE1 M2VhNTI1MzE0NzgwODQ1ZDc4N2ViZDdmNTk1YjViLi4wOTgzOTQ5NTBkYTA1Yjc1MWU1YTIyMGNm YTYxNTNhZGIxZmRjYzhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwpAQCAtMTk1LDEyICsxOTUsMTIgQEAgV2ViSW5z cGVjdG9yLlNpbXBsZUNvb2tpZXNUYWJsZSA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3Iu Vmlldy5jYWxsKHRoaXMpOwogCiAgICAgdmFyIGNvbHVtbnMgPSBbCi0gICAgICAgIHt0aXRsZTog V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIil9LAotICAgICAgICB7dGl0bGU6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVmFsdWUiKX0KKyAgICAgICAge3RpdGxlOiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIk5hbWUiKSwgd2VpZ2h0OiAzMH0sCisgICAgICAgIHt0aXRsZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJWYWx1ZSIpLCB3ZWlnaHQ6IDcwfQogICAgIF07CiAKICAgICB0aGlzLl9kYXRh R3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7Ci0gICAgdGhpcy5fZGF0 YUdyaWQuYXV0b1NpemVDb2x1bW5zKDIwLCA4MCk7CisgICAgdGhpcy5fZGF0YUdyaWQuc2V0TmFt ZSgic2ltcGxlQ29va2llcyIpOwogICAgIHRoaXMuX2RhdGFHcmlkLnNob3codGhpcy5lbGVtZW50 KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b29raWVzVGFibGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tp ZXNUYWJsZS5qcwppbmRleCA0MzAwZTUzMzc0ZTY1ODczZGY3M2Q3OTNmYWU3YTY0M2Q5ZWJlMjM3 Li5iNDhlMWEzODQzM2Q3MjJjYjVhOTU3ZGJiNjUxZTg1MGJhMmJkMzhhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qcwpAQCAtNDQs MTQgKzQ0LDE0IEBAIFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUgPSBmdW5jdGlvbihleHBhbmRh YmxlLCByZWZyZXNoQ2FsbGJhY2ssIHNlbGVjdGVkQ2FsbGJhCiAgICAgdGhpcy5fcmVmcmVzaENh bGxiYWNrID0gcmVmcmVzaENhbGxiYWNrOwogCiAgICAgdmFyIGNvbHVtbnMgPSBbCi0gICAgICAg IHtpZDogIm5hbWUiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIiksIHNvcnRh YmxlOiB0cnVlLCBkaXNjbG9zdXJlOiBleHBhbmRhYmxlLCBzb3J0OiBXZWJJbnNwZWN0b3IuRGF0 YUdyaWQuT3JkZXIuQXNjZW5kaW5nLCB3aWR0aDogIjI0JSJ9LAotICAgICAgICB7aWQ6ICJ2YWx1 ZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlZhbHVlIiksIHNvcnRhYmxlOiB0cnVl LCB3aWR0aDogIjM0JSJ9LAotICAgICAgICB7aWQ6ICJkb21haW4iLCB0aXRsZTogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJEb21haW4iKSwgc29ydGFibGU6IHRydWUsIHdpZHRoOiAiNyUifSwKLSAg ICAgICAge2lkOiAicGF0aCIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdGgiKSwg c29ydGFibGU6IHRydWUsIHdpZHRoOiAiNyUifSwKLSAgICAgICAge2lkOiAiZXhwaXJlcyIsIHRp dGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4cGlyZXMgLyBNYXgtQWdlIiksIHNvcnRhYmxl OiB0cnVlLCB3aWR0aDogIjclIn0sCi0gICAgICAgIHtpZDogInNpemUiLCB0aXRsZTogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiB0cnVlLCBhbGlnbjogV2ViSW5zcGVj dG9yLkRhdGFHcmlkLkFsaWduLlJpZ2h0LCB3aWR0aDogIjclIn0sCi0gICAgICAgIHtpZDogImh0 dHBPbmx5IiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSFRUUCIpLCBzb3J0YWJsZTog dHJ1ZSwgYWxpZ246IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5BbGlnbi5DZW50ZXIsIHdpZHRoOiAi NyUifSwKLSAgICAgICAge2lkOiAic2VjdXJlIiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2VjdXJlIiksIHNvcnRhYmxlOiB0cnVlLCBhbGlnbjogV2ViSW5zcGVjdG9yLkRhdGFHcmlk LkFsaWduLkNlbnRlciwgd2lkdGg6ICI3JSJ9CisgICAgICAgIHtpZDogIm5hbWUiLCB0aXRsZTog V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIiksIHNvcnRhYmxlOiB0cnVlLCBkaXNjbG9zdXJl OiBleHBhbmRhYmxlLCBzb3J0OiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuT3JkZXIuQXNjZW5kaW5n LCB3ZWlnaHQ6IDI0fSwKKyAgICAgICAge2lkOiAidmFsdWUiLCB0aXRsZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJWYWx1ZSIpLCBzb3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiAzNH0sCisgICAgICAg IHtpZDogImRvbWFpbiIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRvbWFpbiIpLCBz b3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiA3fSwKKyAgICAgICAge2lkOiAicGF0aCIsIHRpdGxlOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdGgiKSwgc29ydGFibGU6IHRydWUsIHdlaWdodDogN30s CisgICAgICAgIHtpZDogImV4cGlyZXMiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJF eHBpcmVzIC8gTWF4LUFnZSIpLCBzb3J0YWJsZTogdHJ1ZSwgd2VpZ2h0OiA3fSwKKyAgICAgICAg e2lkOiAic2l6ZSIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKSwgc29ydGFi bGU6IHRydWUsIGFsaWduOiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuQWxpZ24uUmlnaHQsIHdlaWdo dDogN30sCisgICAgICAgIHtpZDogImh0dHBPbmx5IiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiSFRUUCIpLCBzb3J0YWJsZTogdHJ1ZSwgYWxpZ246IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5BbGlnbi5DZW50ZXIsIHdlaWdodDogN30sCisgICAgICAgIHtpZDogInNlY3VyZSIsIHRpdGxl OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlY3VyZSIpLCBzb3J0YWJsZTogdHJ1ZSwgYWxpZ246 IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5BbGlnbi5DZW50ZXIsIHdlaWdodDogN30KICAgICBdOwog CiAgICAgaWYgKHJlYWRPbmx5KQpAQCAtNjEsNiArNjEsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2ll c1RhYmxlID0gZnVuY3Rpb24oZXhwYW5kYWJsZSwgcmVmcmVzaENhbGxiYWNrLCBzZWxlY3RlZENh bGxiYQogICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNv bnRleHRtZW51IiwgdGhpcy5faGFuZGxlQ29udGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCB0cnVl KTsKICAgICB9CiAKKyAgICB0aGlzLl9kYXRhR3JpZC5zZXROYW1lKCJjb29raWVzVGFibGUiKTsK ICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5FdmVudHMuU29ydGluZ0NoYW5nZWQsIHRoaXMuX3JlYnVpbGRUYWJsZSwgdGhpcyk7CiAKICAg ICBpZiAoc2VsZWN0ZWRDYWxsYmFjaykKQEAgLTczLDEyICs3NCw2IEBAIFdlYkluc3BlY3Rvci5D b29raWVzVGFibGUgPSBmdW5jdGlvbihleHBhbmRhYmxlLCByZWZyZXNoQ2FsbGJhY2ssIHNlbGVj dGVkQ2FsbGJhCiB9CiAKIFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUucHJvdG90eXBlID0gewot ICAgIHVwZGF0ZVdpZHRoczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2Rh dGFHcmlkKQotICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7Ci0gICAg fSwKLQogICAgIC8qKgogICAgICAqIEBwYXJhbSB7P3N0cmluZ30gZG9tYWluCiAgICAgICovCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJ dGVtc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3Jh Z2VJdGVtc1ZpZXcuanMKaW5kZXggOTUwNmQ5OTI2Mzk0ZTcwNWFlMDJmNTllMDc4ZGQ5MzNjMDY0 ZjNmYi4uNzNmMTdiMTFhMjM4YWU4ODllYmY2ODlmZmQ1MTE5YTE2NWFiOTEwMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0 ZW1zVmlldy5qcwpAQCAtMTc1LDE1ICsxNzUsMTQgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJ dGVtc1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gdGhpcy5f ZGF0YUdyaWRGb3JET01TdG9yYWdlSXRlbXMoaXRlbXMpOwogICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5zaG93KHRoaXMuZWxlbWVudCk7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmF1dG9TaXplQ29s dW1ucygxMCk7CiAgICAgICAgIHRoaXMuZGVsZXRlQnV0dG9uLnZpc2libGUgPSAodGhpcy5fZGF0 YUdyaWQucm9vdE5vZGUoKS5jaGlsZHJlbi5sZW5ndGggPiAxKTsKICAgICB9LAogCiAgICAgX2Rh dGFHcmlkRm9yRE9NU3RvcmFnZUl0ZW1zOiBmdW5jdGlvbihpdGVtcykKICAgICB7CiAgICAgICAg IHZhciBjb2x1bW5zID0gWwotICAgICAgICAgICAge2lkOiAia2V5IiwgdGl0bGU6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiS2V5IiksIGVkaXRhYmxlOiB0cnVlfSwKLSAgICAgICAgICAgIHtpZDog InZhbHVlIiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVmFsdWUiKSwgZWRpdGFibGU6 IHRydWV9CisgICAgICAgICAgICB7aWQ6ICJrZXkiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJLZXkiKSwgZWRpdGFibGU6IHRydWUsIHdlaWdodDogMzB9LAorICAgICAgICAgICAge2lk OiAidmFsdWUiLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYWx1ZSIpLCBlZGl0YWJs ZTogdHJ1ZSwgd2VpZ2h0OiA3MH0KICAgICAgICAgXTsKIAogICAgICAgICB2YXIgbm9kZXMgPSBb XTsKQEAgLTIwMCw2ICsxOTksNyBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUl0ZW1zVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgZGF0YUdyaWQgPSBuZXcgV2Vi SW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHRoaXMuX2VkaXRpbmdDYWxsYmFjay5iaW5kKHRo aXMpLCB0aGlzLl9kZWxldGVDYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICAgICAgZGF0YUdyaWQu c2V0TmFtZSgia2V5VmFsdWUiKTsKICAgICAgICAgbGVuZ3RoID0gbm9kZXMubGVuZ3RoOwogICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQogICAgICAgICAgICAgZGF0YUdy aWQucm9vdE5vZGUoKS5hcHBlbmRDaGlsZChub2Rlc1tpXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcwppbmRleCA2N2RmMzlhNzViM2Y2ODQyZTJk MTYxNDE5YTFhN2YzYjc3ZjkwNjEyLi5hNzdlNGY1Y2VkYjUzNDdjZTI2OGFmNjUyNmI4MmNmZGQ2 ZjI2MTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rh dGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdy aWQuanMKQEAgLTU5NCw2ICs1OTQsNDYgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkRhdGFHcmlkLkV2ZW50cy5Db2x1bW5zUmVzaXplZCk7CiAgICAgfSwKIAorICAgIC8qKgorICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBuYW1lCisgICAgICovCisgICAgc2V0TmFtZTogZnVuY3Rpb24o bmFtZSkKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbHVtbldlaWdodHNTZXR0aW5nID0gV2ViSW5z cGVjdG9yLnNldHRpbmdzLmNyZWF0ZVNldHRpbmcoImRhdGFHcmlkLSIgKyBuYW1lICsgIi1jb2x1 bW5XZWlnaHRzIiwge30sIHRydWUpOworICAgICAgICB0aGlzLl9sb2FkQ29sdW1uV2VpZ2h0cygp OworICAgIH0sCisKKyAgICBfbG9hZENvbHVtbldlaWdodHM6IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIGlmICghdGhpcy5fY29sdW1uV2VpZ2h0c1NldHRpbmcpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIHZhciB3ZWlnaHRzID0gdGhpcy5fY29sdW1uV2VpZ2h0c1NldHRpbmcuZ2V0 KCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY29sdW1uc0FycmF5Lmxlbmd0 aDsgKytpKSB7CisgICAgICAgICAgICB2YXIgY29sdW1uID0gdGhpcy5fY29sdW1uc0FycmF5W2ld OworICAgICAgICAgICAgdmFyIHdlaWdodCA9IHdlaWdodHNbY29sdW1uLmlkZW50aWZpZXJdOwor ICAgICAgICAgICAgaWYgKHdlaWdodCkKKyAgICAgICAgICAgICAgICBjb2x1bW4ud2VpZ2h0ID0g d2VpZ2h0OworICAgICAgICB9CisgICAgICAgIHRoaXMuYXBwbHlDb2x1bW5XZWlnaHRzKCk7Cisg ICAgfSwKKworICAgIF9zYXZlQ29sdW1uV2VpZ2h0czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLl9jb2x1bW5XZWlnaHRzU2V0dGluZykKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgdmFyIHdlaWdodHMgPSB7fTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0 aGlzLl9jb2x1bW5zQXJyYXkubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBjb2x1bW4g PSB0aGlzLl9jb2x1bW5zQXJyYXlbaV07CisgICAgICAgICAgICB3ZWlnaHRzW2NvbHVtbi5pZGVu dGlmaWVyXSA9IGNvbHVtbi53ZWlnaHQ7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fY29sdW1u V2VpZ2h0c1NldHRpbmcuc2V0KHdlaWdodHMpOworICAgIH0sCisKKyAgICB3YXNTaG93bjogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICB0aGlzLl9sb2FkQ29sdW1uV2VpZ2h0cygpOworICAgIH0s CisKICAgICBhcHBseUNvbHVtbldlaWdodHM6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZh ciBzdW1PZldlaWdodHMgPSAwLjA7CkBAIC0xMDUyLDYgKzEwOTIsNyBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgIF9lbmRSZXNpemVyRHJhZ2dpbmc6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fY3VycmVudFJlc2l6ZXIgPSBudWxsOworICAg ICAgICB0aGlzLl9zYXZlQ29sdW1uV2VpZ2h0cygpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnRzLkNvbHVtbnNSZXNpemVk KTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya1BhbmVsLmpzCmluZGV4IDk3Y2NjMDg4NTBjNGZiNDAxMGQ5ZWE1MThhZWVkZTE5NzE5 YmFlNjIuLjQyMzU3ZjY5NzhlOTQ4NjVjZWJkY2I3ODBkMWFhNDdjNDY5NTI2NDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBA IC0yNDcsNiArMjQ3LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgfSk7CiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVj dG9yLkRhdGFHcmlkKGNvbHVtbnMpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zZXROYW1lKCJu ZXR3b3JrTG9nIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2l6ZU1ldGhvZCA9IFdlYklu c3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuTGFzdDsKICAgICAgICAgdGhpcy5fZGF0YUdy aWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJuZXR3b3JrLWxvZy1ncmlkIik7CiAgICAgICAgIHRo aXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlz Ll9jb250ZXh0TWVudS5iaW5kKHRoaXMpLCB0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVxdWVzdENvb2tpZXNWaWV3LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKaW5kZXggYWFm MGNlYjhlMTI5M2UxMWY4ODZiMDMzYWRjYmI3Y2Q1MTI0ZDMwMS4uMjBlODJhYzBjNGQ4ZjI2ZGYz YWQxODdmM2M5MDVlNDMxY2FhZjQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKQEAgLTg4LDcgKzg4LDYg QEAgV2ViSW5zcGVjdG9yLlJlcXVlc3RDb29raWVzVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg IGlmICghdGhpcy5fZ290Q29va2llcyB8fCAhdGhpcy5pc1Nob3dpbmcoKSkKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgdGhpcy5fYnVpbGRDb29raWVzVGFibGUoKTsKLSAgICAgICAgdGhp cy5fY29va2llc1RhYmxlLnVwZGF0ZVdpZHRocygpOwogICAgIH0sCiAKICAgICBfX3Byb3RvX186 IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggMzgzNDhiNmE0ZjY3ZDhlMzg4ZTI4MWUzODNj NmQ1ZGQxZjY0ZTAxNC4uZWI5ZmU5ZmJlMWNiYWUwOTE0YjY2ZTQ0ZTI0MDZkOTE0MTM2YmNlMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBA IC0xMzUsMTIgKzEzNSwxMyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3MucHJvdG90eXBlID0gewog ICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBrZXkKICAgICAgKiBAcGFyYW0geyp9IGRl ZmF1bHRWYWx1ZQorICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHNlc3Npb24KICAgICAgKiBAcmV0 dXJuIHshV2ViSW5zcGVjdG9yLlNldHRpbmd9CiAgICAgICovCi0gICAgY3JlYXRlU2V0dGluZzog ZnVuY3Rpb24oa2V5LCBkZWZhdWx0VmFsdWUpCisgICAgY3JlYXRlU2V0dGluZzogZnVuY3Rpb24o a2V5LCBkZWZhdWx0VmFsdWUsIHNlc3Npb24pCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3Jl Z2lzdHJ5W2tleV0pCi0gICAgICAgICAgICB0aGlzLl9yZWdpc3RyeVtrZXldID0gbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKGtleSwgZGVmYXVsdFZhbHVlLCB0aGlzLl9ldmVudFN1cHBvcnQsIHdp bmRvdy5sb2NhbFN0b3JhZ2UpOworICAgICAgICAgICAgdGhpcy5fcmVnaXN0cnlba2V5XSA9IG5l dyBXZWJJbnNwZWN0b3IuU2V0dGluZyhrZXksIGRlZmF1bHRWYWx1ZSwgdGhpcy5fZXZlbnRTdXBw b3J0LCBzZXNzaW9uID8gd2luZG93LnNlc3Npb25TdG9yYWdlIDogd2luZG93LmxvY2FsU3RvcmFn ZSk7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZWdpc3RyeVtrZXldOwogICAgIH0KIH0K