105739 2012-12-25 03:48:49 -0800 Web Inspector: [Resources] Make grid columns set configurable. 2013-01-11 09:10:52 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 105795 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 797131 0 eustas 2012-12-25 03:48:49 -0800 Use context menu on grid header to hide/show grid columns. 797144 1 180710 eustas 2012-12-25 05:46:32 -0800 Created attachment 180710 Patch 797320 2 180710 pfeldman 2012-12-26 08:56:20 -0800 Comment on attachment 180710 Patch I applied that patch and noticed that you don't persist the visible column set. The header is also misaligned with the grid once you hide one of the columns. 797474 3 eustas 2012-12-27 01:36:03 -0800 (In reply to comment #2) > (From update of attachment 180710 [details]) > I applied that patch and noticed that you don't persist the visible column set. The header is also misaligned with the grid once you hide one of the columns. I'll add persistence. BUT misalignment is not caused by this patch, so it should be addressed separately. 797537 4 180797 eustas 2012-12-27 06:30:26 -0800 Created attachment 180797 Patch 804966 5 180797 pfeldman 2013-01-10 22:10:56 -0800 Comment on attachment 180797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180797&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:158 > + var hiddenColumns = WebInspector.settings.hiddenNetworkLogColumns.get(); This setting should be defined in the panel. > Source/WebCore/inspector/front-end/NetworkPanel.js:161 > + if (this._detailedViewColumnsSet[hiddenColumns[i]]) At some point, we will have more columns and only some of them will be visible by default. So I don't think you need this._detailedViewColumnsSet preset. It is jus that the setting should have such value by default. > Source/WebCore/inspector/front-end/Settings.js:118 > + this.hiddenNetworkLogColumns = this.createSetting("hiddenNetworkLogColumns", []); Move to NetworkPanel.js and have a default value for it. > Source/WebCore/inspector/front-end/networkLogView.css:561 > +#network-container .hide-method-column .method-column, Now this stops being scaleable. Adding a column would require adding to this stupid rule... This (and other styles where we enumerate column names) could be addressed in another patch though. 805051 6 180797 eustas 2013-01-11 01:07:13 -0800 Comment on attachment 180797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180797&action=review >> Source/WebCore/inspector/front-end/NetworkPanel.js:158 >> + var hiddenColumns = WebInspector.settings.hiddenNetworkLogColumns.get(); > > This setting should be defined in the panel. Done >> Source/WebCore/inspector/front-end/NetworkPanel.js:161 >> + if (this._detailedViewColumnsSet[hiddenColumns[i]]) > > At some point, we will have more columns and only some of them will be visible by default. So I don't think you need this._detailedViewColumnsSet preset. It is jus that the setting should have such value by default. We use this._detailedViewColumnsSet both to hold visibility and create menu items, because not all columns could be toggled, for example name and timeline are mandatory. >> Source/WebCore/inspector/front-end/Settings.js:118 >> + this.hiddenNetworkLogColumns = this.createSetting("hiddenNetworkLogColumns", []); > > Move to NetworkPanel.js and have a default value for it. Done. >> Source/WebCore/inspector/front-end/networkLogView.css:561 >> +#network-container .hide-method-column .method-column, > > Now this stops being scaleable. Adding a column would require adding to this stupid rule... This (and other styles where we enumerate column names) could be addressed in another patch though. Totally agree. It was a hard choice between scaleability and least invasiveness, but I chose the last. Fixed. 805053 7 182289 eustas 2013-01-11 01:08:52 -0800 Created attachment 182289 Patch 805306 8 182289 webkit.review.bot 2013-01-11 09:10:47 -0800 Comment on attachment 182289 Patch Clearing flags on attachment: 182289 Committed r139452: <http://trac.webkit.org/changeset/139452> 805307 9 webkit.review.bot 2013-01-11 09:10:52 -0800 All reviewed patches have been landed. Closing bug. 180710 2012-12-25 05:46:32 -0800 2012-12-27 06:30:21 -0800 Patch bug-105739-20121225174344.patch text/plain 13159 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5N2FiOTIwYTg2Nzhl YjUwMWUwYmQ5ZmM1ZGNmZGU3NmFjMTk3Yy4uZjQxOGNhYzc0OWNjNzY4ZTU2Y2U5YjQ4ZTcxMDIx N2U4MzcxNjFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEyLTI1ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXNdIE1ha2UgZ3JpZCBjb2x1bW5zIHNldCBjb25maWd1cmFibGUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU3MzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjb250 ZXh0IG1lbnUgb24gZ3JpZCBoZWFkZXIgdG8gaGlkZS9zaG93IGdyaWQgY29sdW1ucy4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIEZpeGVkIHNo b3cvaGlkZSBiZWhhdmlvciwgaW50cm9kdWNlZCB3ZWlnaHQgY29udHJvbC4KKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgQWRkZWQgbWVtYmVy IHRvIHRyYWNrIHZpc2liaWxpdHkgb2YgY29sdW1ucyBpbiBkZXRhaWxlcmQgbW9kZS4gQWRkZWQK KyAgICAgICAgY29udGV4dCBtZW51IGZvciBncmlkIGhlYWRlci4KKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL25ldHdvcmtMb2dWaWV3LmNzczogQWRkZWQgY2xhc3NlcyB1c2VkIHRvIG1h a2UKKyAgICAgICAgaGlkZGVuIGNvbHVtbnMgY29tcGxldGVseSBpbnZpc2libGUuCisKIDIwMTIt MTItMjQgIExhc3psbyBHb21ib3MgIDxsLmdvbWJvc0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBS ZW1vdmUgd3RmL1BsYXRmb3JtLmggaW5jbHVkZXMgZnJvbSB7Y3xjcHB9IGZpbGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcwppbmRleCA1MGQwNDY0 OGM5OTk2MGYwYWM2ODZhZTNlZTFjMmMxMGJiNTE1MWY0Li41MTM0MTYxNGUyY2E5YmJlNGQ3ZTNh NjdiZGJmNzM5Mjk4Y2FmNjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGF0YUdyaWQuanMKQEAgLTU2Niw3MSArNTY2LDQ4IEBAIFdlYkluc3BlY3Rvci5EYXRh R3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KCJ3aWR0aCBjaGFuZ2VkIik7CiAgICAgfSwKIAotICAgIGNvbHVtbldpZHRoc01hcDogZnVuY3Rp b24oKQorICAgIGFwcGx5Q29sdW1uV2VpZ2h0czogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg dmFyIHJlc3VsdCA9IHt9OwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2NvbHVt bnNBcnJheS5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIHdpZHRoID0gdGhpcy5faGVh ZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltpXS5zdHlsZS53aWR0aDsKLSAgICAgICAgICAg IHJlc3VsdFt0aGlzLl9jb2x1bW5zQXJyYXlbaV0uY29sdW1uSWRlbnRpZmllcl0gPSBwYXJzZUZs b2F0KHdpZHRoKTsKKyAgICAgICAgdmFyIHN1bU9mV2VpZ2h0cyA9IDAuMDsKKyAgICAgICAgZm9y ICh2YXIgY29sdW1uSWRlbnRpZmllciBpbiB0aGlzLmNvbHVtbnMpIHsKKyAgICAgICAgICAgIGlm ICh0aGlzLmlzQ29sdW1uVmlzaWJsZShjb2x1bW5JZGVudGlmaWVyKSkKKyAgICAgICAgICAgICAg ICBzdW1PZldlaWdodHMgKz0gdGhpcy5jb2x1bW5zW2NvbHVtbklkZW50aWZpZXJdLndlaWdodDsK ICAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0sCisgICAgICAgIHZhciBm YWN0b3IgPSAxMDAgLyBzdW1PZldlaWdodHM7CiAKLSAgICBhcHBseUNvbHVtbldpZHRoc01hcDog ZnVuY3Rpb24oY29sdW1uV2lkdGhzTWFwKQotICAgIHsKICAgICAgICAgZm9yICh2YXIgY29sdW1u SWRlbnRpZmllciBpbiB0aGlzLmNvbHVtbnMpIHsKICAgICAgICAgICAgIHZhciBjb2x1bW4gPSB0 aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07Ci0gICAgICAgICAgICB2YXIgd2lkdGggPSAo Y29sdW1uV2lkdGhzTWFwW2NvbHVtbklkZW50aWZpZXJdIHx8IDApICsgIiUiOworICAgICAgICAg ICAgdmFyIHdpZHRoID0gdGhpcy5pc0NvbHVtblZpc2libGUoY29sdW1uSWRlbnRpZmllcikgPyAo KGZhY3RvciAqIGNvbHVtbi53ZWlnaHQpICsgIiUiKTogIjAlIjsKICAgICAgICAgICAgIHRoaXMu X2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bY29sdW1uLm9yZGluYWxdLnN0eWxlLndp ZHRoID0gd2lkdGg7CiAgICAgICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGls ZHJlbltjb2x1bW4ub3JkaW5hbF0uc3R5bGUud2lkdGggPSB3aWR0aDsKICAgICAgICAgfQogCi0g ICAgICAgIC8vIE5vcm1hbGl6ZSB3aWR0aHMKLSAgICAgICAgZGVsZXRlIHRoaXMuX2NvbHVtbldp ZHRoc0luaXRpYWxpemVkOwotICAgICAgICB0aGlzLnVwZGF0ZVdpZHRocygpOworICAgICAgICB0 aGlzLl9wb3NpdGlvblJlc2l6ZXJzKCk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKCJ3aWR0aCBjaGFuZ2VkIik7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJh bSB7c3RyaW5nfSBjb2x1bW5JZGVudGlmaWVyCisgICAgICovCiAgICAgaXNDb2x1bW5WaXNpYmxl OiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgdmFyIGNvbHVtbiA9 IHRoaXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXTsKLSAgICAgICAgdmFyIGNvbHVtbkVsZW1l bnQgPSBjb2x1bW4uZWxlbWVudDsKLSAgICAgICAgcmV0dXJuICFjb2x1bW5FbGVtZW50LmhpZGRl bjsKLSAgICB9LAotCi0gICAgc2hvd0NvbHVtbjogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllcikK LSAgICB7Ci0gICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmll cl07Ci0gICAgICAgIHZhciBjb2x1bW5FbGVtZW50ID0gY29sdW1uLmVsZW1lbnQ7Ci0gICAgICAg IGlmICghY29sdW1uRWxlbWVudC5oaWRkZW4pCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAg ICAgY29sdW1uRWxlbWVudC5oaWRkZW4gPSBmYWxzZTsKLSAgICAgICAgY29sdW1uRWxlbWVudC5y ZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLQotICAgICAgICB2YXIgY29sdW1uQm9keUVsZW1l bnQgPSBjb2x1bW4uYm9keUVsZW1lbnQ7Ci0gICAgICAgIGNvbHVtbkJvZHlFbGVtZW50LmhpZGRl biA9IGZhbHNlOwotICAgICAgICBjb2x1bW5Cb2R5RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJo aWRkZW4iKTsKKyAgICAgICAgcmV0dXJuICF0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl0u aGlkZGVuOwogICAgIH0sCiAKLSAgICBoaWRlQ29sdW1uOiBmdW5jdGlvbihjb2x1bW5JZGVudGlm aWVyKQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjb2x1bW5JZGVudGlmaWVyCisg ICAgICogQHBhcmFtIHtib29sZWFufSB2aXNpYmxlCisgICAgICovCisgICAgc2V0Q29sdW1uVmlz aWJsZTogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllciwgdmlzaWJsZSkKICAgICB7Ci0gICAgICAg IHZhciBjb2x1bW4gPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07Ci0gICAgICAgIHZh ciBjb2x1bW5FbGVtZW50ID0gY29sdW1uLmVsZW1lbnQ7Ci0gICAgICAgIGlmIChjb2x1bW5FbGVt ZW50LmhpZGRlbikKKyAgICAgICAgaWYgKHZpc2libGUgPT09ICF0aGlzLmNvbHVtbnNbY29sdW1u SWRlbnRpZmllcl0uaGlkZGVuKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBv bGRXaWR0aCA9IHBhcnNlRmxvYXQoY29sdW1uRWxlbWVudC5zdHlsZS53aWR0aCk7Ci0KLSAgICAg ICAgY29sdW1uRWxlbWVudC5oaWRkZW4gPSB0cnVlOwotICAgICAgICBjb2x1bW5FbGVtZW50LmFk ZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICBjb2x1bW5FbGVtZW50LnN0eWxlLndpZHRo ID0gMDsKLQotICAgICAgICB2YXIgY29sdW1uQm9keUVsZW1lbnQgPSBjb2x1bW4uYm9keUVsZW1l bnQ7Ci0gICAgICAgIGNvbHVtbkJvZHlFbGVtZW50LmhpZGRlbiA9IHRydWU7Ci0gICAgICAgIGNv bHVtbkJvZHlFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICBjb2x1bW5C b2R5RWxlbWVudC5zdHlsZS53aWR0aCA9IDA7Ci0KLSAgICAgICAgdGhpcy5fY29sdW1uV2lkdGhz SW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5jb2x1bW5zW2NvbHVtbklkZW50aWZp ZXJdLmhpZGRlbiA9ICF2aXNpYmxlOworICAgICAgICBpZiAodmlzaWJsZSkKKyAgICAgICAgICAg IHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRlLSIgKyBjb2x1bW5JZGVudGlmaWVy ICsgIi1jb2x1bW4iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFk ZFN0eWxlQ2xhc3MoImhpZGUtIiArIGNvbHVtbklkZW50aWZpZXIgKyAiLWNvbHVtbiIpOwogICAg IH0sCiAKICAgICBnZXQgc2Nyb2xsQ29udGFpbmVyKCkKQEAgLTY3NSw4ICs2NTIsNyBAQCBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gaXQgaXMgbm90 IHBvc3NpYmxlIHRvIHF1ZXJ5IGEgY29sdW1uIGZvciBpdHMgd2lkdGguCiAgICAgICAgICAgICBs ZWZ0ICs9IHRoaXMuaGVhZGVyVGFibGVCb2R5LnJvd3NbMF0uY2VsbHNbaV0ub2Zmc2V0V2lkdGg7 CiAKLSAgICAgICAgICAgIHZhciBjb2x1bW5Jc1Zpc2libGUgPSAhdGhpcy5faGVhZGVyVGFibGVD b2x1bW5Hcm91cC5jaGlsZHJlbltpXS5oaWRkZW47Ci0gICAgICAgICAgICBpZiAoY29sdW1uSXNW aXNpYmxlKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX2NvbHVtbnNBcnJheVtpXS5oaWRkZW4p IHsKICAgICAgICAgICAgICAgICByZXNpemVyLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJkaXNwbGF5 Iik7CiAgICAgICAgICAgICAgICAgcmVzaXplci5zdHlsZS5sZWZ0ID0gbGVmdCArICJweCI7CiAg ICAgICAgICAgICAgICAgcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRCA9IGk7CkBAIC05 OTgsNiArOTc0LDE1IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxsSW5kZXhd LnN0eWxlLndpZHRoID0gIHBlcmNlbnRSaWdodENvbHVtbjsKICAgICAgICAgdGhpcy5fZGF0YVRh YmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxsSW5kZXhdLnN0eWxlLndpZHRoID0gcGVy Y2VudFJpZ2h0Q29sdW1uOwogCisgICAgICAgIHZhciBsZWZ0Q29sdW1uID0gdGhpcy5fY29sdW1u c0FycmF5W2xlZnRDZWxsSW5kZXhdOworICAgICAgICB2YXIgcmlnaHRDb2x1bW4gPSB0aGlzLl9j b2x1bW5zQXJyYXlbcmlnaHRDZWxsSW5kZXhdOworICAgICAgICBpZiAobGVmdENvbHVtbi53ZWln aHQgfHwgcmlnaHRDb2x1bW4ud2VpZ2h0KSB7CisgICAgICAgICAgICB2YXIgc3VtT2ZXZWlnaHRz ID0gbGVmdENvbHVtbi53ZWlnaHQgKyByaWdodENvbHVtbi53ZWlnaHQ7CisgICAgICAgICAgICB2 YXIgZGVsdGEgPSByaWdodEVkZ2VPZk5leHRDb2x1bW4gLSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1 bW47CisgICAgICAgICAgICBsZWZ0Q29sdW1uLndlaWdodCA9IChkcmFnUG9pbnQgLSBsZWZ0RWRn ZU9mUHJldmlvdXNDb2x1bW4pICogc3VtT2ZXZWlnaHRzIC8gZGVsdGE7CisgICAgICAgICAgICBy aWdodENvbHVtbi53ZWlnaHQgPSAocmlnaHRFZGdlT2ZOZXh0Q29sdW1uIC0gZHJhZ1BvaW50KSAq IHN1bU9mV2VpZ2h0cyAvIGRlbHRhOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5fcG9zaXRp b25SZXNpemVycygpOwogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygid2lkdGggY2hhbmdlZCIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCBl MzZiZjAwNmQ2MTkyZmJiNjI0NDFhNjBkNjhjNjdmZTdjOTAxNTJiLi4zOTBlYWJmOGZmMzljZjA4 ZTkzZGRlNTZhYzhkYjFmNDM3ZmVjODZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMTU0LDQxICsxNTQsNDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICBfY3JlYXRlVGFibGU6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBjb2x1bW5zID0ge25hbWU6IHt9LCBtZXRo b2Q6IHt9LCBzdGF0dXM6IHt9LCB0eXBlOiB7fSwgaW5pdGlhdG9yOiB7fSwgc2l6ZToge30sIHRp bWU6IHt9LCB0aW1lbGluZToge319OworICAgICAgICB0aGlzLl9kZXRhaWxlZFZpZXdDb2x1bW5z U2V0ID0ge21ldGhvZDogdHJ1ZSwgc3RhdHVzOiB0cnVlLCB0eXBlOiB0cnVlLCBpbml0aWF0b3I6 IHRydWUsIHNpemU6IHRydWUsIHRpbWU6IHRydWV9OwogCiAgICAgICAgIGNvbHVtbnMubmFtZS50 aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZyYWdtZW50KFdlYkluc3BlY3Rvci5V SVN0cmluZygiTmFtZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdGgiKSk7CisgICAgICAg IGNvbHVtbnMubmFtZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIik7CiAgICAg ICAgIGNvbHVtbnMubmFtZS5zb3J0YWJsZSA9IHRydWU7Ci0gICAgICAgIGNvbHVtbnMubmFtZS53 aWR0aCA9ICIyMCUiOworICAgICAgICBjb2x1bW5zLm5hbWUud2VpZ2h0ID0gMjA7CiAgICAgICAg IGNvbHVtbnMubmFtZS5kaXNjbG9zdXJlID0gdHJ1ZTsKIAogICAgICAgICBjb2x1bW5zLm1ldGhv ZC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTWV0aG9kIik7CiAgICAgICAgIGNvbHVt bnMubWV0aG9kLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICAgICAgY29sdW1ucy5tZXRob2Qud2lkdGgg PSAiNiUiOworICAgICAgICBjb2x1bW5zLm1ldGhvZC53ZWlnaHQgPSA2OwogCiAgICAgICAgIGNv bHVtbnMuc3RhdHVzLnRpdGxlRE9NRnJhZ21lbnQgPSB0aGlzLl9tYWtlSGVhZGVyRnJhZ21lbnQo V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGF0dXMiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU ZXh0IikpOworICAgICAgICBjb2x1bW5zLnN0YXR1cy5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJTdGF0dXMiKTsKICAgICAgICAgY29sdW1ucy5zdGF0dXMuc29ydGFibGUgPSB0cnVlOwot ICAgICAgICBjb2x1bW5zLnN0YXR1cy53aWR0aCA9ICI2JSI7CisgICAgICAgIGNvbHVtbnMuc3Rh dHVzLndlaWdodCA9IDY7CiAKICAgICAgICAgY29sdW1ucy50eXBlLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJUeXBlIik7CiAgICAgICAgIGNvbHVtbnMudHlwZS5zb3J0YWJsZSA9IHRy dWU7Ci0gICAgICAgIGNvbHVtbnMudHlwZS53aWR0aCA9ICI2JSI7CisgICAgICAgIGNvbHVtbnMu dHlwZS53ZWlnaHQgPSA2OwogCiAgICAgICAgIGNvbHVtbnMuaW5pdGlhdG9yLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJJbml0aWF0b3IiKTsKICAgICAgICAgY29sdW1ucy5pbml0aWF0 b3Iuc29ydGFibGUgPSB0cnVlOwotICAgICAgICBjb2x1bW5zLmluaXRpYXRvci53aWR0aCA9ICIx MCUiOworICAgICAgICBjb2x1bW5zLmluaXRpYXRvci53ZWlnaHQgPSAxMDsKIAogICAgICAgICBj b2x1bW5zLnNpemUudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VIZWFkZXJGcmFnbWVudChX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb250 ZW50IikpOworICAgICAgICBjb2x1bW5zLnNpemUubmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2l6ZSIpOwogICAgICAgICBjb2x1bW5zLnNpemUuc29ydGFibGUgPSB0cnVlOwotICAgICAg ICBjb2x1bW5zLnNpemUud2lkdGggPSAiNiUiOworICAgICAgICBjb2x1bW5zLnNpemUud2VpZ2h0 ID0gNjsKICAgICAgICAgY29sdW1ucy5zaXplLmFsaWduZWQgPSAicmlnaHQiOwogCiAgICAgICAg IGNvbHVtbnMudGltZS50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZyYWdtZW50 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxh dGVuY3kiKSk7CisgICAgICAgIGNvbHVtbnMudGltZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJUaW1lIik7CiAgICAgICAgIGNvbHVtbnMudGltZS5zb3J0YWJsZSA9IHRydWU7Ci0gICAg ICAgIGNvbHVtbnMudGltZS53aWR0aCA9ICI2JSI7CisgICAgICAgIGNvbHVtbnMudGltZS53ZWln aHQgPSA2OwogICAgICAgICBjb2x1bW5zLnRpbWUuYWxpZ25lZCA9ICJyaWdodCI7CiAKICAgICAg ICAgY29sdW1ucy50aW1lbGluZS50aXRsZSA9ICIiOworICAgICAgICBjb2x1bW5zLnRpbWVsaW5l Lm5hbWUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVsaW5lIik7CiAgICAgICAgIGNvbHVt bnMudGltZWxpbmUuc29ydGFibGUgPSBmYWxzZTsKLSAgICAgICAgY29sdW1ucy50aW1lbGluZS53 aWR0aCA9ICI0MCUiOworICAgICAgICBjb2x1bW5zLnRpbWVsaW5lLndlaWdodCA9IDQwOwogICAg ICAgICBjb2x1bW5zLnRpbWVsaW5lLnNvcnQgPSAiYXNjZW5kaW5nIjsKIAogICAgICAgICB0aGlz Ll9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CkBAIC04NTYs NDUgKzg2MiwxNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlLnNlbGVjdGVkID0gZmFsc2U7 CiAKICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImJyaWVmLW1vZGUiKTsK LQotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1uKCJtZXRob2QiKTsKLSAgICAgICAg dGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigic3RhdHVzIik7Ci0gICAgICAgIHRoaXMuX2RhdGFH cmlkLnNob3dDb2x1bW4oInR5cGUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVt bigiaW5pdGlhdG9yIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3dDb2x1bW4oInNpemUi KTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigidGltZSIpOwotICAgICAgICB0 aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1uKCJ0aW1lbGluZSIpOwotCi0gICAgICAgIHZhciB3aWR0 aHMgPSB7fTsKLSAgICAgICAgd2lkdGhzLm5hbWUgPSAyMDsKLSAgICAgICAgd2lkdGhzLm1ldGhv ZCA9IDY7Ci0gICAgICAgIHdpZHRocy5zdGF0dXMgPSA2OwotICAgICAgICB3aWR0aHMudHlwZSA9 IDY7Ci0gICAgICAgIHdpZHRocy5pbml0aWF0b3IgPSAxMDsKLSAgICAgICAgd2lkdGhzLnNpemUg PSA2OwotICAgICAgICB3aWR0aHMudGltZSA9IDY7Ci0gICAgICAgIHdpZHRocy50aW1lbGluZSA9 IDQwOwotCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmFwcGx5Q29sdW1uV2lkdGhzTWFwKHdpZHRo cyk7CisgICAgICAgIHRoaXMuX2RldGFpbGVkTW9kZSA9IHRydWU7CisgICAgICAgIHRoaXMuX3Vw ZGF0ZUNvbHVtbnMoKTsKICAgICB9LAogCiAgICAgc3dpdGNoVG9CcmllZlZpZXc6IGZ1bmN0aW9u KCkKICAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJicmllZi1tb2Rl Iik7CiAgICAgICAgIHRoaXMuX3JlbW92ZUFsbE5vZGVIaWdobGlnaHRzKCk7Ci0KLSAgICAgICAg dGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigibWV0aG9kIik7Ci0gICAgICAgIHRoaXMuX2RhdGFH cmlkLmhpZGVDb2x1bW4oInN0YXR1cyIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRlQ29s dW1uKCJ0eXBlIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oImluaXRpYXRv ciIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRlQ29sdW1uKCJzaXplIik7Ci0gICAgICAg IHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oInRpbWUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdy aWQuaGlkZUNvbHVtbigidGltZWxpbmUiKTsKLQotICAgICAgICB2YXIgd2lkdGhzID0ge307Ci0g ICAgICAgIHdpZHRocy5uYW1lID0gMTAwOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5hcHBseUNv bHVtbldpZHRoc01hcCh3aWR0aHMpOwotCisgICAgICAgIHRoaXMuX2RldGFpbGVkTW9kZSA9IGZh bHNlOworICAgICAgICB0aGlzLl91cGRhdGVDb2x1bW5zKCk7CiAgICAgICAgIHRoaXMuX3BvcG92 ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKICAgICB9LAogCkBAIC05NjcsOSArOTQ0LDM5IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBm cmFtZXNUYWJsZTsKICAgICB9LAogCisgICAgX3VwZGF0ZUNvbHVtbnM6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHZhciBkZXRhaWxlZE1vZGUgPSAhIXRoaXMuX2RldGFpbGVkTW9kZTsKKyAg ICAgICAgZm9yICh2YXIgY29sdW1uSWRlbnRpZmllciBpbiB0aGlzLl9kZXRhaWxlZFZpZXdDb2x1 bW5zU2V0KSB7CisgICAgICAgICAgICB2YXIgdmlzaWJsZSA9IGRldGFpbGVkTW9kZSAmJiB0aGlz Ll9kZXRhaWxlZFZpZXdDb2x1bW5zU2V0W2NvbHVtbklkZW50aWZpZXJdOworICAgICAgICAgICAg dGhpcy5fZGF0YUdyaWQuc2V0Q29sdW1uVmlzaWJsZShjb2x1bW5JZGVudGlmaWVyLCB2aXNpYmxl KTsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9kYXRhR3JpZC5zZXRDb2x1bW5WaXNpYmxlKCJ0 aW1lbGluZSIsIGRldGFpbGVkTW9kZSk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFwcGx5Q29s dW1uV2VpZ2h0cygpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30g Y29sdW1uSWRlbnRpZmllcgorICAgICAqLworICAgIF90b2dnbGVDb2x1bW5WaXNpYmlsaXR5OiBm dW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgdGhpcy5fZGV0YWlsZWRW aWV3Q29sdW1uc1NldFtjb2x1bW5JZGVudGlmaWVyXSA9ICF0aGlzLl9kZXRhaWxlZFZpZXdDb2x1 bW5zU2V0W2NvbHVtbklkZW50aWZpZXJdOworICAgICAgICB0aGlzLl91cGRhdGVDb2x1bW5zKCk7 CisgICAgfSwKKwogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAg ICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50 KTsKKworICAgICAgICBpZiAodGhpcy5fZGV0YWlsZWRNb2RlICYmIGV2ZW50LnRhcmdldC5pc1Nl bGZPckRlc2NlbmRhbnQodGhpcy5fZGF0YUdyaWQuaGVhZGVyVGFibGVCb2R5KSkgeworICAgICAg ICAgICAgZm9yICh2YXIgY29sdW1uSWRlbnRpZmllciBpbiB0aGlzLl9kZXRhaWxlZFZpZXdDb2x1 bW5zU2V0KSB7CisgICAgICAgICAgICAgICAgdmFyIGNvbHVtbiA9IHRoaXMuX2RhdGFHcmlkLmNv bHVtbnNbY29sdW1uSWRlbnRpZmllcl07CisgICAgICAgICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kQ2hlY2tib3hJdGVtKGNvbHVtbi5uYW1lIHx8IGNvbHVtbi50aXRsZSwgdGhpcy5fdG9nZ2xl Q29sdW1uVmlzaWJpbGl0eS5iaW5kKHRoaXMsIGNvbHVtbklkZW50aWZpZXIpLCAhIXRoaXMuX2Rl dGFpbGVkVmlld0NvbHVtbnNTZXRbY29sdW1uSWRlbnRpZmllcl0pOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOworICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICB9CisKICAgICAgICAgdmFyIGdyaWROb2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWRO b2RlRnJvbU5vZGUoZXZlbnQudGFyZ2V0KTsKICAgICAgICAgdmFyIHJlcXVlc3QgPSBncmlkTm9k ZSAmJiBncmlkTm9kZS5fcmVxdWVzdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtMb2dWaWV3LmNzcwppbmRleCBkMWMxMGQyYmJmZmU0OTMz ZGE5NzcxZjg3MzgyMzMzZDY5MGMyYzBjLi5lZGNmN2UyZThhZDJhNjJkZTE4YjMyMjM0YTViMzlm M2FjNDk2MzEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L25ldHdvcmtMb2dWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL25ldHdvcmtMb2dWaWV3LmNzcwpAQCAtNTU3LDMgKzU1NywxMiBAQAogI25ldHdvcmstY29u dGFpbmVyLmJyaWVmLW1vZGUgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgewogICAgIHBhZGRp bmctcmlnaHQ6IDA7CiB9CisKKyNuZXR3b3JrLWNvbnRhaW5lciAuaGlkZS1tZXRob2QtY29sdW1u IC5tZXRob2QtY29sdW1uLAorI25ldHdvcmstY29udGFpbmVyIC5oaWRlLXN0YXR1cy1jb2x1bW4g LnN0YXR1cy1jb2x1bW4sCisjbmV0d29yay1jb250YWluZXIgLmhpZGUtdHlwZS1jb2x1bW4gLnR5 cGUtY29sdW1uLAorI25ldHdvcmstY29udGFpbmVyIC5oaWRlLWluaXRpYXRvci1jb2x1bW4gLmlu aXRpYXRvci1jb2x1bW4sCisjbmV0d29yay1jb250YWluZXIgLmhpZGUtc2l6ZS1jb2x1bW4gLnNp emUtY29sdW1uLAorI25ldHdvcmstY29udGFpbmVyIC5oaWRlLXRpbWUtY29sdW1uIC50aW1lLWNv bHVtbiB7CisgICAgYm9yZGVyLXJpZ2h0OiAwIG5vbmUgdHJhbnNwYXJlbnQ7Cit9Cg== 180797 2012-12-27 06:30:26 -0800 2013-01-11 01:08:46 -0800 Patch bug-105739-20121227182737.patch text/plain 14771 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRmZWY0YTAzM2IxNThj ZTYxZDhhODZjNWEwYjhhNzA5NTBiY2M4ZC4uZWRmNzUyZWRjZWU0YmFkNDhiMmEwN2M2OTQyNDhj NmFlN2QwODFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTI1ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXNdIE1ha2UgZ3JpZCBjb2x1bW5zIHNldCBjb25maWd1cmFibGUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU3MzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjb250 ZXh0IG1lbnUgb24gZ3JpZCBoZWFkZXIgdG8gaGlkZS9zaG93IGdyaWQgY29sdW1ucy4KKyAgICAg ICAgSGlkZGVuIGNvbHVtbnMgc2V0IGlzIHBlcnNpc3RlZC4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIEZpeGVkIHNob3cvaGlkZSBiZWhhdmlv ciwgaW50cm9kdWNlZCB3ZWlnaHQgY29udHJvbC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgQWRkZWQgbWVtYmVyIHRvIHRyYWNrIHZpc2li aWxpdHkgb2YgY29sdW1ucyBpbiBkZXRhaWxlcmQgbW9kZS4gQWRkZWQKKyAgICAgICAgY29udGV4 dCBtZW51IGZvciBncmlkIGhlYWRlci4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL25l dHdvcmtMb2dWaWV3LmNzczogQWRkZWQgY2xhc3NlcyB1c2VkIHRvIG1ha2UKKyAgICAgICAgaGlk ZGVuIGNvbHVtbnMgY29tcGxldGVseSBpbnZpc2libGUuCisKIDIwMTItMTItMjYgIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbVGV4bWFwXSBJbnN0ZWFkIG9m IGhhdmluZyBtdWx0aXBsZSBzaGFkZXJzIHNvdXJjZXMgd2l0aCBsb3RzIG9mIGR1cGxpY2F0aW9u LCB3ZSBzaG91bGQgaGF2ZSBvbmUgc2hhZGVyIHNvdXJjZSB3aXRoIE1BQ1JPIHZhcmlhbnRzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcwppbmRleCA1 MGQwNDY0OGM5OTk2MGYwYWM2ODZhZTNlZTFjMmMxMGJiNTE1MWY0Li41MTM0MTYxNGUyY2E5YmJl NGQ3ZTNhNjdiZGJmNzM5Mjk4Y2FmNjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGF0YUdyaWQuanMKQEAgLTU2Niw3MSArNTY2LDQ4IEBAIFdlYkluc3BlY3Rv ci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKCJ3aWR0aCBjaGFuZ2VkIik7CiAgICAgfSwKIAotICAgIGNvbHVtbldpZHRoc01hcDog ZnVuY3Rpb24oKQorICAgIGFwcGx5Q29sdW1uV2VpZ2h0czogZnVuY3Rpb24oKQogICAgIHsKLSAg ICAgICAgdmFyIHJlc3VsdCA9IHt9OwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMu X2NvbHVtbnNBcnJheS5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIHdpZHRoID0gdGhp cy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltpXS5zdHlsZS53aWR0aDsKLSAgICAg ICAgICAgIHJlc3VsdFt0aGlzLl9jb2x1bW5zQXJyYXlbaV0uY29sdW1uSWRlbnRpZmllcl0gPSBw YXJzZUZsb2F0KHdpZHRoKTsKKyAgICAgICAgdmFyIHN1bU9mV2VpZ2h0cyA9IDAuMDsKKyAgICAg ICAgZm9yICh2YXIgY29sdW1uSWRlbnRpZmllciBpbiB0aGlzLmNvbHVtbnMpIHsKKyAgICAgICAg ICAgIGlmICh0aGlzLmlzQ29sdW1uVmlzaWJsZShjb2x1bW5JZGVudGlmaWVyKSkKKyAgICAgICAg ICAgICAgICBzdW1PZldlaWdodHMgKz0gdGhpcy5jb2x1bW5zW2NvbHVtbklkZW50aWZpZXJdLndl aWdodDsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0sCisgICAgICAg IHZhciBmYWN0b3IgPSAxMDAgLyBzdW1PZldlaWdodHM7CiAKLSAgICBhcHBseUNvbHVtbldpZHRo c01hcDogZnVuY3Rpb24oY29sdW1uV2lkdGhzTWFwKQotICAgIHsKICAgICAgICAgZm9yICh2YXIg Y29sdW1uSWRlbnRpZmllciBpbiB0aGlzLmNvbHVtbnMpIHsKICAgICAgICAgICAgIHZhciBjb2x1 bW4gPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07Ci0gICAgICAgICAgICB2YXIgd2lk dGggPSAoY29sdW1uV2lkdGhzTWFwW2NvbHVtbklkZW50aWZpZXJdIHx8IDApICsgIiUiOworICAg ICAgICAgICAgdmFyIHdpZHRoID0gdGhpcy5pc0NvbHVtblZpc2libGUoY29sdW1uSWRlbnRpZmll cikgPyAoKGZhY3RvciAqIGNvbHVtbi53ZWlnaHQpICsgIiUiKTogIjAlIjsKICAgICAgICAgICAg IHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bY29sdW1uLm9yZGluYWxdLnN0 eWxlLndpZHRoID0gd2lkdGg7CiAgICAgICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91 cC5jaGlsZHJlbltjb2x1bW4ub3JkaW5hbF0uc3R5bGUud2lkdGggPSB3aWR0aDsKICAgICAgICAg fQogCi0gICAgICAgIC8vIE5vcm1hbGl6ZSB3aWR0aHMKLSAgICAgICAgZGVsZXRlIHRoaXMuX2Nv bHVtbldpZHRoc0luaXRpYWxpemVkOwotICAgICAgICB0aGlzLnVwZGF0ZVdpZHRocygpOworICAg ICAgICB0aGlzLl9wb3NpdGlvblJlc2l6ZXJzKCk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKCJ3aWR0aCBjaGFuZ2VkIik7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAq IEBwYXJhbSB7c3RyaW5nfSBjb2x1bW5JZGVudGlmaWVyCisgICAgICovCiAgICAgaXNDb2x1bW5W aXNpYmxlOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgdmFyIGNv bHVtbiA9IHRoaXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXTsKLSAgICAgICAgdmFyIGNvbHVt bkVsZW1lbnQgPSBjb2x1bW4uZWxlbWVudDsKLSAgICAgICAgcmV0dXJuICFjb2x1bW5FbGVtZW50 LmhpZGRlbjsKLSAgICB9LAotCi0gICAgc2hvd0NvbHVtbjogZnVuY3Rpb24oY29sdW1uSWRlbnRp ZmllcikKLSAgICB7Ci0gICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRl bnRpZmllcl07Ci0gICAgICAgIHZhciBjb2x1bW5FbGVtZW50ID0gY29sdW1uLmVsZW1lbnQ7Ci0g ICAgICAgIGlmICghY29sdW1uRWxlbWVudC5oaWRkZW4pCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgY29sdW1uRWxlbWVudC5oaWRkZW4gPSBmYWxzZTsKLSAgICAgICAgY29sdW1uRWxl bWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLQotICAgICAgICB2YXIgY29sdW1uQm9k eUVsZW1lbnQgPSBjb2x1bW4uYm9keUVsZW1lbnQ7Ci0gICAgICAgIGNvbHVtbkJvZHlFbGVtZW50 LmhpZGRlbiA9IGZhbHNlOwotICAgICAgICBjb2x1bW5Cb2R5RWxlbWVudC5yZW1vdmVTdHlsZUNs YXNzKCJoaWRkZW4iKTsKKyAgICAgICAgcmV0dXJuICF0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRp Zmllcl0uaGlkZGVuOwogICAgIH0sCiAKLSAgICBoaWRlQ29sdW1uOiBmdW5jdGlvbihjb2x1bW5J ZGVudGlmaWVyKQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjb2x1bW5JZGVudGlm aWVyCisgICAgICogQHBhcmFtIHtib29sZWFufSB2aXNpYmxlCisgICAgICovCisgICAgc2V0Q29s dW1uVmlzaWJsZTogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllciwgdmlzaWJsZSkKICAgICB7Ci0g ICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07Ci0gICAg ICAgIHZhciBjb2x1bW5FbGVtZW50ID0gY29sdW1uLmVsZW1lbnQ7Ci0gICAgICAgIGlmIChjb2x1 bW5FbGVtZW50LmhpZGRlbikKKyAgICAgICAgaWYgKHZpc2libGUgPT09ICF0aGlzLmNvbHVtbnNb Y29sdW1uSWRlbnRpZmllcl0uaGlkZGVuKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAg IHZhciBvbGRXaWR0aCA9IHBhcnNlRmxvYXQoY29sdW1uRWxlbWVudC5zdHlsZS53aWR0aCk7Ci0K LSAgICAgICAgY29sdW1uRWxlbWVudC5oaWRkZW4gPSB0cnVlOwotICAgICAgICBjb2x1bW5FbGVt ZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICBjb2x1bW5FbGVtZW50LnN0eWxl LndpZHRoID0gMDsKLQotICAgICAgICB2YXIgY29sdW1uQm9keUVsZW1lbnQgPSBjb2x1bW4uYm9k eUVsZW1lbnQ7Ci0gICAgICAgIGNvbHVtbkJvZHlFbGVtZW50LmhpZGRlbiA9IHRydWU7Ci0gICAg ICAgIGNvbHVtbkJvZHlFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICBj b2x1bW5Cb2R5RWxlbWVudC5zdHlsZS53aWR0aCA9IDA7Ci0KLSAgICAgICAgdGhpcy5fY29sdW1u V2lkdGhzSW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5jb2x1bW5zW2NvbHVtbklk ZW50aWZpZXJdLmhpZGRlbiA9ICF2aXNpYmxlOworICAgICAgICBpZiAodmlzaWJsZSkKKyAgICAg ICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRlLSIgKyBjb2x1bW5JZGVu dGlmaWVyICsgIi1jb2x1bW4iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5lbGVt ZW50LmFkZFN0eWxlQ2xhc3MoImhpZGUtIiArIGNvbHVtbklkZW50aWZpZXIgKyAiLWNvbHVtbiIp OwogICAgIH0sCiAKICAgICBnZXQgc2Nyb2xsQ29udGFpbmVyKCkKQEAgLTY3NSw4ICs2NTIsNyBA QCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gaXQg aXMgbm90IHBvc3NpYmxlIHRvIHF1ZXJ5IGEgY29sdW1uIGZvciBpdHMgd2lkdGguCiAgICAgICAg ICAgICBsZWZ0ICs9IHRoaXMuaGVhZGVyVGFibGVCb2R5LnJvd3NbMF0uY2VsbHNbaV0ub2Zmc2V0 V2lkdGg7CiAKLSAgICAgICAgICAgIHZhciBjb2x1bW5Jc1Zpc2libGUgPSAhdGhpcy5faGVhZGVy VGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltpXS5oaWRkZW47Ci0gICAgICAgICAgICBpZiAoY29s dW1uSXNWaXNpYmxlKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX2NvbHVtbnNBcnJheVtpXS5o aWRkZW4pIHsKICAgICAgICAgICAgICAgICByZXNpemVyLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJk aXNwbGF5Iik7CiAgICAgICAgICAgICAgICAgcmVzaXplci5zdHlsZS5sZWZ0ID0gbGVmdCArICJw eCI7CiAgICAgICAgICAgICAgICAgcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRCA9IGk7 CkBAIC05OTgsNiArOTc0LDE1IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxs SW5kZXhdLnN0eWxlLndpZHRoID0gIHBlcmNlbnRSaWdodENvbHVtbjsKICAgICAgICAgdGhpcy5f ZGF0YVRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxsSW5kZXhdLnN0eWxlLndpZHRo ID0gcGVyY2VudFJpZ2h0Q29sdW1uOwogCisgICAgICAgIHZhciBsZWZ0Q29sdW1uID0gdGhpcy5f Y29sdW1uc0FycmF5W2xlZnRDZWxsSW5kZXhdOworICAgICAgICB2YXIgcmlnaHRDb2x1bW4gPSB0 aGlzLl9jb2x1bW5zQXJyYXlbcmlnaHRDZWxsSW5kZXhdOworICAgICAgICBpZiAobGVmdENvbHVt bi53ZWlnaHQgfHwgcmlnaHRDb2x1bW4ud2VpZ2h0KSB7CisgICAgICAgICAgICB2YXIgc3VtT2ZX ZWlnaHRzID0gbGVmdENvbHVtbi53ZWlnaHQgKyByaWdodENvbHVtbi53ZWlnaHQ7CisgICAgICAg ICAgICB2YXIgZGVsdGEgPSByaWdodEVkZ2VPZk5leHRDb2x1bW4gLSBsZWZ0RWRnZU9mUHJldmlv dXNDb2x1bW47CisgICAgICAgICAgICBsZWZ0Q29sdW1uLndlaWdodCA9IChkcmFnUG9pbnQgLSBs ZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4pICogc3VtT2ZXZWlnaHRzIC8gZGVsdGE7CisgICAgICAg ICAgICByaWdodENvbHVtbi53ZWlnaHQgPSAocmlnaHRFZGdlT2ZOZXh0Q29sdW1uIC0gZHJhZ1Bv aW50KSAqIHN1bU9mV2VpZ2h0cyAvIGRlbHRhOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5f cG9zaXRpb25SZXNpemVycygpOwogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygid2lkdGggY2hhbmdlZCIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpp bmRleCAwOGQxZTUwMGNkOTNmMDJmNmU5Y2YzOGM2NmJkYTc3NTdjZWVjYTU2Li5iZDk5ZTQwOTNk MThlZDA1Zjg0Y2Q4ZGFlN2U3ZDc5ZGUyNzY3YzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMTU0LDQxICsxNTQsNTMg QEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICBfY3JlYXRl VGFibGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBjb2x1bW5zID0ge25hbWU6IHt9 LCBtZXRob2Q6IHt9LCBzdGF0dXM6IHt9LCB0eXBlOiB7fSwgaW5pdGlhdG9yOiB7fSwgc2l6ZTog e30sIHRpbWU6IHt9LCB0aW1lbGluZToge319OworICAgICAgICB0aGlzLl9kZXRhaWxlZFZpZXdD b2x1bW5zU2V0ID0ge21ldGhvZDogdHJ1ZSwgc3RhdHVzOiB0cnVlLCB0eXBlOiB0cnVlLCBpbml0 aWF0b3I6IHRydWUsIHNpemU6IHRydWUsIHRpbWU6IHRydWV9OworICAgICAgICB2YXIgaGlkZGVu Q29sdW1ucyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5oaWRkZW5OZXR3b3JrTG9nQ29sdW1ucy5n ZXQoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBoaWRkZW5Db2x1bW5zLmxlbmd0aDsg KytpKSB7CisgICAgICAgICAgICB2YXIgY29sdW1uSWRlbnRpZmllciA9IGhpZGRlbkNvbHVtbnNb aV07CisgICAgICAgICAgICBpZiAodGhpcy5fZGV0YWlsZWRWaWV3Q29sdW1uc1NldFtoaWRkZW5D b2x1bW5zW2ldXSkKKyAgICAgICAgICAgICAgICB0aGlzLl9kZXRhaWxlZFZpZXdDb2x1bW5zU2V0 W2hpZGRlbkNvbHVtbnNbaV1dID0gZmFsc2U7CisgICAgICAgIH0KIAogICAgICAgICBjb2x1bW5z Lm5hbWUudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VIZWFkZXJGcmFnbWVudChXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIk5hbWUiKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXRoIikpOwor ICAgICAgICBjb2x1bW5zLm5hbWUubmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTmFtZSIp OwogICAgICAgICBjb2x1bW5zLm5hbWUuc29ydGFibGUgPSB0cnVlOwotICAgICAgICBjb2x1bW5z Lm5hbWUud2lkdGggPSAiMjAlIjsKKyAgICAgICAgY29sdW1ucy5uYW1lLndlaWdodCA9IDIwOwog ICAgICAgICBjb2x1bW5zLm5hbWUuZGlzY2xvc3VyZSA9IHRydWU7CiAKICAgICAgICAgY29sdW1u cy5tZXRob2QudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1ldGhvZCIpOwogICAgICAg ICBjb2x1bW5zLm1ldGhvZC5zb3J0YWJsZSA9IHRydWU7Ci0gICAgICAgIGNvbHVtbnMubWV0aG9k LndpZHRoID0gIjYlIjsKKyAgICAgICAgY29sdW1ucy5tZXRob2Qud2VpZ2h0ID0gNjsKIAogICAg ICAgICBjb2x1bW5zLnN0YXR1cy50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZy YWdtZW50KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhdHVzIiksIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiVGV4dCIpKTsKKyAgICAgICAgY29sdW1ucy5zdGF0dXMubmFtZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU3RhdHVzIik7CiAgICAgICAgIGNvbHVtbnMuc3RhdHVzLnNvcnRhYmxlID0g dHJ1ZTsKLSAgICAgICAgY29sdW1ucy5zdGF0dXMud2lkdGggPSAiNiUiOworICAgICAgICBjb2x1 bW5zLnN0YXR1cy53ZWlnaHQgPSA2OwogCiAgICAgICAgIGNvbHVtbnMudHlwZS50aXRsZSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiVHlwZSIpOwogICAgICAgICBjb2x1bW5zLnR5cGUuc29ydGFi bGUgPSB0cnVlOwotICAgICAgICBjb2x1bW5zLnR5cGUud2lkdGggPSAiNiUiOworICAgICAgICBj b2x1bW5zLnR5cGUud2VpZ2h0ID0gNjsKIAogICAgICAgICBjb2x1bW5zLmluaXRpYXRvci50aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSW5pdGlhdG9yIik7CiAgICAgICAgIGNvbHVtbnMu aW5pdGlhdG9yLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICAgICAgY29sdW1ucy5pbml0aWF0b3Iud2lk dGggPSAiMTAlIjsKKyAgICAgICAgY29sdW1ucy5pbml0aWF0b3Iud2VpZ2h0ID0gMTA7CiAKICAg ICAgICAgY29sdW1ucy5zaXplLnRpdGxlRE9NRnJhZ21lbnQgPSB0aGlzLl9tYWtlSGVhZGVyRnJh Z21lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiQ29udGVudCIpKTsKKyAgICAgICAgY29sdW1ucy5zaXplLm5hbWUgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlNpemUiKTsKICAgICAgICAgY29sdW1ucy5zaXplLnNvcnRhYmxlID0gdHJ1ZTsK LSAgICAgICAgY29sdW1ucy5zaXplLndpZHRoID0gIjYlIjsKKyAgICAgICAgY29sdW1ucy5zaXpl LndlaWdodCA9IDY7CiAgICAgICAgIGNvbHVtbnMuc2l6ZS5hbGlnbmVkID0gInJpZ2h0IjsKIAog ICAgICAgICBjb2x1bW5zLnRpbWUudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VIZWFkZXJG cmFnbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSwgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJMYXRlbmN5IikpOworICAgICAgICBjb2x1bW5zLnRpbWUubmFtZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiVGltZSIpOwogICAgICAgICBjb2x1bW5zLnRpbWUuc29ydGFibGUgPSB0cnVl OwotICAgICAgICBjb2x1bW5zLnRpbWUud2lkdGggPSAiNiUiOworICAgICAgICBjb2x1bW5zLnRp bWUud2VpZ2h0ID0gNjsKICAgICAgICAgY29sdW1ucy50aW1lLmFsaWduZWQgPSAicmlnaHQiOwog CiAgICAgICAgIGNvbHVtbnMudGltZWxpbmUudGl0bGUgPSAiIjsKKyAgICAgICAgY29sdW1ucy50 aW1lbGluZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpOwogICAgICAg ICBjb2x1bW5zLnRpbWVsaW5lLnNvcnRhYmxlID0gZmFsc2U7Ci0gICAgICAgIGNvbHVtbnMudGlt ZWxpbmUud2lkdGggPSAiNDAlIjsKKyAgICAgICAgY29sdW1ucy50aW1lbGluZS53ZWlnaHQgPSA0 MDsKICAgICAgICAgY29sdW1ucy50aW1lbGluZS5zb3J0ID0gImFzY2VuZGluZyI7CiAKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMpOwpA QCAtODU2LDQ1ICs4NjgsMTYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZS5zZWxlY3RlZCA9 IGZhbHNlOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJicmllZi1t b2RlIik7Ci0KLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigibWV0aG9kIik7Ci0g ICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3dDb2x1bW4oInN0YXR1cyIpOwotICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zaG93Q29sdW1uKCJ0eXBlIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNo b3dDb2x1bW4oImluaXRpYXRvciIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1u KCJzaXplIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3dDb2x1bW4oInRpbWUiKTsKLSAg ICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigidGltZWxpbmUiKTsKLQotICAgICAgICB2 YXIgd2lkdGhzID0ge307Ci0gICAgICAgIHdpZHRocy5uYW1lID0gMjA7Ci0gICAgICAgIHdpZHRo cy5tZXRob2QgPSA2OwotICAgICAgICB3aWR0aHMuc3RhdHVzID0gNjsKLSAgICAgICAgd2lkdGhz LnR5cGUgPSA2OwotICAgICAgICB3aWR0aHMuaW5pdGlhdG9yID0gMTA7Ci0gICAgICAgIHdpZHRo cy5zaXplID0gNjsKLSAgICAgICAgd2lkdGhzLnRpbWUgPSA2OwotICAgICAgICB3aWR0aHMudGlt ZWxpbmUgPSA0MDsKLQotICAgICAgICB0aGlzLl9kYXRhR3JpZC5hcHBseUNvbHVtbldpZHRoc01h cCh3aWR0aHMpOworICAgICAgICB0aGlzLl9kZXRhaWxlZE1vZGUgPSB0cnVlOworICAgICAgICB0 aGlzLl91cGRhdGVDb2x1bW5zKCk7CiAgICAgfSwKIAogICAgIHN3aXRjaFRvQnJpZWZWaWV3OiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiYnJp ZWYtbW9kZSIpOwogICAgICAgICB0aGlzLl9yZW1vdmVBbGxOb2RlSGlnaGxpZ2h0cygpOwotCi0g ICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oIm1ldGhvZCIpOwotICAgICAgICB0aGlz Ll9kYXRhR3JpZC5oaWRlQ29sdW1uKCJzdGF0dXMiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQu aGlkZUNvbHVtbigidHlwZSIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRlQ29sdW1uKCJp bml0aWF0b3IiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigic2l6ZSIpOwot ICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRlQ29sdW1uKCJ0aW1lIik7Ci0gICAgICAgIHRoaXMu X2RhdGFHcmlkLmhpZGVDb2x1bW4oInRpbWVsaW5lIik7Ci0KLSAgICAgICAgdmFyIHdpZHRocyA9 IHt9OwotICAgICAgICB3aWR0aHMubmFtZSA9IDEwMDsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQu YXBwbHlDb2x1bW5XaWR0aHNNYXAod2lkdGhzKTsKLQorICAgICAgICB0aGlzLl9kZXRhaWxlZE1v ZGUgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ29sdW1ucygpOwogICAgICAgICB0aGlz Ll9wb3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7CiAgICAgfSwKIApAQCAtOTY3LDkgKzk1MCw0 NiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gZnJhbWVzVGFibGU7CiAgICAgfSwKIAorICAgIF91cGRhdGVDb2x1bW5zOiBmdW5jdGlv bigpCisgICAgeworICAgICAgICB2YXIgZGV0YWlsZWRNb2RlID0gISF0aGlzLl9kZXRhaWxlZE1v ZGU7CisgICAgICAgIGZvciAodmFyIGNvbHVtbklkZW50aWZpZXIgaW4gdGhpcy5fZGV0YWlsZWRW aWV3Q29sdW1uc1NldCkgeworICAgICAgICAgICAgdmFyIHZpc2libGUgPSBkZXRhaWxlZE1vZGUg JiYgdGhpcy5fZGV0YWlsZWRWaWV3Q29sdW1uc1NldFtjb2x1bW5JZGVudGlmaWVyXTsKKyAgICAg ICAgICAgIHRoaXMuX2RhdGFHcmlkLnNldENvbHVtblZpc2libGUoY29sdW1uSWRlbnRpZmllciwg dmlzaWJsZSk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2V0Q29sdW1uVmlz aWJsZSgidGltZWxpbmUiLCBkZXRhaWxlZE1vZGUpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5h cHBseUNvbHVtbldlaWdodHMoKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtz dHJpbmd9IGNvbHVtbklkZW50aWZpZXIKKyAgICAgKi8KKyAgICBfdG9nZ2xlQ29sdW1uVmlzaWJp bGl0eTogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllcikKKyAgICB7CisgICAgICAgIHRoaXMuX2Rl dGFpbGVkVmlld0NvbHVtbnNTZXRbY29sdW1uSWRlbnRpZmllcl0gPSAhdGhpcy5fZGV0YWlsZWRW aWV3Q29sdW1uc1NldFtjb2x1bW5JZGVudGlmaWVyXTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ29s dW1ucygpOworCisgICAgICAgIHZhciBoaWRkZW5Db2x1bW5zID0gW10KKyAgICAgICAgZm9yICh2 YXIgY29sdW1uSWQgaW4gdGhpcy5fZGV0YWlsZWRWaWV3Q29sdW1uc1NldCkgeworICAgICAgICAg ICAgaWYgKCF0aGlzLl9kZXRhaWxlZFZpZXdDb2x1bW5zU2V0W2NvbHVtbklkXSkKKyAgICAgICAg ICAgICAgICBoaWRkZW5Db2x1bW5zLnB1c2goY29sdW1uSWQpOworICAgICAgICB9CisgICAgICAg IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5oaWRkZW5OZXR3b3JrTG9nQ29sdW1ucy5zZXQoaGlkZGVu Q29sdW1ucyk7CisgICAgfSwKKwogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRN ZW51KGV2ZW50KTsKKworICAgICAgICBpZiAodGhpcy5fZGV0YWlsZWRNb2RlICYmIGV2ZW50LnRh cmdldC5pc1NlbGZPckRlc2NlbmRhbnQodGhpcy5fZGF0YUdyaWQuaGVhZGVyVGFibGVCb2R5KSkg eworICAgICAgICAgICAgZm9yICh2YXIgY29sdW1uSWRlbnRpZmllciBpbiB0aGlzLl9kZXRhaWxl ZFZpZXdDb2x1bW5zU2V0KSB7CisgICAgICAgICAgICAgICAgdmFyIGNvbHVtbiA9IHRoaXMuX2Rh dGFHcmlkLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07CisgICAgICAgICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKGNvbHVtbi5uYW1lIHx8IGNvbHVtbi50aXRsZSwgdGhp cy5fdG9nZ2xlQ29sdW1uVmlzaWJpbGl0eS5iaW5kKHRoaXMsIGNvbHVtbklkZW50aWZpZXIpLCAh IXRoaXMuX2RldGFpbGVkVmlld0NvbHVtbnNTZXRbY29sdW1uSWRlbnRpZmllcl0pOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKICAgICAgICAgdmFyIGdyaWROb2RlID0gdGhpcy5fZGF0YUdyaWQu ZGF0YUdyaWROb2RlRnJvbU5vZGUoZXZlbnQudGFyZ2V0KTsKICAgICAgICAgdmFyIHJlcXVlc3Qg PSBncmlkTm9kZSAmJiBncmlkTm9kZS5fcmVxdWVzdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggMmViMzI0NjViMzAwMWVkMGJkOTRj M2Q0MTM5Mzg0ZmRkODYyNWI5ZS4uYmU4MjA4Zjk3NjI4NTlmOTYwMTBiMjE1YzgzMWZjMGRkOGMz YmMwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdz LmpzCkBAIC0xMTUsNiArMTE1LDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzID0gZnVuY3Rpb24o KQogICAgIHRoaXMuc2hvd01ldHJpY3NSdWxlcnMgPSB0aGlzLmNyZWF0ZVNldHRpbmcoInNob3dN ZXRyaWNzUnVsZXJzIiwgZmFsc2UpOwogICAgIHRoaXMuZW11bGF0ZWRDU1NNZWRpYSA9IHRoaXMu Y3JlYXRlU2V0dGluZygiZW11bGF0ZWRDU1NNZWRpYSIsICJwcmludCIpOwogICAgIHRoaXMuc2hv d1Rvb2xiYXJJY29ucyA9IHRoaXMuY3JlYXRlU2V0dGluZygic2hvd1Rvb2xiYXJJY29ucyIsIGZh bHNlKTsKKyAgICB0aGlzLmhpZGRlbk5ldHdvcmtMb2dDb2x1bW5zID0gdGhpcy5jcmVhdGVTZXR0 aW5nKCJoaWRkZW5OZXR3b3JrTG9nQ29sdW1ucyIsIFtdKTsKIAogICAgIC8vIElmIHRoZXJlIGFy ZSB0b28gbWFueSBicmVha3BvaW50cyBpbiBhIHN0b3JhZ2UsIGl0IGlzIGxpa2VseSBkdWUgdG8g YSByZWNlbnQgYnVnIHRoYXQgY2F1c2VkCiAgICAgLy8gcGVyaW9kaWNhbCBicmVha3BvaW50cyBk dXBsaWNhdGlvbiBsZWFkaW5nIHRvIGluc3BlY3RvciBzbG93bmVzcy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvbmV0d29ya0xvZ1ZpZXcuY3NzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3MKaW5kZXgg ZDFjMTBkMmJiZmZlNDkzM2RhOTc3MWY4NzM4MjMzM2Q2OTBjMmMwYy4uZWRjZjdlMmU4YWQyYTYy ZGUxOGIzMjIzNGE1YjM5ZjNhYzQ5NjMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3MKQEAgLTU1NywzICs1NTcsMTIg QEAKICNuZXR3b3JrLWNvbnRhaW5lci5icmllZi1tb2RlIC5kYXRhLWdyaWQgLmRhdGEtY29udGFp bmVyIHsKICAgICBwYWRkaW5nLXJpZ2h0OiAwOwogfQorCisjbmV0d29yay1jb250YWluZXIgLmhp ZGUtbWV0aG9kLWNvbHVtbiAubWV0aG9kLWNvbHVtbiwKKyNuZXR3b3JrLWNvbnRhaW5lciAuaGlk ZS1zdGF0dXMtY29sdW1uIC5zdGF0dXMtY29sdW1uLAorI25ldHdvcmstY29udGFpbmVyIC5oaWRl LXR5cGUtY29sdW1uIC50eXBlLWNvbHVtbiwKKyNuZXR3b3JrLWNvbnRhaW5lciAuaGlkZS1pbml0 aWF0b3ItY29sdW1uIC5pbml0aWF0b3ItY29sdW1uLAorI25ldHdvcmstY29udGFpbmVyIC5oaWRl LXNpemUtY29sdW1uIC5zaXplLWNvbHVtbiwKKyNuZXR3b3JrLWNvbnRhaW5lciAuaGlkZS10aW1l LWNvbHVtbiAudGltZS1jb2x1bW4geworICAgIGJvcmRlci1yaWdodDogMCBub25lIHRyYW5zcGFy ZW50OworfQo= 182289 2013-01-11 01:08:52 -0800 2013-01-11 09:10:47 -0800 Patch bug-105739-20130111130553.patch text/plain 15282 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJiZWRkYjZlODNiMzMy ODAwZjQwZmYzNjc3ODg2NDMyYzE1NDU0Yy4uNWM5N2E5NTY0Y2RlNWRkMjk0YTE4YjY0Nzc3YWI4 YWNjOWE3MjBjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTI1ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXNdIE1ha2UgZ3JpZCBjb2x1bW5zIHNldCBjb25maWd1cmFibGUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU3MzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjb250 ZXh0IG1lbnUgb24gZ3JpZCBoZWFkZXIgdG8gaGlkZS9zaG93IGdyaWQgY29sdW1ucy4KKyAgICAg ICAgSGlkZGVuIGNvbHVtbnMgc2V0IGlzIHBlcnNpc3RlZC4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIEZpeGVkIHNob3cvaGlkZSBiZWhhdmlv ciwgaW50cm9kdWNlZCB3ZWlnaHQgY29udHJvbC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgQWRkZWQgbWVtYmVyIHRvIHRyYWNrIHZpc2li aWxpdHkgb2YgY29sdW1ucyBpbiBkZXRhaWxlcmQgbW9kZS4gQWRkZWQKKyAgICAgICAgY29udGV4 dCBtZW51IGZvciBncmlkIGhlYWRlci4KKwogMjAxMy0wMS0xMCAgSGFqaW1lIE1vcnJpdGEgIDxt b3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgW1NoYWRvdyBET01dIFJlZmFjdG9yaW5nOiBJ bnNlcnRpb25Qb2ludCBjb3VsZCBzaW1wbGlmeSBpdHMgc3ViY2xhc3MgaG9va3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCmluZGV4IGNlOTQyOWYz NGVlOGUzY2FhYzBlNjcyMTA4NjliNGUyZWRmZTdjNGYuLmVmYTFkMDExYzA5ZmU3NDMyZWRkMmVi ODI2NDIyZjA0NWYwZjkxYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EYXRhR3JpZC5qcwpAQCAtNTYxLDcxICs1NjEsNDggQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo IndpZHRoIGNoYW5nZWQiKTsKICAgICB9LAogCi0gICAgY29sdW1uV2lkdGhzTWFwOiBmdW5jdGlv bigpCisgICAgYXBwbHlDb2x1bW5XZWlnaHRzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2 YXIgcmVzdWx0ID0ge307Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY29sdW1u c0FycmF5Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgd2lkdGggPSB0aGlzLl9oZWFk ZXJUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW2ldLnN0eWxlLndpZHRoOwotICAgICAgICAgICAg cmVzdWx0W3RoaXMuX2NvbHVtbnNBcnJheVtpXS5jb2x1bW5JZGVudGlmaWVyXSA9IHBhcnNlRmxv YXQod2lkdGgpOworICAgICAgICB2YXIgc3VtT2ZXZWlnaHRzID0gMC4wOworICAgICAgICBmb3Ig KHZhciBjb2x1bW5JZGVudGlmaWVyIGluIHRoaXMuY29sdW1ucykgeworICAgICAgICAgICAgaWYg KHRoaXMuaXNDb2x1bW5WaXNpYmxlKGNvbHVtbklkZW50aWZpZXIpKQorICAgICAgICAgICAgICAg IHN1bU9mV2VpZ2h0cyArPSB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl0ud2VpZ2h0Owog ICAgICAgICB9Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfSwKKyAgICAgICAgdmFyIGZh Y3RvciA9IDEwMCAvIHN1bU9mV2VpZ2h0czsKIAotICAgIGFwcGx5Q29sdW1uV2lkdGhzTWFwOiBm dW5jdGlvbihjb2x1bW5XaWR0aHNNYXApCi0gICAgewogICAgICAgICBmb3IgKHZhciBjb2x1bW5J ZGVudGlmaWVyIGluIHRoaXMuY29sdW1ucykgewogICAgICAgICAgICAgdmFyIGNvbHVtbiA9IHRo aXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXTsKLSAgICAgICAgICAgIHZhciB3aWR0aCA9IChj b2x1bW5XaWR0aHNNYXBbY29sdW1uSWRlbnRpZmllcl0gfHwgMCkgKyAiJSI7CisgICAgICAgICAg ICB2YXIgd2lkdGggPSB0aGlzLmlzQ29sdW1uVmlzaWJsZShjb2x1bW5JZGVudGlmaWVyKSA/ICgo ZmFjdG9yICogY29sdW1uLndlaWdodCkgKyAiJSIpOiAiMCUiOwogICAgICAgICAgICAgdGhpcy5f aGVhZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltjb2x1bW4ub3JkaW5hbF0uc3R5bGUud2lk dGggPSB3aWR0aDsKICAgICAgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNoaWxk cmVuW2NvbHVtbi5vcmRpbmFsXS5zdHlsZS53aWR0aCA9IHdpZHRoOwogICAgICAgICB9CiAKLSAg ICAgICAgLy8gTm9ybWFsaXplIHdpZHRocwotICAgICAgICBkZWxldGUgdGhpcy5fY29sdW1uV2lk dGhzSW5pdGlhbGl6ZWQ7Ci0gICAgICAgIHRoaXMudXBkYXRlV2lkdGhzKCk7CisgICAgICAgIHRo aXMuX3Bvc2l0aW9uUmVzaXplcnMoKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoIndpZHRoIGNoYW5nZWQiKTsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFt IHtzdHJpbmd9IGNvbHVtbklkZW50aWZpZXIKKyAgICAgKi8KICAgICBpc0NvbHVtblZpc2libGU6 IGZ1bmN0aW9uKGNvbHVtbklkZW50aWZpZXIpCiAgICAgewotICAgICAgICB2YXIgY29sdW1uID0g dGhpcy5jb2x1bW5zW2NvbHVtbklkZW50aWZpZXJdOwotICAgICAgICB2YXIgY29sdW1uRWxlbWVu dCA9IGNvbHVtbi5lbGVtZW50OwotICAgICAgICByZXR1cm4gIWNvbHVtbkVsZW1lbnQuaGlkZGVu OwotICAgIH0sCi0KLSAgICBzaG93Q29sdW1uOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQot ICAgIHsKLSAgICAgICAgdmFyIGNvbHVtbiA9IHRoaXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVy XTsKLSAgICAgICAgdmFyIGNvbHVtbkVsZW1lbnQgPSBjb2x1bW4uZWxlbWVudDsKLSAgICAgICAg aWYgKCFjb2x1bW5FbGVtZW50LmhpZGRlbikKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAg ICBjb2x1bW5FbGVtZW50LmhpZGRlbiA9IGZhbHNlOwotICAgICAgICBjb2x1bW5FbGVtZW50LnJl bW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotCi0gICAgICAgIHZhciBjb2x1bW5Cb2R5RWxlbWVu dCA9IGNvbHVtbi5ib2R5RWxlbWVudDsKLSAgICAgICAgY29sdW1uQm9keUVsZW1lbnQuaGlkZGVu ID0gZmFsc2U7Ci0gICAgICAgIGNvbHVtbkJvZHlFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhp ZGRlbiIpOworICAgICAgICByZXR1cm4gIXRoaXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXS5o aWRkZW47CiAgICAgfSwKIAotICAgIGhpZGVDb2x1bW46IGZ1bmN0aW9uKGNvbHVtbklkZW50aWZp ZXIpCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbHVtbklkZW50aWZpZXIKKyAg ICAgKiBAcGFyYW0ge2Jvb2xlYW59IHZpc2libGUKKyAgICAgKi8KKyAgICBzZXRDb2x1bW5WaXNp YmxlOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyLCB2aXNpYmxlKQogICAgIHsKLSAgICAgICAg dmFyIGNvbHVtbiA9IHRoaXMuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXTsKLSAgICAgICAgdmFy IGNvbHVtbkVsZW1lbnQgPSBjb2x1bW4uZWxlbWVudDsKLSAgICAgICAgaWYgKGNvbHVtbkVsZW1l bnQuaGlkZGVuKQorICAgICAgICBpZiAodmlzaWJsZSA9PT0gIXRoaXMuY29sdW1uc1tjb2x1bW5J ZGVudGlmaWVyXS5oaWRkZW4pCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIG9s ZFdpZHRoID0gcGFyc2VGbG9hdChjb2x1bW5FbGVtZW50LnN0eWxlLndpZHRoKTsKLQotICAgICAg ICBjb2x1bW5FbGVtZW50LmhpZGRlbiA9IHRydWU7Ci0gICAgICAgIGNvbHVtbkVsZW1lbnQuYWRk U3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgIGNvbHVtbkVsZW1lbnQuc3R5bGUud2lkdGgg PSAwOwotCi0gICAgICAgIHZhciBjb2x1bW5Cb2R5RWxlbWVudCA9IGNvbHVtbi5ib2R5RWxlbWVu dDsKLSAgICAgICAgY29sdW1uQm9keUVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsKLSAgICAgICAgY29s dW1uQm9keUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgIGNvbHVtbkJv ZHlFbGVtZW50LnN0eWxlLndpZHRoID0gMDsKLQotICAgICAgICB0aGlzLl9jb2x1bW5XaWR0aHNJ bml0aWFsaXplZCA9IGZhbHNlOworICAgICAgICB0aGlzLmNvbHVtbnNbY29sdW1uSWRlbnRpZmll cl0uaGlkZGVuID0gIXZpc2libGU7CisgICAgICAgIGlmICh2aXNpYmxlKQorICAgICAgICAgICAg dGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGUtIiArIGNvbHVtbklkZW50aWZpZXIg KyAiLWNvbHVtbiIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRk U3R5bGVDbGFzcygiaGlkZS0iICsgY29sdW1uSWRlbnRpZmllciArICItY29sdW1uIik7CiAgICAg fSwKIAogICAgIGdldCBzY3JvbGxDb250YWluZXIoKQpAQCAtNjcwLDggKzY0Nyw3IEBAIFdlYklu c3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAvLyBpdCBpcyBub3Qg cG9zc2libGUgdG8gcXVlcnkgYSBjb2x1bW4gZm9yIGl0cyB3aWR0aC4KICAgICAgICAgICAgIGxl ZnQgKz0gdGhpcy5oZWFkZXJUYWJsZUJvZHkucm93c1swXS5jZWxsc1tpXS5vZmZzZXRXaWR0aDsK IAotICAgICAgICAgICAgdmFyIGNvbHVtbklzVmlzaWJsZSA9ICF0aGlzLl9oZWFkZXJUYWJsZUNv bHVtbkdyb3VwLmNoaWxkcmVuW2ldLmhpZGRlbjsKLSAgICAgICAgICAgIGlmIChjb2x1bW5Jc1Zp c2libGUpIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5fY29sdW1uc0FycmF5W2ldLmhpZGRlbikg ewogICAgICAgICAgICAgICAgIHJlc2l6ZXIuc3R5bGUucmVtb3ZlUHJvcGVydHkoImRpc3BsYXki KTsKICAgICAgICAgICAgICAgICByZXNpemVyLnN0eWxlLmxlZnQgPSBsZWZ0ICsgInB4IjsKICAg ICAgICAgICAgICAgICByZXNpemVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklEID0gaTsKQEAgLTk5 Myw2ICs5NjksMTUgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyaWdodENlbGxJbmRleF0u c3R5bGUud2lkdGggPSAgcGVyY2VudFJpZ2h0Q29sdW1uOwogICAgICAgICB0aGlzLl9kYXRhVGFi bGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyaWdodENlbGxJbmRleF0uc3R5bGUud2lkdGggPSBwZXJj ZW50UmlnaHRDb2x1bW47CiAKKyAgICAgICAgdmFyIGxlZnRDb2x1bW4gPSB0aGlzLl9jb2x1bW5z QXJyYXlbbGVmdENlbGxJbmRleF07CisgICAgICAgIHZhciByaWdodENvbHVtbiA9IHRoaXMuX2Nv bHVtbnNBcnJheVtyaWdodENlbGxJbmRleF07CisgICAgICAgIGlmIChsZWZ0Q29sdW1uLndlaWdo dCB8fCByaWdodENvbHVtbi53ZWlnaHQpIHsKKyAgICAgICAgICAgIHZhciBzdW1PZldlaWdodHMg PSBsZWZ0Q29sdW1uLndlaWdodCArIHJpZ2h0Q29sdW1uLndlaWdodDsKKyAgICAgICAgICAgIHZh ciBkZWx0YSA9IHJpZ2h0RWRnZU9mTmV4dENvbHVtbiAtIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVt bjsKKyAgICAgICAgICAgIGxlZnRDb2x1bW4ud2VpZ2h0ID0gKGRyYWdQb2ludCAtIGxlZnRFZGdl T2ZQcmV2aW91c0NvbHVtbikgKiBzdW1PZldlaWdodHMgLyBkZWx0YTsKKyAgICAgICAgICAgIHJp Z2h0Q29sdW1uLndlaWdodCA9IChyaWdodEVkZ2VPZk5leHRDb2x1bW4gLSBkcmFnUG9pbnQpICog c3VtT2ZXZWlnaHRzIC8gZGVsdGE7CisgICAgICAgIH0KKwogICAgICAgICB0aGlzLl9wb3NpdGlv blJlc2l6ZXJzKCk7CiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJ3aWR0aCBjaGFuZ2VkIik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDA4 ZDFlNTAwY2Q5M2YwMmY2ZTljZjM4YzY2YmRhNzc1N2NlZWNhNTYuLjNiOGEzOGY0NjJmMTk4Mjlj NTVjYzY1ZTkxYjA2NDdkYjFjYzBkNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC00MiwxMiArNDIsMTQgQEAgaW1wb3J0 U2NyaXB0KCJSZXNvdXJjZVdlYlNvY2tldEZyYW1lVmlldy5qcyIpOwogLyoqCiAgKiBAY29uc3Ry dWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuVmlld30KKyAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlNldHRpbmd9IGNvdWxtbnNWaXNpYmlsaXR5U2V0dGluZwogICovCi1XZWJJbnNwZWN0 b3IuTmV0d29ya0xvZ1ZpZXcgPSBmdW5jdGlvbigpCitXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1Zp ZXcgPSBmdW5jdGlvbihjb3VsbW5zVmlzaWJpbGl0eVNldHRpbmcpCiB7CiAgICAgV2ViSW5zcGVj dG9yLlZpZXcuY2FsbCh0aGlzKTsKICAgICB0aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoIm5ldHdv cmtMb2dWaWV3LmNzcyIpOwogCisgICAgdGhpcy5fY291bG1uc1Zpc2liaWxpdHlTZXR0aW5nID0g Y291bG1uc1Zpc2liaWxpdHlTZXR0aW5nOwogICAgIHRoaXMuX2FsbG93UmVxdWVzdFNlbGVjdGlv biA9IGZhbHNlOwogICAgIHRoaXMuX3JlcXVlc3RzID0gW107CiAgICAgdGhpcy5fcmVxdWVzdHNC eUlkID0ge307CkBAIC05Myw2ICs5NSw4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldyA9 IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IubmV0d29ya0xvZy5yZXF1ZXN0cy5mb3JFYWNo KHRoaXMuX2FwcGVuZFJlcXVlc3QuYmluZCh0aGlzKSk7CiB9CiAKK1dlYkluc3BlY3Rvci5OZXR3 b3JrTG9nVmlldy5fZGVmYXVsdENvbHVtbnNWaXNpdmlsaXR5ID0ge21ldGhvZDogdHJ1ZSwgc3Rh dHVzOiB0cnVlLCB0eXBlOiB0cnVlLCBpbml0aWF0b3I6IHRydWUsIHNpemU6IHRydWUsIHRpbWU6 IHRydWV9OworCiBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAg IF9pbml0aWFsaXplVmlldzogZnVuY3Rpb24oKQogICAgIHsKQEAgLTE1NiwzOSArMTYwLDQ0IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBj b2x1bW5zID0ge25hbWU6IHt9LCBtZXRob2Q6IHt9LCBzdGF0dXM6IHt9LCB0eXBlOiB7fSwgaW5p dGlhdG9yOiB7fSwgc2l6ZToge30sIHRpbWU6IHt9LCB0aW1lbGluZToge319OwogCiAgICAgICAg IGNvbHVtbnMubmFtZS50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZyYWdtZW50 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiTmFtZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBh dGgiKSk7CisgICAgICAgIGNvbHVtbnMubmFtZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJOYW1lIik7CiAgICAgICAgIGNvbHVtbnMubmFtZS5zb3J0YWJsZSA9IHRydWU7Ci0gICAgICAg IGNvbHVtbnMubmFtZS53aWR0aCA9ICIyMCUiOworICAgICAgICBjb2x1bW5zLm5hbWUud2VpZ2h0 ID0gMjA7CiAgICAgICAgIGNvbHVtbnMubmFtZS5kaXNjbG9zdXJlID0gdHJ1ZTsKIAogICAgICAg ICBjb2x1bW5zLm1ldGhvZC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTWV0aG9kIik7 CiAgICAgICAgIGNvbHVtbnMubWV0aG9kLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICAgICAgY29sdW1u cy5tZXRob2Qud2lkdGggPSAiNiUiOworICAgICAgICBjb2x1bW5zLm1ldGhvZC53ZWlnaHQgPSA2 OwogCiAgICAgICAgIGNvbHVtbnMuc3RhdHVzLnRpdGxlRE9NRnJhZ21lbnQgPSB0aGlzLl9tYWtl SGVhZGVyRnJhZ21lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGF0dXMiKSwgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJUZXh0IikpOworICAgICAgICBjb2x1bW5zLnN0YXR1cy5uYW1lID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTdGF0dXMiKTsKICAgICAgICAgY29sdW1ucy5zdGF0dXMuc29y dGFibGUgPSB0cnVlOwotICAgICAgICBjb2x1bW5zLnN0YXR1cy53aWR0aCA9ICI2JSI7CisgICAg ICAgIGNvbHVtbnMuc3RhdHVzLndlaWdodCA9IDY7CiAKICAgICAgICAgY29sdW1ucy50eXBlLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUeXBlIik7CiAgICAgICAgIGNvbHVtbnMudHlw ZS5zb3J0YWJsZSA9IHRydWU7Ci0gICAgICAgIGNvbHVtbnMudHlwZS53aWR0aCA9ICI2JSI7Cisg ICAgICAgIGNvbHVtbnMudHlwZS53ZWlnaHQgPSA2OwogCiAgICAgICAgIGNvbHVtbnMuaW5pdGlh dG9yLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJJbml0aWF0b3IiKTsKICAgICAgICAg Y29sdW1ucy5pbml0aWF0b3Iuc29ydGFibGUgPSB0cnVlOwotICAgICAgICBjb2x1bW5zLmluaXRp YXRvci53aWR0aCA9ICIxMCUiOworICAgICAgICBjb2x1bW5zLmluaXRpYXRvci53ZWlnaHQgPSAx MDsKIAogICAgICAgICBjb2x1bW5zLnNpemUudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VI ZWFkZXJGcmFnbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKSwgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJDb250ZW50IikpOworICAgICAgICBjb2x1bW5zLnNpemUubmFtZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiU2l6ZSIpOwogICAgICAgICBjb2x1bW5zLnNpemUuc29ydGFibGUg PSB0cnVlOwotICAgICAgICBjb2x1bW5zLnNpemUud2lkdGggPSAiNiUiOworICAgICAgICBjb2x1 bW5zLnNpemUud2VpZ2h0ID0gNjsKICAgICAgICAgY29sdW1ucy5zaXplLmFsaWduZWQgPSAicmln aHQiOwogCiAgICAgICAgIGNvbHVtbnMudGltZS50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFr ZUhlYWRlckZyYWdtZW50KFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZSIpLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkxhdGVuY3kiKSk7CisgICAgICAgIGNvbHVtbnMudGltZS5uYW1lID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lIik7CiAgICAgICAgIGNvbHVtbnMudGltZS5zb3J0YWJs ZSA9IHRydWU7Ci0gICAgICAgIGNvbHVtbnMudGltZS53aWR0aCA9ICI2JSI7CisgICAgICAgIGNv bHVtbnMudGltZS53ZWlnaHQgPSA2OwogICAgICAgICBjb2x1bW5zLnRpbWUuYWxpZ25lZCA9ICJy aWdodCI7CiAKICAgICAgICAgY29sdW1ucy50aW1lbGluZS50aXRsZSA9ICIiOworICAgICAgICBj b2x1bW5zLnRpbWVsaW5lLm5hbWUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVsaW5lIik7 CiAgICAgICAgIGNvbHVtbnMudGltZWxpbmUuc29ydGFibGUgPSBmYWxzZTsKLSAgICAgICAgY29s dW1ucy50aW1lbGluZS53aWR0aCA9ICI0MCUiOworICAgICAgICBjb2x1bW5zLnRpbWVsaW5lLndl aWdodCA9IDQwOwogICAgICAgICBjb2x1bW5zLnRpbWVsaW5lLnNvcnQgPSAiYXNjZW5kaW5nIjsK IAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29s dW1ucyk7CkBAIC04NTYsNDUgKzg2NSwxNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlLnNl bGVjdGVkID0gZmFsc2U7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3Mo ImJyaWVmLW1vZGUiKTsKLQotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1uKCJtZXRo b2QiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigic3RhdHVzIik7Ci0gICAg ICAgIHRoaXMuX2RhdGFHcmlkLnNob3dDb2x1bW4oInR5cGUiKTsKLSAgICAgICAgdGhpcy5fZGF0 YUdyaWQuc2hvd0NvbHVtbigiaW5pdGlhdG9yIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNo b3dDb2x1bW4oInNpemUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigidGlt ZSIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1uKCJ0aW1lbGluZSIpOwotCi0g ICAgICAgIHZhciB3aWR0aHMgPSB7fTsKLSAgICAgICAgd2lkdGhzLm5hbWUgPSAyMDsKLSAgICAg ICAgd2lkdGhzLm1ldGhvZCA9IDY7Ci0gICAgICAgIHdpZHRocy5zdGF0dXMgPSA2OwotICAgICAg ICB3aWR0aHMudHlwZSA9IDY7Ci0gICAgICAgIHdpZHRocy5pbml0aWF0b3IgPSAxMDsKLSAgICAg ICAgd2lkdGhzLnNpemUgPSA2OwotICAgICAgICB3aWR0aHMudGltZSA9IDY7Ci0gICAgICAgIHdp ZHRocy50aW1lbGluZSA9IDQwOwotCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmFwcGx5Q29sdW1u V2lkdGhzTWFwKHdpZHRocyk7CisgICAgICAgIHRoaXMuX2RldGFpbGVkTW9kZSA9IHRydWU7Cisg ICAgICAgIHRoaXMuX3VwZGF0ZUNvbHVtbnMoKTsKICAgICB9LAogCiAgICAgc3dpdGNoVG9Ccmll ZlZpZXc6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJicmllZi1tb2RlIik7CiAgICAgICAgIHRoaXMuX3JlbW92ZUFsbE5vZGVIaWdobGlnaHRz KCk7Ci0KLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigibWV0aG9kIik7Ci0gICAg ICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oInN0YXR1cyIpOwotICAgICAgICB0aGlzLl9k YXRhR3JpZC5oaWRlQ29sdW1uKCJ0eXBlIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVD b2x1bW4oImluaXRpYXRvciIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRlQ29sdW1uKCJz aXplIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oInRpbWUiKTsKLSAgICAg ICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigidGltZWxpbmUiKTsKLQotICAgICAgICB2YXIg d2lkdGhzID0ge307Ci0gICAgICAgIHdpZHRocy5uYW1lID0gMTAwOwotICAgICAgICB0aGlzLl9k YXRhR3JpZC5hcHBseUNvbHVtbldpZHRoc01hcCh3aWR0aHMpOwotCisgICAgICAgIHRoaXMuX2Rl dGFpbGVkTW9kZSA9IGZhbHNlOworICAgICAgICB0aGlzLl91cGRhdGVDb2x1bW5zKCk7CiAgICAg ICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKICAgICB9LAogCkBAIC05Njcs OSArOTQ3LDQ0IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiBmcmFtZXNUYWJsZTsKICAgICB9LAogCisgICAgX3VwZGF0ZUNvbHVtbnM6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBjb2x1bW5zVmlzaWJpbGl0eSA9IHRoaXMu X2NvdWxtbnNWaXNpYmlsaXR5U2V0dGluZy5nZXQoKTsKKyAgICAgICAgdmFyIGRldGFpbGVkTW9k ZSA9ICEhdGhpcy5fZGV0YWlsZWRNb2RlOworICAgICAgICBmb3IgKHZhciBjb2x1bW5JZGVudGlm aWVyIGluIGNvbHVtbnNWaXNpYmlsaXR5KSB7CisgICAgICAgICAgICB2YXIgdmlzaWJsZSA9IGRl dGFpbGVkTW9kZSAmJiBjb2x1bW5zVmlzaWJpbGl0eVtjb2x1bW5JZGVudGlmaWVyXTsKKyAgICAg ICAgICAgIHRoaXMuX2RhdGFHcmlkLnNldENvbHVtblZpc2libGUoY29sdW1uSWRlbnRpZmllciwg dmlzaWJsZSk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2V0Q29sdW1uVmlz aWJsZSgidGltZWxpbmUiLCBkZXRhaWxlZE1vZGUpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5h cHBseUNvbHVtbldlaWdodHMoKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtz dHJpbmd9IGNvbHVtbklkZW50aWZpZXIKKyAgICAgKi8KKyAgICBfdG9nZ2xlQ29sdW1uVmlzaWJp bGl0eTogZnVuY3Rpb24oY29sdW1uSWRlbnRpZmllcikKKyAgICB7CisgICAgICAgIHZhciBjb2x1 bW5zVmlzaWJpbGl0eSA9IHRoaXMuX2NvdWxtbnNWaXNpYmlsaXR5U2V0dGluZy5nZXQoKTsKKyAg ICAgICAgY29sdW1uc1Zpc2liaWxpdHlbY29sdW1uSWRlbnRpZmllcl0gPSAhY29sdW1uc1Zpc2li aWxpdHlbY29sdW1uSWRlbnRpZmllcl07CisgICAgICAgIHRoaXMuX2NvdWxtbnNWaXNpYmlsaXR5 U2V0dGluZy5zZXQoY29sdW1uc1Zpc2liaWxpdHkpOworCisgICAgICAgIHRoaXMuX3VwZGF0ZUNv bHVtbnMoKTsKKyAgICB9LAorCiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1l bnUoZXZlbnQpOworCisgICAgICAgIGlmICh0aGlzLl9kZXRhaWxlZE1vZGUgJiYgZXZlbnQudGFy Z2V0LmlzU2VsZk9yRGVzY2VuZGFudCh0aGlzLl9kYXRhR3JpZC5oZWFkZXJUYWJsZUJvZHkpKSB7 CisgICAgICAgICAgICB2YXIgY29sdW1uc1Zpc2liaWxpdHkgPSB0aGlzLl9jb3VsbW5zVmlzaWJp bGl0eVNldHRpbmcuZ2V0KCk7CisgICAgICAgICAgICBmb3IgKHZhciBjb2x1bW5JZGVudGlmaWVy IGluIGNvbHVtbnNWaXNpYmlsaXR5KSB7CisgICAgICAgICAgICAgICAgdmFyIGNvbHVtbiA9IHRo aXMuX2RhdGFHcmlkLmNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl07CisgICAgICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKGNvbHVtbi5uYW1lIHx8IGNvbHVtbi50aXRs ZSwgdGhpcy5fdG9nZ2xlQ29sdW1uVmlzaWJpbGl0eS5iaW5kKHRoaXMsIGNvbHVtbklkZW50aWZp ZXIpLCAhIWNvbHVtbnNWaXNpYmlsaXR5W2NvbHVtbklkZW50aWZpZXJdKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCiAgICAgICAgIHZhciBncmlkTm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFH cmlkTm9kZUZyb21Ob2RlKGV2ZW50LnRhcmdldCk7CiAgICAgICAgIHZhciByZXF1ZXN0ID0gZ3Jp ZE5vZGUgJiYgZ3JpZE5vZGUuX3JlcXVlc3Q7CiAKQEAgLTEzMjMsMTEgKzEzMzgsMjAgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtQYW5lbCA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3Iu UGFuZWwuY2FsbCh0aGlzLCAibmV0d29yayIpOwogICAgIHRoaXMucmVnaXN0ZXJSZXF1aXJlZENT UygibmV0d29ya1BhbmVsLmNzcyIpOworICAgIHRoaXMuX2luamVjdFN0eWxlcygpOwogCiAgICAg dGhpcy5jcmVhdGVTaWRlYmFyVmlldygpOwogICAgIHRoaXMuc3BsaXRWaWV3LmhpZGVNYWluRWxl bWVudCgpOwogCi0gICAgdGhpcy5fbmV0d29ya0xvZ1ZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLk5l dHdvcmtMb2dWaWV3KCk7CisgICAgdmFyIGRlZmF1bHRDb2x1bW5zVmlzaWJpbGl0eSA9IFdlYklu c3BlY3Rvci5OZXR3b3JrTG9nVmlldy5fZGVmYXVsdENvbHVtbnNWaXNpdmlsaXR5OworICAgIHZh ciBuZXR3b3JrTG9nQ29sdW1uc1Zpc2liaWxpdHlTZXR0aW5nID0gV2ViSW5zcGVjdG9yLnNldHRp bmdzLmNyZWF0ZVNldHRpbmcoIm5ldHdvcmtMb2dDb2x1bW5zVmlzaWJpbGl0eSIsIGRlZmF1bHRD b2x1bW5zVmlzaWJpbGl0eSk7CisgICAgdmFyIHNhdmVkQ29sdW1uc1Zpc2liaWxpdHkgPSBuZXR3 b3JrTG9nQ29sdW1uc1Zpc2liaWxpdHlTZXR0aW5nLmdldCgpOworICAgIHZhciBjb2x1bW5zVmlz aWJpbGl0eSA9IHt9OworICAgIGZvciAodmFyIGNvbHVtbklkIGluIGRlZmF1bHRDb2x1bW5zVmlz aWJpbGl0eSkKKyAgICAgICAgY29sdW1uc1Zpc2liaWxpdHlbY29sdW1uSWRdID0gc2F2ZWRDb2x1 bW5zVmlzaWJpbGl0eS5oYXNPd25Qcm9wZXJ0eShjb2x1bW5JZCkgPyBzYXZlZENvbHVtbnNWaXNp YmlsaXR5W2NvbHVtbklkXSA6IGRlZmF1bHRDb2x1bW5zVmlzaWJpbGl0eVtjb2x1bW5JZF07Cisg ICAgbmV0d29ya0xvZ0NvbHVtbnNWaXNpYmlsaXR5U2V0dGluZy5zZXQoY29sdW1uc1Zpc2liaWxp dHkpOworCisgICAgdGhpcy5fbmV0d29ya0xvZ1ZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLk5ldHdv cmtMb2dWaWV3KG5ldHdvcmtMb2dDb2x1bW5zVmlzaWJpbGl0eVNldHRpbmcpOwogICAgIHRoaXMu X25ldHdvcmtMb2dWaWV3LnNob3codGhpcy5zaWRlYmFyRWxlbWVudCk7CiAKICAgICB0aGlzLl92 aWV3c0NvbnRhaW5lckVsZW1lbnQgPSB0aGlzLnNwbGl0Vmlldy5tYWluRWxlbWVudDsKQEAgLTE1 NjIsNiArMTU4NiwyMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2Vi SW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZXZlYWwgaW4gbmV0d29yayBw YW5lbCIgOiAiUmV2ZWFsIGluIE5ldHdvcmsgUGFuZWwiKSwgcmV2ZWFsLmJpbmQodGhpcykpOwog ICAgIH0sCiAKKyAgICBfaW5qZWN0U3R5bGVzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2 YXIgc3R5bGUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzdHlsZSIpOworICAgICAgICB2YXIg cnVsZXMgPSBbXTsKKworICAgICAgICB2YXIgY29sdW1ucyA9IFdlYkluc3BlY3Rvci5OZXR3b3Jr TG9nVmlldy5fZGVmYXVsdENvbHVtbnNWaXNpdmlsaXR5OworICAgICAgICB2YXIgY29sdW1uU2Vs ZWN0b3JzID0gW107CisgICAgICAgIGZvciAodmFyIGNvbHVtbklkIGluIGNvbHVtbnMpCisgICAg ICAgICAgICBjb2x1bW5TZWxlY3RvcnMucHVzaCgiI25ldHdvcmstY29udGFpbmVyIC5oaWRlLSIg KyBjb2x1bW5JZCArICItY29sdW1uIC4iICsgY29sdW1uSWQgKyAiLWNvbHVtbiIpOworICAgICAg ICBydWxlcy5wdXNoKGNvbHVtblNlbGVjdG9ycy5qb2luKCIsICIpICsgIntib3JkZXItcmlnaHQ6 IDAgbm9uZSB0cmFuc3BhcmVudDt9Iik7CisKKyAgICAgICAgc3R5bGUudGV4dENvbnRlbnQgPSBy dWxlcy5qb2luKCJcbiIpOworICAgICAgICBkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKHN0eWxl KTsKKyAgICB9LAorCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBl CiB9CiAK