19208 2008-05-23 02:59:46 -0700 Inspector should remember resources sorting set by the user 2010-07-26 02:38:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 rik apavlov apavlov aroben joepeck pfeldman timothy yurys oldest_to_newest 81280 0 rik 2008-05-23 02:59:46 -0700 It's a user preference, it should be remembered over instances. 254892 1 62317 apavlov 2010-07-22 11:08:04 -0700 Created attachment 62317 [PATCH] Suggested solution 254905 2 62317 joepeck 2010-07-22 11:34:45 -0700 Comment on attachment 62317 [PATCH] Suggested solution Looks good to me. The only thing I have to add is it would be nice to add a comment or a line in the ChangeLog saying that you store both the sorting options for the Resources Panel in a single setting, and its benefit (for Remote debugging its just 1 message to get both settings). Also, I would argue it might be easier or more future proof to store settings as JSON strings, instead of strings that need need to be manually parsed. This case is rather simple, but I think for just a few more bytes its much more self descriptive and easier to understand. Consider writing another patch if you agree. Have you thought about saving other similar settings? Maybe bugs should be opened up for the following as well, if they aren't already saved: - Profiles "Bottom up" / "Top Down". - Console filters - Resource filters 255281 3 62402 apavlov 2010-07-23 03:11:44 -0700 Created attachment 62402 [PATCH] Comments addressed 255288 4 62406 apavlov 2010-07-23 03:39:31 -0700 Created attachment 62406 [PATCH] ChangeLog message augmented 255289 5 apavlov 2010-07-23 03:41:55 -0700 (In reply to comment #2) > (From update of attachment 62317 [details]) > Looks good to me. The only thing I have to add is it would be nice to > add a comment or a line in the ChangeLog saying that you store both > the sorting options for the Resources Panel in a single setting, and > its benefit (for Remote debugging its just 1 message to get both settings). Done. > Also, I would argue it might be easier or more future proof to store > settings as JSON strings, instead of strings that need need to be > manually parsed. This case is rather simple, but I think for just a few > more bytes its much more self descriptive and easier to understand. > Consider writing another patch if you agree. Discussed on #webkit-inspector - we agreed on sticking to a JS object with 2 properties. > Have you thought about saving other similar settings? Maybe bugs should > be opened up for the following as well, if they aren't already saved: > > - Profiles "Bottom up" / "Top Down". > - Console filters > - Resource filters Guess I'll think of coming up with a universal solution for these cases at once. 255436 6 62406 joepeck 2010-07-23 09:44:10 -0700 Comment on attachment 62406 [PATCH] ChangeLog message augmented Thanks! > + WebInspector.applicationSettings.resourcesSortOptions = {timeOption: this._selectedOptionNameForGraph(this.timeGraphItem), sizeOption: this._selectedOptionNameForGraph(this.sizeGraphItem)}; > + WebInspector.applicationSettings.installSetting("resourcesSortOptions", "resources-sort-options", {timeOption: "responseTime", sizeOption: "transferSize"}); I thought our style was to put spaces around the braces for JavaScript object literals. So instead of: {a:1, b:1} I think we normally go with: { a:1, b:1 } But I just did a search and found we do a lot of both, so I guess it doesn't matter either way. But it would be good to settle on a style for literals. 255437 7 joepeck 2010-07-23 09:44:35 -0700 > > Have you thought about saving other similar settings? Maybe bugs should > > be opened up for the following as well, if they aren't already saved: > > > > - Profiles "Bottom up" / "Top Down". > > - Console filters > > - Resource filters > > Guess I'll think of coming up with a universal solution for these cases at once. Could you file a Bugzilla bug for this? 255667 8 apavlov 2010-07-23 22:53:40 -0700 (In reply to comment #7) > > > Have you thought about saving other similar settings? Maybe bugs should > > > be opened up for the following as well, if they aren't already saved: > > > > > > - Profiles "Bottom up" / "Top Down". > > > - Console filters > > > - Resource filters > > > > Guess I'll think of coming up with a universal solution for these cases at once. > > Could you file a Bugzilla bug for this? Sure, just need to check with the folks which of these (and others) have been/are planned to be implemented when I'm back in the office. 255807 9 62317 eric 2010-07-25 00:20:24 -0700 Comment on attachment 62317 [PATCH] Suggested solution Cleared Joseph Pecoraro's review+ from obsolete attachment 62317 so that this bug does not appear in http://webkit.org/pending-commit. 255952 10 apavlov 2010-07-26 02:38:03 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/Settings.js Committed r64037 62317 2010-07-22 11:08:04 -0700 2010-07-25 00:20:24 -0700 [PATCH] Suggested solution persistsorting.patch text/plain 10227 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2VlMTlhMC4uZTYwNmY4MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNy0yMiAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluc3BlY3RvciBzaG91bGQgcmVtZW1iZXIgcmVzb3VyY2Vz IHNvcnRpbmcgc2V0IGJ5IHRoZSB1c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTIwOAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5w cm90b3R5cGUucG9wdWxhdGVTaWRlYmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZXNQYW5lbC5wcm90b3R5cGUuX3NldHRpbmdzTG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2xvYWRTb3J0T3B0aW9ucyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9sb2FkU29ydE9wdGlvbkZvckdy YXBoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2dy YXBoU2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZS5fY2hhbmdlU29ydGluZ0Z1bmN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZXNQYW5lbC5wcm90b3R5cGUuX3NlbGVjdGVkT3B0aW9uTmFtZUZvckdyYXBoKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2RvQ2hhbmdlU29ydGlu Z0Z1bmN0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLnBvcHVsYXRlQXBwbGljYXRpb25TZXR0aW5ncyk6CisKIDIw MTAtMDctMjIgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGIwMmEyNzcuLjRkNTFlYTAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTgyLDMwICs4 MiwzMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg cG9wdWxhdGVTaWRlYmFyOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgdGltZUdyYXBo SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50KCJyZXNvdXJjZXMtdGlt ZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSk7Ci0g ICAgICAgIHRpbWVHcmFwaEl0ZW0ub25zZWxlY3QgPSB0aGlzLl9ncmFwaFNlbGVjdGVkLmJpbmQo dGhpcyk7CisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lk ZWJhclRyZWVFbGVtZW50KCJyZXNvdXJjZXMtdGltZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSk7CisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbS5v bnNlbGVjdCA9IHRoaXMuX2dyYXBoU2VsZWN0ZWQuYmluZCh0aGlzKTsKIAogICAgICAgICB2YXIg dHJhbnNmZXJUaW1lQ2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2Zl clRpbWVDYWxjdWxhdG9yKCk7CiAgICAgICAgIHZhciB0cmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRv ciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRvcigp OwogCi0gICAgICAgIHRpbWVHcmFwaEl0ZW0uc29ydGluZ09wdGlvbnMgPSBbCi0gICAgICAgICAg ICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBTdGFydCBUaW1lIiksIHNv cnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNv bXBhcmVCeUFzY2VuZGluZ1N0YXJ0VGltZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3Vs YXRvciB9LAotICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQg YnkgUmVzcG9uc2UgVGltZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlBc2NlbmRpbmdSZXNwb25zZVJlY2VpdmVkVGlt ZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciB9LAotICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgRW5kIFRpbWUiKSwgc29ydGluZ0Z1 bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5 QXNjZW5kaW5nRW5kVGltZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciB9LAot ICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgRHVyYXRp b24iKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQuQ29tcGFyZUJ5RGVzY2VuZGluZ0R1cmF0aW9uLCBjYWxjdWxhdG9yOiB0cmFuc2ZlckR1 cmF0aW9uQ2FsY3VsYXRvciB9LAotICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNvcnQgYnkgTGF0ZW5jeSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5S ZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5nTGF0ZW5jeSwgY2Fs Y3VsYXRvcjogdHJhbnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IgfSwKKyAgICAgICAgdGhpcy50aW1l R3JhcGhJdGVtLnNvcnRpbmdPcHRpb25zID0gWworICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgU3RhcnQgVGltZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlBc2NlbmRpbmdT dGFydFRpbWUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyVGltZUNhbGN1bGF0b3IsIG9wdGlvbk5hbWU6 ICJzdGFydFRpbWUiIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU29ydCBieSBSZXNwb25zZSBUaW1lIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9y LlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeUFzY2VuZGluZ1Jlc3BvbnNlUmVj ZWl2ZWRUaW1lLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclRpbWVDYWxjdWxhdG9yLCBvcHRpb25OYW1l OiAicmVzcG9uc2VUaW1lIiB9LAorICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNvcnQgYnkgRW5kIFRpbWUiKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5QXNjZW5kaW5nRW5kVGltZSwgY2Fs Y3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciwgb3B0aW9uTmFtZTogImVuZFRpbWUiIH0s CisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBEdXJh dGlvbiIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVl RWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5nRHVyYXRpb24sIGNhbGN1bGF0b3I6IHRyYW5zZmVy RHVyYXRpb25DYWxjdWxhdG9yLCBvcHRpb25OYW1lOiAiZHVyYXRpb24iIH0sCisgICAgICAgICAg ICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBMYXRlbmN5IiksIHNvcnRp bmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBh cmVCeURlc2NlbmRpbmdMYXRlbmN5LCBjYWxjdWxhdG9yOiB0cmFuc2ZlckR1cmF0aW9uQ2FsY3Vs YXRvciwgb3B0aW9uTmFtZTogImxhdGVuY3kiIH0sCiAgICAgICAgIF07CiAKLSAgICAgICAgdGlt ZUdyYXBoSXRlbS5pc0Jhck9wYXF1ZUF0TGVmdCA9IGZhbHNlOwotICAgICAgICB0aW1lR3JhcGhJ dGVtLnNlbGVjdGVkU29ydGluZ09wdGlvbkluZGV4ID0gMTsKKyAgICAgICAgdGhpcy50aW1lR3Jh cGhJdGVtLmlzQmFyT3BhcXVlQXRMZWZ0ID0gZmFsc2U7CisgICAgICAgIHRoaXMudGltZUdyYXBo SXRlbS5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleCA9IDE7CiAKICAgICAgICAgdGhpcy5zaXpl R3JhcGhJdGVtID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQoInJlc291cmNl cy1zaXplLWdyYXBoLXNpZGViYXItaXRlbSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2l6ZSIp KTsKICAgICAgICAgdGhpcy5zaXplR3JhcGhJdGVtLm9uc2VsZWN0ID0gdGhpcy5fZ3JhcGhTZWxl Y3RlZC5iaW5kKHRoaXMpOwogCiAgICAgICAgIHZhciB0cmFuc2ZlclNpemVDYWxjdWxhdG9yID0g bmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IoKTsKICAgICAg ICAgdGhpcy5zaXplR3JhcGhJdGVtLnNvcnRpbmdPcHRpb25zID0gWwotICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgVHJhbnNmZXIgU2l6ZSIpLCBzb3J0 aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21w YXJlQnlEZXNjZW5kaW5nVHJhbnNmZXJTaXplLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclNpemVDYWxj dWxhdG9yIH0sCi0gICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29y dCBieSBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJh clRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplLCBjYWxjdWxhdG9yOiB0cmFuc2Zl clNpemVDYWxjdWxhdG9yIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiU29ydCBieSBUcmFuc2ZlciBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVj dG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdUcmFuc2Zl clNpemUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IsIG9wdGlvbk5hbWU6ICJ0 cmFuc2ZlclNpemUiIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU29ydCBieSBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNl U2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplLCBjYWxjdWxhdG9yOiB0 cmFuc2ZlclNpemVDYWxjdWxhdG9yLCBvcHRpb25OYW1lOiAic2l6ZSIgfSwKICAgICAgICAgXTsK IAogICAgICAgICB0aGlzLnNpemVHcmFwaEl0ZW0uaXNCYXJPcGFxdWVBdExlZnQgPSB0cnVlOwpA QCAtMTE0LDcgKzExNCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlNp ZGViYXJTZWN0aW9uVHJlZUVsZW1lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHUkFQSFMiKSwg e30sIHRydWUpOwogICAgICAgICB0aGlzLnNpZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuZ3Jh cGhzVHJlZUVsZW1lbnQpOwogCi0gICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQuYXBwZW5k Q2hpbGQodGltZUdyYXBoSXRlbSk7CisgICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy50aW1lR3JhcGhJdGVtKTsKICAgICAgICAgdGhpcy5ncmFwaHNUcmVlRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnNpemVHcmFwaEl0ZW0pOwogICAgICAgICB0aGlzLmdyYXBo c1RyZWVFbGVtZW50LmV4cGFuZCgpOwogCkBAIC0xNjAsNiArMTYwLDM0IEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3Vy Y2VzQnV0dG9uLnRvZ2dsZWQgPSBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5yZXNv dXJjZXNMYXJnZVJvd3M7CiAgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0 dGluZ3MucmVzb3VyY2VzTGFyZ2VSb3dzKQogICAgICAgICAgICAgdGhpcy5fc2V0TGFyZ2VyUmVz b3VyY2VzKFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLnJlc291cmNlc0xhcmdlUm93 cyk7CisgICAgICAgIHRoaXMuX2xvYWRTb3J0T3B0aW9ucygpOworICAgIH0sCisKKyAgICBfbG9h ZFNvcnRPcHRpb25zOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIVdlYkluc3BlY3Rv ci5hcHBsaWNhdGlvblNldHRpbmdzLnJlc291cmNlc1NvcnRPcHRpb25zKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB2YXIgbmV3T3B0aW9uTmFtZXMgPSBXZWJJbnNwZWN0b3IuYXBwbGlj YXRpb25TZXR0aW5ncy5yZXNvdXJjZXNTb3J0T3B0aW9ucy5zcGxpdCgiLCIpOworICAgICAgICBp ZiAobmV3T3B0aW9uTmFtZXMubGVuZ3RoICE9PSAyKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIHRoaXMuX2xvYWRTb3J0T3B0aW9uRm9yR3JhcGgodGhpcy50aW1lR3JhcGhJdGVtLCBu ZXdPcHRpb25OYW1lc1swXSk7CisgICAgICAgIHRoaXMuX2xvYWRTb3J0T3B0aW9uRm9yR3JhcGgo dGhpcy5zaXplR3JhcGhJdGVtLCBuZXdPcHRpb25OYW1lc1sxXSk7CisgICAgfSwKKworICAgIF9s b2FkU29ydE9wdGlvbkZvckdyYXBoOiBmdW5jdGlvbihncmFwaEl0ZW0sIG5ld09wdGlvbk5hbWUp CisgICAgeworICAgICAgICB2YXIgc29ydGluZ09wdGlvbnMgPSBncmFwaEl0ZW0uc29ydGluZ09w dGlvbnM7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc29ydGluZ09wdGlvbnMubGVuZ3Ro OyArK2kpIHsKKyAgICAgICAgICAgIGlmIChzb3J0aW5nT3B0aW9uc1tpXS5vcHRpb25OYW1lID09 PSBuZXdPcHRpb25OYW1lKSB7CisgICAgICAgICAgICAgICAgZ3JhcGhJdGVtLnNlbGVjdGVkU29y dGluZ09wdGlvbkluZGV4ID0gaTsKKyAgICAgICAgICAgICAgICAvLyBQcm9wYWdhdGUgdGhlIG9w dGlvbiBjaGFuZ2UgZG93biB0byB0aGUgY3VycmVudGx5IHNlbGVjdGVkIG9wdGlvbi4KKyAgICAg ICAgICAgICAgICBpZiAodGhpcy5fbGFzdFNlbGVjdGVkR3JhcGhUcmVlRWxlbWVudCA9PT0gZ3Jh cGhJdGVtKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2xhc3RTZWxlY3RlZEdyYXBoVHJl ZUVsZW1lbnQgPSBudWxsOworICAgICAgICAgICAgICAgICAgICB0aGlzLl9ncmFwaFNlbGVjdGVk KGdyYXBoSXRlbSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9 CiAgICAgfSwKIAogICAgIGdldCBtYWluUmVzb3VyY2VMb2FkVGltZSgpCkBAIC02MTgsMTEgKzY0 NiwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICAgICAgb3B0aW9uLmxhYmVsID0gc29ydGluZ09wdGlvbi5uYW1lOwogICAgICAgICAgICAgb3B0 aW9uLnNvcnRpbmdGdW5jdGlvbiA9IHNvcnRpbmdPcHRpb24uc29ydGluZ0Z1bmN0aW9uOwogICAg ICAgICAgICAgb3B0aW9uLmNhbGN1bGF0b3IgPSBzb3J0aW5nT3B0aW9uLmNhbGN1bGF0b3I7Cisg ICAgICAgICAgICBvcHRpb24ub3B0aW9uTmFtZSA9IHNvcnRpbmdPcHRpb24ub3B0aW9uTmFtZTsK ICAgICAgICAgICAgIHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnQuYXBwZW5kQ2hpbGQob3B0aW9u KTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnQuc2VsZWN0 ZWRJbmRleCA9IHRyZWVFbGVtZW50LnNlbGVjdGVkU29ydGluZ09wdGlvbkluZGV4OwotICAgICAg ICB0aGlzLl9jaGFuZ2VTb3J0aW5nRnVuY3Rpb24oKTsKKyAgICAgICAgdGhpcy5fZG9DaGFuZ2VT b3J0aW5nRnVuY3Rpb24oKTsKIAogICAgICAgICB0aGlzLmNsb3NlVmlzaWJsZVJlc291cmNlKCk7 CiAgICAgICAgIHRoaXMuY29udGFpbmVyRWxlbWVudC5zY3JvbGxUb3AgPSAwOwpAQCAtNjU4LDcg KzY4NywyMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgX2NoYW5nZVNvcnRpbmdGdW5jdGlvbjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFy IHNlbGVjdGVkT3B0aW9uID0gdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudFt0aGlzLnNvcnRpbmdT ZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXhdOworICAgICAgICB0aGlzLl9kb0NoYW5nZVNvcnRp bmdGdW5jdGlvbigpOworICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5y ZXNvdXJjZXNTb3J0T3B0aW9ucyA9IHRoaXMuX3NlbGVjdGVkT3B0aW9uTmFtZUZvckdyYXBoKHRo aXMudGltZUdyYXBoSXRlbSkgKyAiLCIgKyB0aGlzLl9zZWxlY3RlZE9wdGlvbk5hbWVGb3JHcmFw aCh0aGlzLnNpemVHcmFwaEl0ZW0pOworICAgIH0sCisKKyAgICBfc2VsZWN0ZWRPcHRpb25OYW1l Rm9yR3JhcGg6IGZ1bmN0aW9uKGdyYXBoSXRlbSkKKyAgICB7CisgICAgICAgIHJldHVybiBncmFw aEl0ZW0uc29ydGluZ09wdGlvbnNbZ3JhcGhJdGVtLnNlbGVjdGVkU29ydGluZ09wdGlvbkluZGV4 XS5vcHRpb25OYW1lOworICAgIH0sCisKKyAgICBfZG9DaGFuZ2VTb3J0aW5nRnVuY3Rpb246IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBzZWxlY3RlZEluZGV4ID0gdGhpcy5zb3J0aW5n U2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4OworICAgICAgICBpZiAodGhpcy5fbGFzdFNlbGVj dGVkR3JhcGhUcmVlRWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuX2xhc3RTZWxlY3RlZEdyYXBo VHJlZUVsZW1lbnQuc2VsZWN0ZWRTb3J0aW5nT3B0aW9uSW5kZXggPSBzZWxlY3RlZEluZGV4Owor ICAgICAgICB2YXIgc2VsZWN0ZWRPcHRpb24gPSB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50W3Nl bGVjdGVkSW5kZXhdOwogICAgICAgICB0aGlzLnNvcnRpbmdGdW5jdGlvbiA9IHNlbGVjdGVkT3B0 aW9uLnNvcnRpbmdGdW5jdGlvbjsKICAgICAgICAgdGhpcy5jYWxjdWxhdG9yID0gdGhpcy5zdW1t YXJ5QmFyLmNhbGN1bGF0b3IgPSBzZWxlY3RlZE9wdGlvbi5jYWxjdWxhdG9yOwogICAgIH0sCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggNDUwZTY5NC4uYTQ0YWM1 MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtNTgsNiArNTgs NyBAQCBXZWJJbnNwZWN0b3IucG9wdWxhdGVBcHBsaWNhdGlvblNldHRpbmdzID0gZnVuY3Rpb24o c2V0dGluZ3NTdHJpbmcpCiAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5z dGFsbFNldHRpbmcoInNob3dVc2VyQWdlbnRTdHlsZXMiLCAic2hvdy11c2VyLWFnZW50LXN0eWxl cyIsIHRydWUpOwogICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxT ZXR0aW5nKCJyZXNvdXJjZVZpZXdUYWIiLCAicmVzb3VyY2Utdmlldy10YWIiLCAiY29udGVudCIp OwogICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJj b25zb2xlSGlzdG9yeSIsICJjb25zb2xlLWhpc3RvcnkiLCBbXSk7CisgICAgV2ViSW5zcGVjdG9y LmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRpbmcoInJlc291cmNlc1NvcnRPcHRpb25z IiwgInJlc291cmNlcy1zb3J0LW9wdGlvbnMiLCAicmVzcG9uc2VUaW1lLHRyYW5zZmVyU2l6ZSIp OwogCiAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKCJsb2FkZWQiKTsKIH0K 62402 2010-07-23 03:11:44 -0700 2010-07-23 03:39:31 -0700 [PATCH] Comments addressed persistsorting.patch text/plain 10198 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2VlMTlhMC4uZTYwNmY4MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNy0yMiAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluc3BlY3RvciBzaG91bGQgcmVtZW1iZXIgcmVzb3VyY2Vz IHNvcnRpbmcgc2V0IGJ5IHRoZSB1c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTIwOAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5w cm90b3R5cGUucG9wdWxhdGVTaWRlYmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZXNQYW5lbC5wcm90b3R5cGUuX3NldHRpbmdzTG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2xvYWRTb3J0T3B0aW9ucyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9sb2FkU29ydE9wdGlvbkZvckdy YXBoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2dy YXBoU2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZS5fY2hhbmdlU29ydGluZ0Z1bmN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZXNQYW5lbC5wcm90b3R5cGUuX3NlbGVjdGVkT3B0aW9uTmFtZUZvckdyYXBoKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2RvQ2hhbmdlU29ydGlu Z0Z1bmN0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLnBvcHVsYXRlQXBwbGljYXRpb25TZXR0aW5ncyk6CisKIDIw MTAtMDctMjIgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGIwMmEyNzcuLjJhZDYyYTkgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTgyLDMwICs4 MiwzMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg cG9wdWxhdGVTaWRlYmFyOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgdGltZUdyYXBo SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50KCJyZXNvdXJjZXMtdGlt ZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSk7Ci0g ICAgICAgIHRpbWVHcmFwaEl0ZW0ub25zZWxlY3QgPSB0aGlzLl9ncmFwaFNlbGVjdGVkLmJpbmQo dGhpcyk7CisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lk ZWJhclRyZWVFbGVtZW50KCJyZXNvdXJjZXMtdGltZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSk7CisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbS5v bnNlbGVjdCA9IHRoaXMuX2dyYXBoU2VsZWN0ZWQuYmluZCh0aGlzKTsKIAogICAgICAgICB2YXIg dHJhbnNmZXJUaW1lQ2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2Zl clRpbWVDYWxjdWxhdG9yKCk7CiAgICAgICAgIHZhciB0cmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRv ciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRvcigp OwogCi0gICAgICAgIHRpbWVHcmFwaEl0ZW0uc29ydGluZ09wdGlvbnMgPSBbCi0gICAgICAgICAg ICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBTdGFydCBUaW1lIiksIHNv cnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNv bXBhcmVCeUFzY2VuZGluZ1N0YXJ0VGltZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3Vs YXRvciB9LAotICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQg YnkgUmVzcG9uc2UgVGltZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlBc2NlbmRpbmdSZXNwb25zZVJlY2VpdmVkVGlt ZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciB9LAotICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgRW5kIFRpbWUiKSwgc29ydGluZ0Z1 bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5 QXNjZW5kaW5nRW5kVGltZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciB9LAot ICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgRHVyYXRp b24iKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQuQ29tcGFyZUJ5RGVzY2VuZGluZ0R1cmF0aW9uLCBjYWxjdWxhdG9yOiB0cmFuc2ZlckR1 cmF0aW9uQ2FsY3VsYXRvciB9LAotICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNvcnQgYnkgTGF0ZW5jeSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5S ZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5nTGF0ZW5jeSwgY2Fs Y3VsYXRvcjogdHJhbnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IgfSwKKyAgICAgICAgdGhpcy50aW1l R3JhcGhJdGVtLnNvcnRpbmdPcHRpb25zID0gWworICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgU3RhcnQgVGltZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlBc2NlbmRpbmdT dGFydFRpbWUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyVGltZUNhbGN1bGF0b3IsIG9wdGlvbk5hbWU6 ICJzdGFydFRpbWUiIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU29ydCBieSBSZXNwb25zZSBUaW1lIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9y LlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeUFzY2VuZGluZ1Jlc3BvbnNlUmVj ZWl2ZWRUaW1lLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclRpbWVDYWxjdWxhdG9yLCBvcHRpb25OYW1l OiAicmVzcG9uc2VUaW1lIiB9LAorICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNvcnQgYnkgRW5kIFRpbWUiKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5QXNjZW5kaW5nRW5kVGltZSwgY2Fs Y3VsYXRvcjogdHJhbnNmZXJUaW1lQ2FsY3VsYXRvciwgb3B0aW9uTmFtZTogImVuZFRpbWUiIH0s CisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBEdXJh dGlvbiIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVl RWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5nRHVyYXRpb24sIGNhbGN1bGF0b3I6IHRyYW5zZmVy RHVyYXRpb25DYWxjdWxhdG9yLCBvcHRpb25OYW1lOiAiZHVyYXRpb24iIH0sCisgICAgICAgICAg ICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29ydCBieSBMYXRlbmN5IiksIHNvcnRp bmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBh cmVCeURlc2NlbmRpbmdMYXRlbmN5LCBjYWxjdWxhdG9yOiB0cmFuc2ZlckR1cmF0aW9uQ2FsY3Vs YXRvciwgb3B0aW9uTmFtZTogImxhdGVuY3kiIH0sCiAgICAgICAgIF07CiAKLSAgICAgICAgdGlt ZUdyYXBoSXRlbS5pc0Jhck9wYXF1ZUF0TGVmdCA9IGZhbHNlOwotICAgICAgICB0aW1lR3JhcGhJ dGVtLnNlbGVjdGVkU29ydGluZ09wdGlvbkluZGV4ID0gMTsKKyAgICAgICAgdGhpcy50aW1lR3Jh cGhJdGVtLmlzQmFyT3BhcXVlQXRMZWZ0ID0gZmFsc2U7CisgICAgICAgIHRoaXMudGltZUdyYXBo SXRlbS5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleCA9IDE7CiAKICAgICAgICAgdGhpcy5zaXpl R3JhcGhJdGVtID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQoInJlc291cmNl cy1zaXplLWdyYXBoLXNpZGViYXItaXRlbSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2l6ZSIp KTsKICAgICAgICAgdGhpcy5zaXplR3JhcGhJdGVtLm9uc2VsZWN0ID0gdGhpcy5fZ3JhcGhTZWxl Y3RlZC5iaW5kKHRoaXMpOwogCiAgICAgICAgIHZhciB0cmFuc2ZlclNpemVDYWxjdWxhdG9yID0g bmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IoKTsKICAgICAg ICAgdGhpcy5zaXplR3JhcGhJdGVtLnNvcnRpbmdPcHRpb25zID0gWwotICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgVHJhbnNmZXIgU2l6ZSIpLCBzb3J0 aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21w YXJlQnlEZXNjZW5kaW5nVHJhbnNmZXJTaXplLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclNpemVDYWxj dWxhdG9yIH0sCi0gICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU29y dCBieSBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJh clRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplLCBjYWxjdWxhdG9yOiB0cmFuc2Zl clNpemVDYWxjdWxhdG9yIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiU29ydCBieSBUcmFuc2ZlciBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVj dG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdUcmFuc2Zl clNpemUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IsIG9wdGlvbk5hbWU6ICJ0 cmFuc2ZlclNpemUiIH0sCisgICAgICAgICAgICB7IG5hbWU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU29ydCBieSBTaXplIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNl U2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplLCBjYWxjdWxhdG9yOiB0 cmFuc2ZlclNpemVDYWxjdWxhdG9yLCBvcHRpb25OYW1lOiAic2l6ZSIgfSwKICAgICAgICAgXTsK IAogICAgICAgICB0aGlzLnNpemVHcmFwaEl0ZW0uaXNCYXJPcGFxdWVBdExlZnQgPSB0cnVlOwpA QCAtMTE0LDcgKzExNCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlNp ZGViYXJTZWN0aW9uVHJlZUVsZW1lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHUkFQSFMiKSwg e30sIHRydWUpOwogICAgICAgICB0aGlzLnNpZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuZ3Jh cGhzVHJlZUVsZW1lbnQpOwogCi0gICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQuYXBwZW5k Q2hpbGQodGltZUdyYXBoSXRlbSk7CisgICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy50aW1lR3JhcGhJdGVtKTsKICAgICAgICAgdGhpcy5ncmFwaHNUcmVlRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnNpemVHcmFwaEl0ZW0pOwogICAgICAgICB0aGlzLmdyYXBo c1RyZWVFbGVtZW50LmV4cGFuZCgpOwogCkBAIC0xNjAsNiArMTYwLDMyIEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3Vy Y2VzQnV0dG9uLnRvZ2dsZWQgPSBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5yZXNv dXJjZXNMYXJnZVJvd3M7CiAgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0 dGluZ3MucmVzb3VyY2VzTGFyZ2VSb3dzKQogICAgICAgICAgICAgdGhpcy5fc2V0TGFyZ2VyUmVz b3VyY2VzKFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLnJlc291cmNlc0xhcmdlUm93 cyk7CisgICAgICAgIHRoaXMuX2xvYWRTb3J0T3B0aW9ucygpOworICAgIH0sCisKKyAgICBfbG9h ZFNvcnRPcHRpb25zOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgbmV3T3B0aW9ucyA9 IFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLnJlc291cmNlc1NvcnRPcHRpb25zOwor ICAgICAgICBpZiAoIW5ld09wdGlvbnMpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg dGhpcy5fbG9hZFNvcnRPcHRpb25Gb3JHcmFwaCh0aGlzLnRpbWVHcmFwaEl0ZW0sIG5ld09wdGlv bnMudGltZU9wdGlvbiB8fCAicmVzcG9uc2VUaW1lIik7CisgICAgICAgIHRoaXMuX2xvYWRTb3J0 T3B0aW9uRm9yR3JhcGgodGhpcy5zaXplR3JhcGhJdGVtLCBuZXdPcHRpb25zLnNpemVPcHRpb24g fHwgInRyYW5zZmVyU2l6ZSIpOworICAgIH0sCisKKyAgICBfbG9hZFNvcnRPcHRpb25Gb3JHcmFw aDogZnVuY3Rpb24oZ3JhcGhJdGVtLCBuZXdPcHRpb25OYW1lKQorICAgIHsKKyAgICAgICAgdmFy IHNvcnRpbmdPcHRpb25zID0gZ3JhcGhJdGVtLnNvcnRpbmdPcHRpb25zOworICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHNvcnRpbmdPcHRpb25zLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAg ICBpZiAoc29ydGluZ09wdGlvbnNbaV0ub3B0aW9uTmFtZSA9PT0gbmV3T3B0aW9uTmFtZSkgewor ICAgICAgICAgICAgICAgIGdyYXBoSXRlbS5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleCA9IGk7 CisgICAgICAgICAgICAgICAgLy8gUHJvcGFnYXRlIHRoZSBvcHRpb24gY2hhbmdlIGRvd24gdG8g dGhlIGN1cnJlbnRseSBzZWxlY3RlZCBvcHRpb24uCisgICAgICAgICAgICAgICAgaWYgKHRoaXMu X2xhc3RTZWxlY3RlZEdyYXBoVHJlZUVsZW1lbnQgPT09IGdyYXBoSXRlbSkgeworICAgICAgICAg ICAgICAgICAgICB0aGlzLl9sYXN0U2VsZWN0ZWRHcmFwaFRyZWVFbGVtZW50ID0gbnVsbDsKKyAg ICAgICAgICAgICAgICAgICAgdGhpcy5fZ3JhcGhTZWxlY3RlZChncmFwaEl0ZW0pOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0sCiAKICAgICBnZXQg bWFpblJlc291cmNlTG9hZFRpbWUoKQpAQCAtNjE4LDExICs2NDQsMTIgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIG9wdGlvbi5sYWJlbCA9 IHNvcnRpbmdPcHRpb24ubmFtZTsKICAgICAgICAgICAgIG9wdGlvbi5zb3J0aW5nRnVuY3Rpb24g PSBzb3J0aW5nT3B0aW9uLnNvcnRpbmdGdW5jdGlvbjsKICAgICAgICAgICAgIG9wdGlvbi5jYWxj dWxhdG9yID0gc29ydGluZ09wdGlvbi5jYWxjdWxhdG9yOworICAgICAgICAgICAgb3B0aW9uLm9w dGlvbk5hbWUgPSBzb3J0aW5nT3B0aW9uLm9wdGlvbk5hbWU7CiAgICAgICAgICAgICB0aGlzLnNv cnRpbmdTZWxlY3RFbGVtZW50LmFwcGVuZENoaWxkKG9wdGlvbik7CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXggPSB0cmVlRWxlbWVu dC5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleDsKLSAgICAgICAgdGhpcy5fY2hhbmdlU29ydGlu Z0Z1bmN0aW9uKCk7CisgICAgICAgIHRoaXMuX2RvQ2hhbmdlU29ydGluZ0Z1bmN0aW9uKCk7CiAK ICAgICAgICAgdGhpcy5jbG9zZVZpc2libGVSZXNvdXJjZSgpOwogICAgICAgICB0aGlzLmNvbnRh aW5lckVsZW1lbnQuc2Nyb2xsVG9wID0gMDsKQEAgLTY1OCw3ICs2ODUsMjEgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9jaGFuZ2VTb3J0aW5nRnVu Y3Rpb246IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBzZWxlY3RlZE9wdGlvbiA9IHRo aXMuc29ydGluZ1NlbGVjdEVsZW1lbnRbdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5zZWxlY3Rl ZEluZGV4XTsKKyAgICAgICAgdGhpcy5fZG9DaGFuZ2VTb3J0aW5nRnVuY3Rpb24oKTsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MucmVzb3VyY2VzU29ydE9wdGlvbnMg PSB7dGltZU9wdGlvbjogdGhpcy5fc2VsZWN0ZWRPcHRpb25OYW1lRm9yR3JhcGgodGhpcy50aW1l R3JhcGhJdGVtKSwgc2l6ZU9wdGlvbjogdGhpcy5fc2VsZWN0ZWRPcHRpb25OYW1lRm9yR3JhcGgo dGhpcy5zaXplR3JhcGhJdGVtKX07CisgICAgfSwKKworICAgIF9zZWxlY3RlZE9wdGlvbk5hbWVG b3JHcmFwaDogZnVuY3Rpb24oZ3JhcGhJdGVtKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGdyYXBo SXRlbS5zb3J0aW5nT3B0aW9uc1tncmFwaEl0ZW0uc2VsZWN0ZWRTb3J0aW5nT3B0aW9uSW5kZXhd Lm9wdGlvbk5hbWU7CisgICAgfSwKKworICAgIF9kb0NoYW5nZVNvcnRpbmdGdW5jdGlvbjogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIHNlbGVjdGVkSW5kZXggPSB0aGlzLnNvcnRpbmdT ZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXg7CisgICAgICAgIGlmICh0aGlzLl9sYXN0U2VsZWN0 ZWRHcmFwaFRyZWVFbGVtZW50KQorICAgICAgICAgICAgdGhpcy5fbGFzdFNlbGVjdGVkR3JhcGhU cmVlRWxlbWVudC5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleCA9IHNlbGVjdGVkSW5kZXg7Cisg ICAgICAgIHZhciBzZWxlY3RlZE9wdGlvbiA9IHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnRbc2Vs ZWN0ZWRJbmRleF07CiAgICAgICAgIHRoaXMuc29ydGluZ0Z1bmN0aW9uID0gc2VsZWN0ZWRPcHRp b24uc29ydGluZ0Z1bmN0aW9uOwogICAgICAgICB0aGlzLmNhbGN1bGF0b3IgPSB0aGlzLnN1bW1h cnlCYXIuY2FsY3VsYXRvciA9IHNlbGVjdGVkT3B0aW9uLmNhbGN1bGF0b3I7CiAgICAgfSwKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA0NTBlNjk0Li4yMmRiNDkx IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC01OCw2ICs1OCw3 IEBAIFdlYkluc3BlY3Rvci5wb3B1bGF0ZUFwcGxpY2F0aW9uU2V0dGluZ3MgPSBmdW5jdGlvbihz ZXR0aW5nc1N0cmluZykKICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0 YWxsU2V0dGluZygic2hvd1VzZXJBZ2VudFN0eWxlcyIsICJzaG93LXVzZXItYWdlbnQtc3R5bGVz IiwgdHJ1ZSk7CiAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNl dHRpbmcoInJlc291cmNlVmlld1RhYiIsICJyZXNvdXJjZS12aWV3LXRhYiIsICJjb250ZW50Iik7 CiAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRpbmcoImNv bnNvbGVIaXN0b3J5IiwgImNvbnNvbGUtaGlzdG9yeSIsIFtdKTsKKyAgICBXZWJJbnNwZWN0b3Iu YXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygicmVzb3VyY2VzU29ydE9wdGlvbnMi LCAicmVzb3VyY2VzLXNvcnQtb3B0aW9ucyIsIHt0aW1lT3B0aW9uOiAicmVzcG9uc2VUaW1lIiwg c2l6ZU9wdGlvbjogInRyYW5zZmVyU2l6ZSJ9KTsKIAogICAgIFdlYkluc3BlY3Rvci5hcHBsaWNh dGlvblNldHRpbmdzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygibG9hZGVkIik7CiB9Cg== 62406 2010-07-23 03:39:31 -0700 2010-07-23 09:44:10 -0700 [PATCH] ChangeLog message augmented persistsorting.patch text/plain 10394 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2VlMTlhMC4uMjhlMDI0NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNy0yMiAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluc3BlY3RvciBzaG91bGQgcmVtZW1iZXIgcmVzb3VyY2Vz IHNvcnRpbmcgc2V0IGJ5IHRoZSB1c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTIwOAorCisgICAgICAgIFNvcnRpbmcgb3B0aW9ucyBib3RoIGZv ciB0aW1lIGFuZCBzaXplIGdyYXBocyBhcmUgbWVtb3JpemVkIGluIGEgc2luZ2xlIHByb3BlcnR5 LAorICAgICAgICB3aGljaCBtYWtlcyB0aGVtIHBvc3NpYmxlIHRvIHJldHJpZXZlIGluIGEgc2lu Z2xlIG1lc3NhZ2UgKGUuZy4gdXNlZnVsIGZvciByZW1vdGUgZGVidWdnaW5nKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnBvcHVsYXRlU2lkZWJhcik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zZXR0aW5nc0xvYWRl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9sb2Fk U29ydE9wdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZS5fbG9hZFNvcnRPcHRpb25Gb3JHcmFwaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlLl9ncmFwaFNlbGVjdGVkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2NoYW5nZVNvcnRpbmdGdW5jdGlvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zZWxlY3RlZE9w dGlvbk5hbWVGb3JHcmFwaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwu cHJvdG90eXBlLl9kb0NoYW5nZVNvcnRpbmdGdW5jdGlvbik6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5wb3B1bGF0ZUFw cGxpY2F0aW9uU2V0dGluZ3MpOgorCiAyMDEwLTA3LTIyICBBbmRyZXkgS29zeWFrb3YgIDxjYXNl cUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCBi MDJhMjc3Li4yYWQ2MmE5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzCkBAIC04MiwzMCArODIsMzAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1Bh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHBvcHVsYXRlU2lkZWJhcjogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgdmFyIHRpbWVHcmFwaEl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlNpZGViYXJU cmVlRWxlbWVudCgicmVzb3VyY2VzLXRpbWUtZ3JhcGgtc2lkZWJhci1pdGVtIiwgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJUaW1lIikpOwotICAgICAgICB0aW1lR3JhcGhJdGVtLm9uc2VsZWN0ID0g dGhpcy5fZ3JhcGhTZWxlY3RlZC5iaW5kKHRoaXMpOworICAgICAgICB0aGlzLnRpbWVHcmFwaEl0 ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCgicmVzb3VyY2VzLXRpbWUt Z3JhcGgtc2lkZWJhci1pdGVtIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lIikpOworICAg ICAgICB0aGlzLnRpbWVHcmFwaEl0ZW0ub25zZWxlY3QgPSB0aGlzLl9ncmFwaFNlbGVjdGVkLmJp bmQodGhpcyk7CiAKICAgICAgICAgdmFyIHRyYW5zZmVyVGltZUNhbGN1bGF0b3IgPSBuZXcgV2Vi SW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJUaW1lQ2FsY3VsYXRvcigpOwogICAgICAgICB2YXIg dHJhbnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJh bnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IoKTsKIAotICAgICAgICB0aW1lR3JhcGhJdGVtLnNvcnRp bmdPcHRpb25zID0gWwotICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNvcnQgYnkgU3RhcnQgVGltZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNv dXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlBc2NlbmRpbmdTdGFydFRpbWUsIGNhbGN1 bGF0b3I6IHRyYW5zZmVyVGltZUNhbGN1bGF0b3IgfSwKLSAgICAgICAgICAgIHsgbmFtZTogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0IGJ5IFJlc3BvbnNlIFRpbWUiKSwgc29ydGluZ0Z1bmN0 aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5QXNj ZW5kaW5nUmVzcG9uc2VSZWNlaXZlZFRpbWUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyVGltZUNhbGN1 bGF0b3IgfSwKLSAgICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0 IGJ5IEVuZCBUaW1lIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lk ZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeUFzY2VuZGluZ0VuZFRpbWUsIGNhbGN1bGF0b3I6IHRy YW5zZmVyVGltZUNhbGN1bGF0b3IgfSwKLSAgICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTb3J0IGJ5IER1cmF0aW9uIiksIHNvcnRpbmdGdW5jdGlvbjogV2ViSW5zcGVj dG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdEdXJhdGlv biwgY2FsY3VsYXRvcjogdHJhbnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IgfSwKLSAgICAgICAgICAg IHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0IGJ5IExhdGVuY3kiKSwgc29ydGlu Z0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFy ZUJ5RGVzY2VuZGluZ0xhdGVuY3ksIGNhbGN1bGF0b3I6IHRyYW5zZmVyRHVyYXRpb25DYWxjdWxh dG9yIH0sCisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbS5zb3J0aW5nT3B0aW9ucyA9IFsKKyAg ICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0IGJ5IFN0YXJ0IFRp bWUiKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQuQ29tcGFyZUJ5QXNjZW5kaW5nU3RhcnRUaW1lLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclRp bWVDYWxjdWxhdG9yLCBvcHRpb25OYW1lOiAic3RhcnRUaW1lIiB9LAorICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgUmVzcG9uc2UgVGltZSIpLCBzb3J0 aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21w YXJlQnlBc2NlbmRpbmdSZXNwb25zZVJlY2VpdmVkVGltZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJU aW1lQ2FsY3VsYXRvciwgb3B0aW9uTmFtZTogInJlc3BvbnNlVGltZSIgfSwKKyAgICAgICAgICAg IHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0IGJ5IEVuZCBUaW1lIiksIHNvcnRp bmdGdW5jdGlvbjogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBh cmVCeUFzY2VuZGluZ0VuZFRpbWUsIGNhbGN1bGF0b3I6IHRyYW5zZmVyVGltZUNhbGN1bGF0b3Is IG9wdGlvbk5hbWU6ICJlbmRUaW1lIiB9LAorICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlNvcnQgYnkgRHVyYXRpb24iKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5RGVzY2VuZGluZ0R1cmF0 aW9uLCBjYWxjdWxhdG9yOiB0cmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRvciwgb3B0aW9uTmFtZTog ImR1cmF0aW9uIiB9LAorICAgICAgICAgICAgeyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNvcnQgYnkgTGF0ZW5jeSIpLCBzb3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5nTGF0ZW5jeSwgY2FsY3VsYXRv cjogdHJhbnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IsIG9wdGlvbk5hbWU6ICJsYXRlbmN5IiB9LAog ICAgICAgICBdOwogCi0gICAgICAgIHRpbWVHcmFwaEl0ZW0uaXNCYXJPcGFxdWVBdExlZnQgPSBm YWxzZTsKLSAgICAgICAgdGltZUdyYXBoSXRlbS5zZWxlY3RlZFNvcnRpbmdPcHRpb25JbmRleCA9 IDE7CisgICAgICAgIHRoaXMudGltZUdyYXBoSXRlbS5pc0Jhck9wYXF1ZUF0TGVmdCA9IGZhbHNl OworICAgICAgICB0aGlzLnRpbWVHcmFwaEl0ZW0uc2VsZWN0ZWRTb3J0aW5nT3B0aW9uSW5kZXgg PSAxOwogCiAgICAgICAgIHRoaXMuc2l6ZUdyYXBoSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lk ZWJhclRyZWVFbGVtZW50KCJyZXNvdXJjZXMtc2l6ZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKSk7CiAgICAgICAgIHRoaXMuc2l6ZUdyYXBoSXRlbS5v bnNlbGVjdCA9IHRoaXMuX2dyYXBoU2VsZWN0ZWQuYmluZCh0aGlzKTsKIAogICAgICAgICB2YXIg dHJhbnNmZXJTaXplQ2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2Zl clNpemVDYWxjdWxhdG9yKCk7CiAgICAgICAgIHRoaXMuc2l6ZUdyYXBoSXRlbS5zb3J0aW5nT3B0 aW9ucyA9IFsKLSAgICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3J0 IGJ5IFRyYW5zZmVyIFNpemUiKSwgc29ydGluZ0Z1bmN0aW9uOiBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTaWRlYmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5RGVzY2VuZGluZ1RyYW5zZmVyU2l6ZSwgY2Fs Y3VsYXRvcjogdHJhbnNmZXJTaXplQ2FsY3VsYXRvciB9LAotICAgICAgICAgICAgeyBuYW1lOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgU2l6ZSIpLCBzb3J0aW5nRnVuY3Rpb246IFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlEZXNjZW5kaW5n U2l6ZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJTaXplQ2FsY3VsYXRvciB9LAorICAgICAgICAgICAg eyBuYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgVHJhbnNmZXIgU2l6ZSIpLCBz b3J0aW5nRnVuY3Rpb246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5D b21wYXJlQnlEZXNjZW5kaW5nVHJhbnNmZXJTaXplLCBjYWxjdWxhdG9yOiB0cmFuc2ZlclNpemVD YWxjdWxhdG9yLCBvcHRpb25OYW1lOiAidHJhbnNmZXJTaXplIiB9LAorICAgICAgICAgICAgeyBu YW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvcnQgYnkgU2l6ZSIpLCBzb3J0aW5nRnVuY3Rp b246IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5Db21wYXJlQnlEZXNj ZW5kaW5nU2l6ZSwgY2FsY3VsYXRvcjogdHJhbnNmZXJTaXplQ2FsY3VsYXRvciwgb3B0aW9uTmFt ZTogInNpemUiIH0sCiAgICAgICAgIF07CiAKICAgICAgICAgdGhpcy5zaXplR3JhcGhJdGVtLmlz QmFyT3BhcXVlQXRMZWZ0ID0gdHJ1ZTsKQEAgLTExNCw3ICsxMTQsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmdyYXBoc1RyZWVFbGVt ZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyU2VjdGlvblRyZWVFbGVtZW50KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiR1JBUEhTIiksIHt9LCB0cnVlKTsKICAgICAgICAgdGhpcy5zaWRlYmFy VHJlZS5hcHBlbmRDaGlsZCh0aGlzLmdyYXBoc1RyZWVFbGVtZW50KTsKIAotICAgICAgICB0aGlz LmdyYXBoc1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKHRpbWVHcmFwaEl0ZW0pOworICAgICAgICB0 aGlzLmdyYXBoc1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudGltZUdyYXBoSXRlbSk7CiAg ICAgICAgIHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaXplR3JhcGhJ dGVtKTsKICAgICAgICAgdGhpcy5ncmFwaHNUcmVlRWxlbWVudC5leHBhbmQoKTsKIApAQCAtMTYw LDYgKzE2MCwzMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi50b2dnbGVkID0gV2ViSW5zcGVjdG9y LmFwcGxpY2F0aW9uU2V0dGluZ3MucmVzb3VyY2VzTGFyZ2VSb3dzOwogICAgICAgICBpZiAoIVdl Ykluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLnJlc291cmNlc0xhcmdlUm93cykKICAgICAg ICAgICAgIHRoaXMuX3NldExhcmdlclJlc291cmNlcyhXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25T ZXR0aW5ncy5yZXNvdXJjZXNMYXJnZVJvd3MpOworICAgICAgICB0aGlzLl9sb2FkU29ydE9wdGlv bnMoKTsKKyAgICB9LAorCisgICAgX2xvYWRTb3J0T3B0aW9uczogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgdmFyIG5ld09wdGlvbnMgPSBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5n cy5yZXNvdXJjZXNTb3J0T3B0aW9uczsKKyAgICAgICAgaWYgKCFuZXdPcHRpb25zKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2xvYWRTb3J0T3B0aW9uRm9yR3JhcGgodGhp cy50aW1lR3JhcGhJdGVtLCBuZXdPcHRpb25zLnRpbWVPcHRpb24gfHwgInJlc3BvbnNlVGltZSIp OworICAgICAgICB0aGlzLl9sb2FkU29ydE9wdGlvbkZvckdyYXBoKHRoaXMuc2l6ZUdyYXBoSXRl bSwgbmV3T3B0aW9ucy5zaXplT3B0aW9uIHx8ICJ0cmFuc2ZlclNpemUiKTsKKyAgICB9LAorCisg ICAgX2xvYWRTb3J0T3B0aW9uRm9yR3JhcGg6IGZ1bmN0aW9uKGdyYXBoSXRlbSwgbmV3T3B0aW9u TmFtZSkKKyAgICB7CisgICAgICAgIHZhciBzb3J0aW5nT3B0aW9ucyA9IGdyYXBoSXRlbS5zb3J0 aW5nT3B0aW9uczsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzb3J0aW5nT3B0aW9ucy5s ZW5ndGg7ICsraSkgeworICAgICAgICAgICAgaWYgKHNvcnRpbmdPcHRpb25zW2ldLm9wdGlvbk5h bWUgPT09IG5ld09wdGlvbk5hbWUpIHsKKyAgICAgICAgICAgICAgICBncmFwaEl0ZW0uc2VsZWN0 ZWRTb3J0aW5nT3B0aW9uSW5kZXggPSBpOworICAgICAgICAgICAgICAgIC8vIFByb3BhZ2F0ZSB0 aGUgb3B0aW9uIGNoYW5nZSBkb3duIHRvIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgb3B0aW9uLgor ICAgICAgICAgICAgICAgIGlmICh0aGlzLl9sYXN0U2VsZWN0ZWRHcmFwaFRyZWVFbGVtZW50ID09 PSBncmFwaEl0ZW0pIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fbGFzdFNlbGVjdGVkR3Jh cGhUcmVlRWxlbWVudCA9IG51bGw7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2dyYXBoU2Vs ZWN0ZWQoZ3JhcGhJdGVtKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAg ICAgIH0KICAgICB9LAogCiAgICAgZ2V0IG1haW5SZXNvdXJjZUxvYWRUaW1lKCkKQEAgLTYxOCwx MSArNjQ0LDEyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBvcHRpb24ubGFiZWwgPSBzb3J0aW5nT3B0aW9uLm5hbWU7CiAgICAgICAgICAg ICBvcHRpb24uc29ydGluZ0Z1bmN0aW9uID0gc29ydGluZ09wdGlvbi5zb3J0aW5nRnVuY3Rpb247 CiAgICAgICAgICAgICBvcHRpb24uY2FsY3VsYXRvciA9IHNvcnRpbmdPcHRpb24uY2FsY3VsYXRv cjsKKyAgICAgICAgICAgIG9wdGlvbi5vcHRpb25OYW1lID0gc29ydGluZ09wdGlvbi5vcHRpb25O YW1lOwogICAgICAgICAgICAgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZChv cHRpb24pOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5z ZWxlY3RlZEluZGV4ID0gdHJlZUVsZW1lbnQuc2VsZWN0ZWRTb3J0aW5nT3B0aW9uSW5kZXg7Ci0g ICAgICAgIHRoaXMuX2NoYW5nZVNvcnRpbmdGdW5jdGlvbigpOworICAgICAgICB0aGlzLl9kb0No YW5nZVNvcnRpbmdGdW5jdGlvbigpOwogCiAgICAgICAgIHRoaXMuY2xvc2VWaXNpYmxlUmVzb3Vy Y2UoKTsKICAgICAgICAgdGhpcy5jb250YWluZXJFbGVtZW50LnNjcm9sbFRvcCA9IDA7CkBAIC02 NTgsNyArNjg1LDIxIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7 CiAKICAgICBfY2hhbmdlU29ydGluZ0Z1bmN0aW9uOiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB2YXIgc2VsZWN0ZWRPcHRpb24gPSB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50W3RoaXMuc29y dGluZ1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRleF07CisgICAgICAgIHRoaXMuX2RvQ2hhbmdl U29ydGluZ0Z1bmN0aW9uKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRp bmdzLnJlc291cmNlc1NvcnRPcHRpb25zID0ge3RpbWVPcHRpb246IHRoaXMuX3NlbGVjdGVkT3B0 aW9uTmFtZUZvckdyYXBoKHRoaXMudGltZUdyYXBoSXRlbSksIHNpemVPcHRpb246IHRoaXMuX3Nl bGVjdGVkT3B0aW9uTmFtZUZvckdyYXBoKHRoaXMuc2l6ZUdyYXBoSXRlbSl9OworICAgIH0sCisK KyAgICBfc2VsZWN0ZWRPcHRpb25OYW1lRm9yR3JhcGg6IGZ1bmN0aW9uKGdyYXBoSXRlbSkKKyAg ICB7CisgICAgICAgIHJldHVybiBncmFwaEl0ZW0uc29ydGluZ09wdGlvbnNbZ3JhcGhJdGVtLnNl bGVjdGVkU29ydGluZ09wdGlvbkluZGV4XS5vcHRpb25OYW1lOworICAgIH0sCisKKyAgICBfZG9D aGFuZ2VTb3J0aW5nRnVuY3Rpb246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBzZWxl Y3RlZEluZGV4ID0gdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4OworICAg ICAgICBpZiAodGhpcy5fbGFzdFNlbGVjdGVkR3JhcGhUcmVlRWxlbWVudCkKKyAgICAgICAgICAg IHRoaXMuX2xhc3RTZWxlY3RlZEdyYXBoVHJlZUVsZW1lbnQuc2VsZWN0ZWRTb3J0aW5nT3B0aW9u SW5kZXggPSBzZWxlY3RlZEluZGV4OworICAgICAgICB2YXIgc2VsZWN0ZWRPcHRpb24gPSB0aGlz LnNvcnRpbmdTZWxlY3RFbGVtZW50W3NlbGVjdGVkSW5kZXhdOwogICAgICAgICB0aGlzLnNvcnRp bmdGdW5jdGlvbiA9IHNlbGVjdGVkT3B0aW9uLnNvcnRpbmdGdW5jdGlvbjsKICAgICAgICAgdGhp cy5jYWxjdWxhdG9yID0gdGhpcy5zdW1tYXJ5QmFyLmNhbGN1bGF0b3IgPSBzZWxlY3RlZE9wdGlv bi5jYWxjdWxhdG9yOwogICAgIH0sCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2V0dGluZ3MuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMKaW5kZXggNDUwZTY5NC4uMjJkYjQ5MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T ZXR0aW5ncy5qcwpAQCAtNTgsNiArNTgsNyBAQCBXZWJJbnNwZWN0b3IucG9wdWxhdGVBcHBsaWNh dGlvblNldHRpbmdzID0gZnVuY3Rpb24oc2V0dGluZ3NTdHJpbmcpCiAgICAgV2ViSW5zcGVjdG9y LmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRpbmcoInNob3dVc2VyQWdlbnRTdHlsZXMi LCAic2hvdy11c2VyLWFnZW50LXN0eWxlcyIsIHRydWUpOwogICAgIFdlYkluc3BlY3Rvci5hcHBs aWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJyZXNvdXJjZVZpZXdUYWIiLCAicmVzb3Vy Y2Utdmlldy10YWIiLCAiY29udGVudCIpOwogICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNl dHRpbmdzLmluc3RhbGxTZXR0aW5nKCJjb25zb2xlSGlzdG9yeSIsICJjb25zb2xlLWhpc3Rvcnki LCBbXSk7CisgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRp bmcoInJlc291cmNlc1NvcnRPcHRpb25zIiwgInJlc291cmNlcy1zb3J0LW9wdGlvbnMiLCB7dGlt ZU9wdGlvbjogInJlc3BvbnNlVGltZSIsIHNpemVPcHRpb246ICJ0cmFuc2ZlclNpemUifSk7CiAK ICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoImxvYWRlZCIpOwogfQo=