144487 2015-04-30 20:14:52 -0700 Update speedometer patch to provide better UI and fix merge result bug. 2018-01-17 19:12:56 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu glenn rniwa oldest_to_newest 1090716 0 dewei_zhu 2015-04-30 20:14:52 -0700 Update speedometer patch to provide better UI and fix merge result bug. 1090717 1 252132 dewei_zhu 2015-04-30 20:17:13 -0700 Created attachment 252132 Patch 1090718 2 252132 rniwa 2015-04-30 20:28:55 -0700 Comment on attachment 252132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252132&action=review > Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:80 > ++ var enabledSuites = Suites.filter(function (suite) { return !suite.disabled }); > ++ var values = timeValues.map(function (time) { return 60 * 1000 * enabledSuites.length / time}); Alternatively, we can just use measuredValues.length. That's probably better here. > Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:104 > ++ console.log(results); Superflous logging. > Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:116 > -+ > ++ What's up with this change? > Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:120 > -+ > ++ Ditto. 1090731 3 252136 dewei_zhu 2015-05-01 00:36:12 -0700 Created attachment 252136 Patch 1090732 4 252132 dewei_zhu 2015-05-01 00:43:58 -0700 Comment on attachment 252132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252132&action=review >> Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:116 >> ++ > > What's up with this change? Delete unnecessary space for blank line. 1090733 5 252136 rniwa 2015-05-01 01:01:49 -0700 Comment on attachment 252136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252136&action=review > Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch:80 > ++ var values = timeValues.map(function (time) { return 60 * 1000 * enabledSuites.length / time}); I really don't think we should be duplicating the logic to compute the score in this file. Please modify Performance/Speedometer/resources/main.js to expose this function as a global function and use it here. 1090742 6 252140 dewei_zhu 2015-05-01 01:46:20 -0700 Created attachment 252140 Patch 1090746 7 252142 dewei_zhu 2015-05-01 02:00:06 -0700 Created attachment 252142 Patch 1090862 8 252142 commit-queue 2015-05-01 12:43:51 -0700 Comment on attachment 252142 Patch Clearing flags on attachment: 252142 Committed r183685: <http://trac.webkit.org/changeset/183685> 1090863 9 commit-queue 2015-05-01 12:43:55 -0700 All reviewed patches have been landed. Closing bug. 1090889 10 252142 darin 2015-05-01 14:50:29 -0700 Comment on attachment 252142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252142&action=review > PerformanceTests/Speedometer/resources/main.js:55 > + return computerScore(time); this says computerScore > PerformanceTests/Speedometer/resources/main.js:161 > +function computeScore(time) { this says computeScore Since they don’t match, does this work? How did we test? 1090892 11 252142 dewei_zhu 2015-05-01 15:08:25 -0700 Comment on attachment 252142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252142&action=review >> PerformanceTests/Speedometer/resources/main.js:161 >> +function computeScore(time) { > > this says computeScore > > Since they don’t match, does this work? How did we test? Sorry for the typo. I should have tested for both automatic test as well as manual test. Since automatic test will override the benchmarkClient, this error is not trigger. Sorry again. I will fix it immediately. 1090895 12 dewei_zhu 2015-05-01 15:14:32 -0700 Reopening to attach new patch. 1090896 13 252173 dewei_zhu 2015-05-01 15:14:34 -0700 Created attachment 252173 Patch 1090897 14 252173 rniwa 2015-05-01 15:15:28 -0700 Comment on attachment 252173 Patch This patch can't be applied because the previous patch has already been landed. Please rebase your patch against ToT. 252132 2015-04-30 20:17:13 -0700 2015-05-01 00:36:07 -0700 Patch bug-144487-20150430201601.patch text/plain 7496 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI3Zjc1MDMwYmQ0YTM0ZDBiMTkxZGNhM2EzNzczYTM4 MWQ2MTk3Yi4uNGIzNzcyOGEwODc2Mjg2MjE0MWNlOTAwZTBhODkzNmM5NjdkNWQxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTA0LTMwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBzcGVlZG9tZXRlciBwYXRjaCB0byBwcm92aWRlIGJldHRlciBVSSwgZml4IG1l cmdlIHJlc3VsdCBidWcgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYyB0byBzcGVlZG9tZXRlciBiZW5j aG1hcmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQ0ODcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5tZXJnZSk6IEZpeCBidWcuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRj aDogVXBkYXRlIGFwcGVhcmFuY2UgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYy4KKwogMjAxNS0wNC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRl IGEgcnVudGltZSBmbGFnIHRvIHJ1bi13ZWJraXQtdGVzdHMgdGhhdCBzaG93cyB0aGUgdGVzdCB2 aWV3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDg0MzUwY2Y4NTBlNzE4NzVmZTc3ZDgxZDY5 Nzg1ZmEwZjIzOTA4NTYuLmJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5j aG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC05Niw5ICs5Niw3IEBAIGNsYXNzIEJlbmNobWFy a1J1bm5lcihvYmplY3QpOgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhLCB0eXBlKGIpKSkK ICAgICAgICAgYXJnVHlwZSA9IHR5cGUoYSkKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3Ig bGlzdCB0eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKLSAgICAg ICAgaWYgYXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKLSAgICAgICAgICAgIHJldHVybiBhICsg YgotICAgICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuTGlzdFR5 cGUgYW5kIGxlbihhKSBhbmQgKHR5cGUoYVswXSkgPT0gdHlwZXMuU3RyaW5nVHlwZSBvciB0eXBl KGFbMF0pID09IHR5cGVzLlVuaWNvZGVUeXBlKToKICAgICAgICAgICAgIHJldHVybiBhCiAgICAg ICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuRGljdFR5cGU6CiAgICAgICAgICAgICByZXN1bHQgPSB7 fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvU3BlZWRvbWV0ZXIucGF0Y2gKaW5kZXggMzNiMGYz MmUxZWIzMjQ0YmMwMDQ0ODQ1MmI0ZjU3ZDA4MjkzMDU5Zi4uNjA1ZDZkMzQ3MGFkMzgxM2UxNDQ2 OGJjODQxNmFjNGRkNDQ0ODc2NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaAorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoCkBAIC0xMSwxMCArMTEsMTAgQEAgaW5kZXggNDE5YjlmMi4uMGIwNGM2OSAxMDA2 NDQKICA8L2hlYWQ+CiAgPGJvZHk+CiBkaWZmIC0tZ2l0IGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2Vz L2JlbmNobWFyay1yZXBvcnQuanMgYi9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJl cG9ydC5qcwotaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKK2luZGV4IGM0YjRjNjQuLjY0 YWZhOGQgMTAwNjQ0CiAtLS0gYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJlcG9y dC5qcwogKysrIGIvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL2JlbmNobWFyay1yZXBvcnQuanMKLUBA IC0xLDE2ICsxLDkgQEAKK0BAIC0xLDMwICsxLDI2IEBACiAgLy8gVGhpcyBmaWxlIGNhbiBiZSBj dXN0b21pemVkIHRvIHJlcG9ydCByZXN1bHRzIGFzIG5lZWRlZC4KICAKICAoZnVuY3Rpb24gKCkg ewpAQCAtMjgsMTAgKzI4LDMyIEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAtICAg IHNjcmlwdEVsZW1lbnQuc3JjID0gJy4uL3Jlc291cmNlcy9ydW5uZXIuanMnOwogLSAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZENoaWxkKHNjcmlwdEVsZW1lbnQpOwogLQotICAgICB2YXIgc3R5bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2MDBweDsgfSc7Ci0gICAgIGRv Y3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKLUBAIC0zNiwxMCArMjksOCBA QAorLSAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUn KTsKKy0gICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2 MDBweDsgfSc7CistICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsK Ky0KKysgICAgc2hvd1NlY3Rpb24oJ3J1bm5pbmcnKQorICAgICB2YXIgY3JlYXRlVGVzdDsKKyAg ICAgdmFyIHZhbHVlc0J5SXRlcmF0aW9uID0gbmV3IEFycmF5OworKyAgICB2YXIgdGltZVZhbHVl cyA9IG5ldyBBcnJheTsKKyAKKyAgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uICgpIHsKKy0g ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign bWFpbicpKTsKKyAgICAgICAgIHN0YXJ0QmVuY2htYXJrKCk7CisgICAgIH0KKyAKKyAgICAgd2lu ZG93LmJlbmNobWFya0NsaWVudCA9IHsKKyAgICAgICAgIGl0ZXJhdGlvbkNvdW50OiA1LCAvLyBV c2UgNCBkaWZmZXJlbnQgaW5zdGFuY2VzIG9mIERSVC9XVFIgdG8gcnVuIDUgaXRlcmF0aW9ucy4K KysgICAgICAgIHdpbGxBZGRUZXN0RnJhbWU6IGZ1bmN0aW9uIChmcmFtZSkgeworKyAgICAgICAg ICAgIHZhciBtYWluID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWFpbicpOworKyAgICAgICAg ICAgIHZhciBzdHlsZSA9IGdldENvbXB1dGVkU3R5bGUobWFpbik7CisrICAgICAgICAgICAgZnJh bWUuc3R5bGUubGVmdCA9IG1haW4ub2Zmc2V0TGVmdCArIHBhcnNlSW50KHN0eWxlLmJvcmRlckxl ZnRXaWR0aCkgKyBwYXJzZUludChzdHlsZS5wYWRkaW5nTGVmdCkgKyAncHgnOworKyAgICAgICAg ICAgIGZyYW1lLnN0eWxlLnRvcCA9IG1haW4ub2Zmc2V0VG9wICsgcGFyc2VJbnQoc3R5bGUuYm9y ZGVyVG9wV2lkdGgpICsgcGFyc2VJbnQoc3R5bGUucGFkZGluZ1RvcCkgKyAncHgnOworKyAgICAg ICAgfSwKKyAgICAgICAgIHdpbGxTdGFydEZpcnN0SXRlcmF0aW9uOiBmdW5jdGlvbiAoaXRlcmF0 aW9uQ291bnQpIHsKKyAgICAgICAgICAgICBjcmVhdGVUZXN0ID0gZnVuY3Rpb24gKG5hbWUsIGFn Z3JlZ2F0b3IsIGlzTGFzdFRlc3QpIHsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHsKK0BAIC0z NiwxNSArMzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgIG5hbWU6IG5hbWUsCiAgICAgICAg ICAgICAgICAgICAgICBhZ2dyZWdhdG9yOiBhZ2dyZWdhdG9yfTsKICAgICAgICAgICAgICB9CkBA IC00MCwyMiArNjIsMjkgQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAg IGRpZFJ1blN1aXRlczogZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAtICAgICAgICAgICAg UGVyZlRlc3RSdW5uZXIubWVhc3VyZVZhbHVlQXN5bmMobWVhc3VyZWRWYWx1ZXMudG90YWwpOwog ICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLnB1c2gobWVhc3VyZWRWYWx1ZXMudGVzdHMp OworKyAgICAgICAgICAgIHRpbWVWYWx1ZXMucHVzaChtZWFzdXJlZFZhbHVlcy50b3RhbCk7CiAg ICAgICAgICB9LAogICAgICAgICAgZGlkRmluaXNoTGFzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkg ewotQEAgLTUyLDE5ICs0MywzMCBAQAorLSAgICAgICAgICAgIGRvY3VtZW50LmhlYWQucmVtb3Zl Q2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc3R5bGUnKSk7CistCisgICAgICAgICAgICAg dmFyIG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZSA9IHt9OworICAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvTWVhc3VyZWRWYWx1ZSh2YWx1ZSwgZnVsbE5hbWUsIGFnZ3JlZ2F0b3IpIHsKKyAgICAg ICAgICAgICAgICAgdmFyIHZhbHVlcyA9IG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZVtmdWxsTmFt ZV0gfHwgbmV3IEFycmF5OworQEAgLTUyLDE5ICs0NSwzMiBAQAogICAgICAgICAgICAgICAgICB2 YWx1ZXMucHVzaCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgIHZhbHVlcy5hZ2dyZWdhdG9yID0g YWdncmVnYXRvcjsKICAgICAgICAgICAgICB9CiAtCiArICAgICAgICAgICAgdmFyIGRpY3QgPSB7 fQorKyAgICAgICAgICAgIHZhciBlbmFibGVkU3VpdGVzID0gU3VpdGVzLmZpbHRlcihmdW5jdGlv biAoc3VpdGUpIHsgcmV0dXJuICFzdWl0ZS5kaXNhYmxlZCB9KTsKKysgICAgICAgICAgICB2YXIg dmFsdWVzID0gdGltZVZhbHVlcy5tYXAoZnVuY3Rpb24gKHRpbWUpIHsgcmV0dXJuIDYwICogMTAw MCAqIGVuYWJsZWRTdWl0ZXMubGVuZ3RoIC8gdGltZX0pOwogKyAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvRGljdGlvbmFyeVZhbHVlKHZhbHVlLCBzdWl0ZU5hbWUsIHRlc3ROYW1lLCBzdWJ0ZXN0 TmFtZSkgewotKyAgICAgICAgICAgICAgICBkaWN0WyJTcGVlZG9tZXRlciJdID0gZGljdFsiU3Bl ZWRvbWV0ZXIiXSB8fCB7ICJtZXRyaWNzIiA6IHsgIlRpbWUiIDogWyAiVG90YWwiLCBdIH0sICJ0 ZXN0cyIgOiB7fX07CisrICAgICAgICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl0gPSBkaWN0 WyJTcGVlZG9tZXRlciJdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGltZSIgOiBbICJUb3RhbCIsIF0s ICJTY29yZSI6IHsiY3VycmVudCI6IFt2YWx1ZXNdfX0sICJ0ZXN0cyIgOiB7fX07CiArICAgICAg ICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXSA9IGRpY3Rb IlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXSB8fCB7Im1ldHJpY3MiIDogeyAiVGlt ZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6IHt9fTsKICsgICAgICAgICAgICAgICAgZGlj dFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXSA9 IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFt ZV0gfHwgeyAibWV0cmljcyIgOiB7ICJUaW1lIiA6IFsgIlRvdGFsIiwgXSB9LCAidGVzdHMiIDog e319OwogKyAgICAgICAgICAgICAgICBkaWN0WyJTcGVlZG9tZXRlciJdWyJ0ZXN0cyJdW3N1aXRl TmFtZV1bInRlc3RzIl1bdGVzdE5hbWVdWyJ0ZXN0cyJdW3N1YnRlc3ROYW1lXSA9IGRpY3RbIlNw ZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFtZV1bInRlc3Rz Il1bc3VidGVzdE5hbWVdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGltZSIgOiB7ICJjdXJyZW50IiA6 IFtbXV0gfSB9fTsKICsgICAgICAgICAgICAgICAgZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMi XVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXVsidGVzdHMiXVtzdWJ0ZXN0TmFtZV1bIm1l dHJpY3MiXVsiVGltZSJdWyJjdXJyZW50Il1bMF0ucHVzaCh2YWx1ZSk7CiArICAgICAgICAgICAg fQotKyAgICAgICAgICAgIAogICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLmZvckVhY2go ZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAgICAgICAgICAgICAgICAgIGZvciAodmFyIHN1 aXRlTmFtZSBpbiBtZWFzdXJlZFZhbHVlcykgewogICAgICAgICAgICAgICAgICAgICAgdmFyIHN1 aXRlID0gbWVhc3VyZWRWYWx1ZXNbc3VpdGVOYW1lXTsKQEAgLTcyLDEwICsxMDEsMTEgQEAgaW5k ZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgIH0pOwogKyAgICAgICAgICAgIHZhciByZXN1bHRzID0gSlNPTi5zdHJpbmdpZnkoZGljdCk7 CisrICAgICAgICAgICAgY29uc29sZS5sb2cocmVzdWx0cyk7CiAgCiAgICAgICAgICAgICAgdmFy IGZ1bGxOYW1lcyA9IG5ldyBBcnJheTsKICAgICAgICAgICAgICBmb3IgKHZhciBmdWxsTmFtZSBp biBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWUpCi1AQCAtNzIsOCArNzQsMjIgQEAKK0BAIC03Miw4 ICs3OCwyMiBAQAogIAogICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZnVsbE5hbWVz Lmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgIHZhciB2YWx1ZXMgPSBtZWFzdXJlZFZh bHVlc0J5RnVsbE5hbWVbZnVsbE5hbWVzW2ldXTsKQEAgLTgzLDExICsxMTMsMTEgQEAgaW5kZXgg YzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAgICAgICB9CiArICAgICAgICAgICAgdmFy IHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogKyAgICAgICAgICAgIHhoci5vcGVuKCJQT1NU IiwgIi9yZXBvcnQiKTsKLSsgCisrCiArICAgICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIo IkNvbnRlbnQtdHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CiArICAgICAgICAgICAgeGhyLnNl dFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5sZW5ndGgpOwogKyAgICAg ICAgICAgIHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwgImNsb3NlIik7Ci0rIAor KwogKyAgICAgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBmdW5jdGlvbigpIHsKICsg ICAgICAgICAgICAgICAgaWYoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAm JiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAgICAgICAgICAgICAgICAgdmFyIGNsb3NlUmVx dWVzdCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwo= 252136 2015-05-01 00:36:12 -0700 2015-05-01 01:46:15 -0700 Patch bug-144487-20150501003500.patch text/plain 7370 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI3Zjc1MDMwYmQ0YTM0ZDBiMTkxZGNhM2EzNzczYTM4 MWQ2MTk3Yi4uNGIzNzcyOGEwODc2Mjg2MjE0MWNlOTAwZTBhODkzNmM5NjdkNWQxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTA0LTMwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBzcGVlZG9tZXRlciBwYXRjaCB0byBwcm92aWRlIGJldHRlciBVSSwgZml4IG1l cmdlIHJlc3VsdCBidWcgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYyB0byBzcGVlZG9tZXRlciBiZW5j aG1hcmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQ0ODcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5tZXJnZSk6IEZpeCBidWcuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRj aDogVXBkYXRlIGFwcGVhcmFuY2UgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYy4KKwogMjAxNS0wNC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRl IGEgcnVudGltZSBmbGFnIHRvIHJ1bi13ZWJraXQtdGVzdHMgdGhhdCBzaG93cyB0aGUgdGVzdCB2 aWV3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDg0MzUwY2Y4NTBlNzE4NzVmZTc3ZDgxZDY5 Nzg1ZmEwZjIzOTA4NTYuLmJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5j aG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC05Niw5ICs5Niw3IEBAIGNsYXNzIEJlbmNobWFy a1J1bm5lcihvYmplY3QpOgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhLCB0eXBlKGIpKSkK ICAgICAgICAgYXJnVHlwZSA9IHR5cGUoYSkKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3Ig bGlzdCB0eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKLSAgICAg ICAgaWYgYXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKLSAgICAgICAgICAgIHJldHVybiBhICsg YgotICAgICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuTGlzdFR5 cGUgYW5kIGxlbihhKSBhbmQgKHR5cGUoYVswXSkgPT0gdHlwZXMuU3RyaW5nVHlwZSBvciB0eXBl KGFbMF0pID09IHR5cGVzLlVuaWNvZGVUeXBlKToKICAgICAgICAgICAgIHJldHVybiBhCiAgICAg ICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuRGljdFR5cGU6CiAgICAgICAgICAgICByZXN1bHQgPSB7 fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvU3BlZWRvbWV0ZXIucGF0Y2gKaW5kZXggMzNiMGYz MmUxZWIzMjQ0YmMwMDQ0ODQ1MmI0ZjU3ZDA4MjkzMDU5Zi4uMTg4ZmJmYmNhMmNlODE2N2YxZTVj MzRjMTg2ZjMzZWQ5Y2IzYjA4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaAorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoCkBAIC0xMSwxMCArMTEsMTAgQEAgaW5kZXggNDE5YjlmMi4uMGIwNGM2OSAxMDA2 NDQKICA8L2hlYWQ+CiAgPGJvZHk+CiBkaWZmIC0tZ2l0IGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2Vz L2JlbmNobWFyay1yZXBvcnQuanMgYi9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJl cG9ydC5qcwotaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKK2luZGV4IGM0YjRjNjQuLjY1 ODJhMDggMTAwNjQ0CiAtLS0gYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJlcG9y dC5qcwogKysrIGIvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL2JlbmNobWFyay1yZXBvcnQuanMKLUBA IC0xLDE2ICsxLDkgQEAKK0BAIC0xLDMwICsxLDI2IEBACiAgLy8gVGhpcyBmaWxlIGNhbiBiZSBj dXN0b21pemVkIHRvIHJlcG9ydCByZXN1bHRzIGFzIG5lZWRlZC4KICAKICAoZnVuY3Rpb24gKCkg ewpAQCAtMjgsMTAgKzI4LDMyIEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAtICAg IHNjcmlwdEVsZW1lbnQuc3JjID0gJy4uL3Jlc291cmNlcy9ydW5uZXIuanMnOwogLSAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZENoaWxkKHNjcmlwdEVsZW1lbnQpOwogLQotICAgICB2YXIgc3R5bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2MDBweDsgfSc7Ci0gICAgIGRv Y3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKLUBAIC0zNiwxMCArMjksOCBA QAorLSAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUn KTsKKy0gICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2 MDBweDsgfSc7CistICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsK Ky0KKysgICAgc2hvd1NlY3Rpb24oJ3J1bm5pbmcnKQorICAgICB2YXIgY3JlYXRlVGVzdDsKKyAg ICAgdmFyIHZhbHVlc0J5SXRlcmF0aW9uID0gbmV3IEFycmF5OworKyAgICB2YXIgdGltZVZhbHVl cyA9IG5ldyBBcnJheTsKKyAKKyAgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uICgpIHsKKy0g ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign bWFpbicpKTsKKyAgICAgICAgIHN0YXJ0QmVuY2htYXJrKCk7CisgICAgIH0KKyAKKyAgICAgd2lu ZG93LmJlbmNobWFya0NsaWVudCA9IHsKKyAgICAgICAgIGl0ZXJhdGlvbkNvdW50OiA1LCAvLyBV c2UgNCBkaWZmZXJlbnQgaW5zdGFuY2VzIG9mIERSVC9XVFIgdG8gcnVuIDUgaXRlcmF0aW9ucy4K KysgICAgICAgIHdpbGxBZGRUZXN0RnJhbWU6IGZ1bmN0aW9uIChmcmFtZSkgeworKyAgICAgICAg ICAgIHZhciBtYWluID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWFpbicpOworKyAgICAgICAg ICAgIHZhciBzdHlsZSA9IGdldENvbXB1dGVkU3R5bGUobWFpbik7CisrICAgICAgICAgICAgZnJh bWUuc3R5bGUubGVmdCA9IG1haW4ub2Zmc2V0TGVmdCArIHBhcnNlSW50KHN0eWxlLmJvcmRlckxl ZnRXaWR0aCkgKyBwYXJzZUludChzdHlsZS5wYWRkaW5nTGVmdCkgKyAncHgnOworKyAgICAgICAg ICAgIGZyYW1lLnN0eWxlLnRvcCA9IG1haW4ub2Zmc2V0VG9wICsgcGFyc2VJbnQoc3R5bGUuYm9y ZGVyVG9wV2lkdGgpICsgcGFyc2VJbnQoc3R5bGUucGFkZGluZ1RvcCkgKyAncHgnOworKyAgICAg ICAgfSwKKyAgICAgICAgIHdpbGxTdGFydEZpcnN0SXRlcmF0aW9uOiBmdW5jdGlvbiAoaXRlcmF0 aW9uQ291bnQpIHsKKyAgICAgICAgICAgICBjcmVhdGVUZXN0ID0gZnVuY3Rpb24gKG5hbWUsIGFn Z3JlZ2F0b3IsIGlzTGFzdFRlc3QpIHsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHsKK0BAIC0z NiwxNSArMzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgIG5hbWU6IG5hbWUsCiAgICAgICAg ICAgICAgICAgICAgICBhZ2dyZWdhdG9yOiBhZ2dyZWdhdG9yfTsKICAgICAgICAgICAgICB9CkBA IC00MCwyMiArNjIsMjkgQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAg IGRpZFJ1blN1aXRlczogZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAtICAgICAgICAgICAg UGVyZlRlc3RSdW5uZXIubWVhc3VyZVZhbHVlQXN5bmMobWVhc3VyZWRWYWx1ZXMudG90YWwpOwog ICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLnB1c2gobWVhc3VyZWRWYWx1ZXMudGVzdHMp OworKyAgICAgICAgICAgIHRpbWVWYWx1ZXMucHVzaChtZWFzdXJlZFZhbHVlcy50b3RhbCk7CiAg ICAgICAgICB9LAogICAgICAgICAgZGlkRmluaXNoTGFzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkg ewotQEAgLTUyLDE5ICs0MywzMCBAQAorLSAgICAgICAgICAgIGRvY3VtZW50LmhlYWQucmVtb3Zl Q2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc3R5bGUnKSk7CistCisgICAgICAgICAgICAg dmFyIG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZSA9IHt9OworICAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvTWVhc3VyZWRWYWx1ZSh2YWx1ZSwgZnVsbE5hbWUsIGFnZ3JlZ2F0b3IpIHsKKyAgICAg ICAgICAgICAgICAgdmFyIHZhbHVlcyA9IG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZVtmdWxsTmFt ZV0gfHwgbmV3IEFycmF5OworQEAgLTUyLDE5ICs0NSwzMSBAQAogICAgICAgICAgICAgICAgICB2 YWx1ZXMucHVzaCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgIHZhbHVlcy5hZ2dyZWdhdG9yID0g YWdncmVnYXRvcjsKICAgICAgICAgICAgICB9CiAtCiArICAgICAgICAgICAgdmFyIGRpY3QgPSB7 fQorKyAgICAgICAgICAgIHZhciBlbmFibGVkU3VpdGVzID0gU3VpdGVzLmZpbHRlcihmdW5jdGlv biAoc3VpdGUpIHsgcmV0dXJuICFzdWl0ZS5kaXNhYmxlZCB9KTsKKysgICAgICAgICAgICB2YXIg dmFsdWVzID0gdGltZVZhbHVlcy5tYXAoZnVuY3Rpb24gKHRpbWUpIHsgcmV0dXJuIDYwICogMTAw MCAqIGVuYWJsZWRTdWl0ZXMubGVuZ3RoIC8gdGltZX0pOwogKyAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvRGljdGlvbmFyeVZhbHVlKHZhbHVlLCBzdWl0ZU5hbWUsIHRlc3ROYW1lLCBzdWJ0ZXN0 TmFtZSkgewotKyAgICAgICAgICAgICAgICBkaWN0WyJTcGVlZG9tZXRlciJdID0gZGljdFsiU3Bl ZWRvbWV0ZXIiXSB8fCB7ICJtZXRyaWNzIiA6IHsgIlRpbWUiIDogWyAiVG90YWwiLCBdIH0sICJ0 ZXN0cyIgOiB7fX07CisrICAgICAgICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl0gPSBkaWN0 WyJTcGVlZG9tZXRlciJdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGltZSIgOiBbICJUb3RhbCIsIF0s ICJTY29yZSI6IHsiY3VycmVudCI6IFt2YWx1ZXNdfX0sICJ0ZXN0cyIgOiB7fX07CiArICAgICAg ICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXSA9IGRpY3Rb IlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXSB8fCB7Im1ldHJpY3MiIDogeyAiVGlt ZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6IHt9fTsKICsgICAgICAgICAgICAgICAgZGlj dFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXSA9 IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFt ZV0gfHwgeyAibWV0cmljcyIgOiB7ICJUaW1lIiA6IFsgIlRvdGFsIiwgXSB9LCAidGVzdHMiIDog e319OwogKyAgICAgICAgICAgICAgICBkaWN0WyJTcGVlZG9tZXRlciJdWyJ0ZXN0cyJdW3N1aXRl TmFtZV1bInRlc3RzIl1bdGVzdE5hbWVdWyJ0ZXN0cyJdW3N1YnRlc3ROYW1lXSA9IGRpY3RbIlNw ZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFtZV1bInRlc3Rz Il1bc3VidGVzdE5hbWVdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGltZSIgOiB7ICJjdXJyZW50IiA6 IFtbXV0gfSB9fTsKICsgICAgICAgICAgICAgICAgZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMi XVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXVsidGVzdHMiXVtzdWJ0ZXN0TmFtZV1bIm1l dHJpY3MiXVsiVGltZSJdWyJjdXJyZW50Il1bMF0ucHVzaCh2YWx1ZSk7CiArICAgICAgICAgICAg fQotKyAgICAgICAgICAgIAogICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLmZvckVhY2go ZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAgICAgICAgICAgICAgICAgIGZvciAodmFyIHN1 aXRlTmFtZSBpbiBtZWFzdXJlZFZhbHVlcykgewogICAgICAgICAgICAgICAgICAgICAgdmFyIHN1 aXRlID0gbWVhc3VyZWRWYWx1ZXNbc3VpdGVOYW1lXTsKQEAgLTc1LDcgKzEwNCw3IEBAIGluZGV4 IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAgCiAgICAgICAgICAgICAgdmFyIGZ1bGxOYW1lcyA9 IG5ldyBBcnJheTsKICAgICAgICAgICAgICBmb3IgKHZhciBmdWxsTmFtZSBpbiBtZWFzdXJlZFZh bHVlc0J5RnVsbE5hbWUpCi1AQCAtNzIsOCArNzQsMjIgQEAKK0BAIC03Miw4ICs3NywyMiBAQAog IAogICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZnVsbE5hbWVzLmxlbmd0aDsgaSsr KSB7CiAgICAgICAgICAgICAgICAgIHZhciB2YWx1ZXMgPSBtZWFzdXJlZFZhbHVlc0J5RnVsbE5h bWVbZnVsbE5hbWVzW2ldXTsKQEAgLTgzLDExICsxMTIsMTEgQEAgaW5kZXggYzRiNGM2NC4uYzQ0 NTNjZCAxMDA2NDQKICAgICAgICAgICAgICB9CiArICAgICAgICAgICAgdmFyIHhociA9IG5ldyBY TUxIdHRwUmVxdWVzdCgpOwogKyAgICAgICAgICAgIHhoci5vcGVuKCJQT1NUIiwgIi9yZXBvcnQi KTsKLSsgCisrCiArICAgICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtdHlw ZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CiArICAgICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFk ZXIoIkNvbnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5sZW5ndGgpOwogKyAgICAgICAgICAgIHhoci5z ZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwgImNsb3NlIik7Ci0rIAorKwogKyAgICAgICAg ICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBmdW5jdGlvbigpIHsKICsgICAgICAgICAgICAg ICAgaWYoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVz ID09IDIwMCkgewogKyAgICAgICAgICAgICAgICAgICAgdmFyIGNsb3NlUmVxdWVzdCA9IG5ldyBY TUxIdHRwUmVxdWVzdCgpOwo= 252140 2015-05-01 01:46:20 -0700 2015-05-01 02:00:00 -0700 Patch bug-144487-20150501014508.patch text/plain 8223 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI3Zjc1MDMwYmQ0YTM0ZDBiMTkxZGNhM2EzNzczYTM4 MWQ2MTk3Yi4uNGIzNzcyOGEwODc2Mjg2MjE0MWNlOTAwZTBhODkzNmM5NjdkNWQxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTA0LTMwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBzcGVlZG9tZXRlciBwYXRjaCB0byBwcm92aWRlIGJldHRlciBVSSwgZml4IG1l cmdlIHJlc3VsdCBidWcgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYyB0byBzcGVlZG9tZXRlciBiZW5j aG1hcmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQ0ODcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5tZXJnZSk6IEZpeCBidWcuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRj aDogVXBkYXRlIGFwcGVhcmFuY2UgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYy4KKwogMjAxNS0wNC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRl IGEgcnVudGltZSBmbGFnIHRvIHJ1bi13ZWJraXQtdGVzdHMgdGhhdCBzaG93cyB0aGUgdGVzdCB2 aWV3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDg0MzUwY2Y4NTBlNzE4NzVmZTc3ZDgxZDY5 Nzg1ZmEwZjIzOTA4NTYuLmJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5j aG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC05Niw5ICs5Niw3IEBAIGNsYXNzIEJlbmNobWFy a1J1bm5lcihvYmplY3QpOgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhLCB0eXBlKGIpKSkK ICAgICAgICAgYXJnVHlwZSA9IHR5cGUoYSkKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3Ig bGlzdCB0eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKLSAgICAg ICAgaWYgYXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKLSAgICAgICAgICAgIHJldHVybiBhICsg YgotICAgICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuTGlzdFR5 cGUgYW5kIGxlbihhKSBhbmQgKHR5cGUoYVswXSkgPT0gdHlwZXMuU3RyaW5nVHlwZSBvciB0eXBl KGFbMF0pID09IHR5cGVzLlVuaWNvZGVUeXBlKToKICAgICAgICAgICAgIHJldHVybiBhCiAgICAg ICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuRGljdFR5cGU6CiAgICAgICAgICAgICByZXN1bHQgPSB7 fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvU3BlZWRvbWV0ZXIucGF0Y2gKaW5kZXggMzNiMGYz MmUxZWIzMjQ0YmMwMDQ0ODQ1MmI0ZjU3ZDA4MjkzMDU5Zi4uMGYwNjExOTg0NmU5NWJmZWYyYTZh NWQ5M2Y5YWFjMGM5ZGJlZDM5NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaAorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoCkBAIC0xMSwxMCArMTEsMTAgQEAgaW5kZXggNDE5YjlmMi4uMGIwNGM2OSAxMDA2 NDQKICA8L2hlYWQ+CiAgPGJvZHk+CiBkaWZmIC0tZ2l0IGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2Vz L2JlbmNobWFyay1yZXBvcnQuanMgYi9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJl cG9ydC5qcwotaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKK2luZGV4IGM0YjRjNjQuLjg3 NGY1OTcgMTAwNjQ0CiAtLS0gYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJlcG9y dC5qcwogKysrIGIvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL2JlbmNobWFyay1yZXBvcnQuanMKLUBA IC0xLDE2ICsxLDkgQEAKK0BAIC0xLDMwICsxLDI2IEBACiAgLy8gVGhpcyBmaWxlIGNhbiBiZSBj dXN0b21pemVkIHRvIHJlcG9ydCByZXN1bHRzIGFzIG5lZWRlZC4KICAKICAoZnVuY3Rpb24gKCkg ewpAQCAtMjgsMTAgKzI4LDMyIEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAtICAg IHNjcmlwdEVsZW1lbnQuc3JjID0gJy4uL3Jlc291cmNlcy9ydW5uZXIuanMnOwogLSAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZENoaWxkKHNjcmlwdEVsZW1lbnQpOwogLQotICAgICB2YXIgc3R5bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2MDBweDsgfSc7Ci0gICAgIGRv Y3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKLUBAIC0zNiwxMCArMjksOCBA QAorLSAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUn KTsKKy0gICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2 MDBweDsgfSc7CistICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsK Ky0KKysgICAgc2hvd1NlY3Rpb24oJ3J1bm5pbmcnKQorICAgICB2YXIgY3JlYXRlVGVzdDsKKyAg ICAgdmFyIHZhbHVlc0J5SXRlcmF0aW9uID0gbmV3IEFycmF5OworKyAgICB2YXIgdGltZVZhbHVl cyA9IG5ldyBBcnJheTsKKyAKKyAgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uICgpIHsKKy0g ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign bWFpbicpKTsKKyAgICAgICAgIHN0YXJ0QmVuY2htYXJrKCk7CisgICAgIH0KKyAKKyAgICAgd2lu ZG93LmJlbmNobWFya0NsaWVudCA9IHsKKyAgICAgICAgIGl0ZXJhdGlvbkNvdW50OiA1LCAvLyBV c2UgNCBkaWZmZXJlbnQgaW5zdGFuY2VzIG9mIERSVC9XVFIgdG8gcnVuIDUgaXRlcmF0aW9ucy4K KysgICAgICAgIHdpbGxBZGRUZXN0RnJhbWU6IGZ1bmN0aW9uIChmcmFtZSkgeworKyAgICAgICAg ICAgIHZhciBtYWluID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWFpbicpOworKyAgICAgICAg ICAgIHZhciBzdHlsZSA9IGdldENvbXB1dGVkU3R5bGUobWFpbik7CisrICAgICAgICAgICAgZnJh bWUuc3R5bGUubGVmdCA9IG1haW4ub2Zmc2V0TGVmdCArIHBhcnNlSW50KHN0eWxlLmJvcmRlckxl ZnRXaWR0aCkgKyBwYXJzZUludChzdHlsZS5wYWRkaW5nTGVmdCkgKyAncHgnOworKyAgICAgICAg ICAgIGZyYW1lLnN0eWxlLnRvcCA9IG1haW4ub2Zmc2V0VG9wICsgcGFyc2VJbnQoc3R5bGUuYm9y ZGVyVG9wV2lkdGgpICsgcGFyc2VJbnQoc3R5bGUucGFkZGluZ1RvcCkgKyAncHgnOworKyAgICAg ICAgfSwKKyAgICAgICAgIHdpbGxTdGFydEZpcnN0SXRlcmF0aW9uOiBmdW5jdGlvbiAoaXRlcmF0 aW9uQ291bnQpIHsKKyAgICAgICAgICAgICBjcmVhdGVUZXN0ID0gZnVuY3Rpb24gKG5hbWUsIGFn Z3JlZ2F0b3IsIGlzTGFzdFRlc3QpIHsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHsKK0BAIC0z NiwxNSArMzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgIG5hbWU6IG5hbWUsCiAgICAgICAg ICAgICAgICAgICAgICBhZ2dyZWdhdG9yOiBhZ2dyZWdhdG9yfTsKICAgICAgICAgICAgICB9CkBA IC00MCwyMiArNjIsMjggQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAg IGRpZFJ1blN1aXRlczogZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAtICAgICAgICAgICAg UGVyZlRlc3RSdW5uZXIubWVhc3VyZVZhbHVlQXN5bmMobWVhc3VyZWRWYWx1ZXMudG90YWwpOwog ICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLnB1c2gobWVhc3VyZWRWYWx1ZXMudGVzdHMp OworKyAgICAgICAgICAgIHRpbWVWYWx1ZXMucHVzaChtZWFzdXJlZFZhbHVlcy50b3RhbCk7CiAg ICAgICAgICB9LAogICAgICAgICAgZGlkRmluaXNoTGFzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkg ewotQEAgLTUyLDE5ICs0MywzMCBAQAorLSAgICAgICAgICAgIGRvY3VtZW50LmhlYWQucmVtb3Zl Q2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc3R5bGUnKSk7CistCisgICAgICAgICAgICAg dmFyIG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZSA9IHt9OworICAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvTWVhc3VyZWRWYWx1ZSh2YWx1ZSwgZnVsbE5hbWUsIGFnZ3JlZ2F0b3IpIHsKKyAgICAg ICAgICAgICAgICAgdmFyIHZhbHVlcyA9IG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZVtmdWxsTmFt ZV0gfHwgbmV3IEFycmF5OworQEAgLTUyLDE5ICs0NSwzMCBAQAogICAgICAgICAgICAgICAgICB2 YWx1ZXMucHVzaCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgIHZhbHVlcy5hZ2dyZWdhdG9yID0g YWdncmVnYXRvcjsKICAgICAgICAgICAgICB9CiAtCiArICAgICAgICAgICAgdmFyIGRpY3QgPSB7 fQorKyAgICAgICAgICAgIHZhciBzY29yZXM9IHRpbWVWYWx1ZXMubWFwKGNvbXB1dGVTY29yZSk7 CiArICAgICAgICAgICAgZnVuY3Rpb24gYWRkVG9EaWN0aW9uYXJ5VmFsdWUodmFsdWUsIHN1aXRl TmFtZSwgdGVzdE5hbWUsIHN1YnRlc3ROYW1lKSB7Ci0rICAgICAgICAgICAgICAgIGRpY3RbIlNw ZWVkb21ldGVyIl0gPSBkaWN0WyJTcGVlZG9tZXRlciJdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGlt ZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6IHt9fTsKKysgICAgICAgICAgICAgICAgZGlj dFsiU3BlZWRvbWV0ZXIiXSA9IGRpY3RbIlNwZWVkb21ldGVyIl0gfHwgeyAibWV0cmljcyIgOiB7 ICJUaW1lIiA6IFsgIlRvdGFsIiwgXSwgIlNjb3JlIjogeyAiY3VycmVudCIgOiBbc2NvcmVzXSB9 IH0sICJ0ZXN0cyIgOiB7fX07CiArICAgICAgICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl1b InRlc3RzIl1bc3VpdGVOYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVO YW1lXSB8fCB7Im1ldHJpY3MiIDogeyAiVGltZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6 IHt9fTsKICsgICAgICAgICAgICAgICAgZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0 ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1b c3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFtZV0gfHwgeyAibWV0cmljcyIgOiB7ICJUaW1lIiA6 IFsgIlRvdGFsIiwgXSB9LCAidGVzdHMiIDoge319OwogKyAgICAgICAgICAgICAgICBkaWN0WyJT cGVlZG9tZXRlciJdWyJ0ZXN0cyJdW3N1aXRlTmFtZV1bInRlc3RzIl1bdGVzdE5hbWVdWyJ0ZXN0 cyJdW3N1YnRlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1l XVsidGVzdHMiXVt0ZXN0TmFtZV1bInRlc3RzIl1bc3VidGVzdE5hbWVdIHx8IHsgIm1ldHJpY3Mi IDogeyAiVGltZSIgOiB7ICJjdXJyZW50IiA6IFtbXV0gfSB9fTsKICsgICAgICAgICAgICAgICAg ZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1l XVsidGVzdHMiXVtzdWJ0ZXN0TmFtZV1bIm1ldHJpY3MiXVsiVGltZSJdWyJjdXJyZW50Il1bMF0u cHVzaCh2YWx1ZSk7CiArICAgICAgICAgICAgfQotKyAgICAgICAgICAgIAogICAgICAgICAgICAg IHZhbHVlc0J5SXRlcmF0aW9uLmZvckVhY2goZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAg ICAgICAgICAgICAgICAgIGZvciAodmFyIHN1aXRlTmFtZSBpbiBtZWFzdXJlZFZhbHVlcykgewog ICAgICAgICAgICAgICAgICAgICAgdmFyIHN1aXRlID0gbWVhc3VyZWRWYWx1ZXNbc3VpdGVOYW1l XTsKQEAgLTc1LDcgKzEwMyw3IEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAgCiAg ICAgICAgICAgICAgdmFyIGZ1bGxOYW1lcyA9IG5ldyBBcnJheTsKICAgICAgICAgICAgICBmb3Ig KHZhciBmdWxsTmFtZSBpbiBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWUpCi1AQCAtNzIsOCArNzQs MjIgQEAKK0BAIC03Miw4ICs3NiwyMiBAQAogIAogICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgZnVsbE5hbWVzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgIHZhciB2YWx1 ZXMgPSBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWVbZnVsbE5hbWVzW2ldXTsKQEAgLTgzLDExICsx MTEsMTEgQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAgICAgICB9CiAr ICAgICAgICAgICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogKyAgICAgICAgICAg IHhoci5vcGVuKCJQT1NUIiwgIi9yZXBvcnQiKTsKLSsgCisrCiArICAgICAgICAgICAgeGhyLnNl dFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtdHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CiArICAg ICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5s ZW5ndGgpOwogKyAgICAgICAgICAgIHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwg ImNsb3NlIik7Ci0rIAorKwogKyAgICAgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBm dW5jdGlvbigpIHsKICsgICAgICAgICAgICAgICAgaWYoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0 cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAgICAgICAgICAgICAg ICAgdmFyIGNsb3NlUmVxdWVzdCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwpAQCAtOTksMyArMTI3 LDI3IEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAgICAgICAgICB9CiAgICAgIH07 CiAgfSkoKTsKK2RpZmYgLS1naXQgYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvbWFpbi5qcyBiL1Nw ZWVkb21ldGVyL3Jlc291cmNlcy9tYWluLmpzCitpbmRleCA4ODdmZWJiLi41MzVmNWZiIDEwMDY0 NAorLS0tIGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL21haW4uanMKKysrKyBiL1NwZWVkb21ldGVy L3Jlc291cmNlcy9tYWluLmpzCitAQCAtNTIsNyArNTIsNyBAQCB3aW5kb3cuYmVuY2htYXJrQ2xp ZW50ID0geworICAgICAgICAgZnVuY3Rpb24gdG90YWxUaW1lSW5EaXNwbGF5VW5pdCh0aW1lKSB7 CisgICAgICAgICAgICAgaWYgKGRpc3BsYXlVbml0ID09ICdtcycpCisgICAgICAgICAgICAgICAg IHJldHVybiB0aW1lOworLSAgICAgICAgICAgIHJldHVybiA2MCAqIDEwMDAgKiBzdWl0ZXNDb3Vu dCAvIHRpbWU7CisrICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVyU2NvcmUodGltZSk7CisgICAg ICAgICB9CisgCisgICAgICAgICBmdW5jdGlvbiBzaWdGaWdGcm9tUGVyY2VudERlbHRhKHBlcmNl bnREZWx0YSkgeworQEAgLTE1OCw2ICsxNTgsMTAgQEAgZnVuY3Rpb24gc3RhcnRCZW5jaG1hcmso KSB7CisgICAgIHJ1bm5lci5ydW5NdWx0aXBsZUl0ZXJhdGlvbnMoYmVuY2htYXJrQ2xpZW50Lml0 ZXJhdGlvbkNvdW50KTsKKyB9CisgCisrZnVuY3Rpb24gY29tcHV0ZVNjb3JlKHRpbWUpIHsKKysg ICAgcmV0dXJuIDYwICogMTAwMCAqIGJlbmNobWFya0NsaWVudC5zdWl0ZXNDb3VudCAvIHRpbWU7 CisrfQorKworIGZ1bmN0aW9uIHNob3dTZWN0aW9uKHNlY3Rpb25JZGVudGlmaWVyLCBwdXNoU3Rh dGUpIHsKKyAgICAgdmFyIGN1cnJlbnRTZWN0aW9uRWxlbWVudCA9IGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoJ3NlY3Rpb24uc2VsZWN0ZWQnKTsKKyAgICAgY29uc29sZS5hc3NlcnQoY3VycmVudFNl Y3Rpb25FbGVtZW50KTsK 252142 2015-05-01 02:00:06 -0700 2015-05-01 15:14:25 -0700 Patch bug-144487-20150501015855.patch text/plain 8254 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI3Zjc1MDMwYmQ0YTM0ZDBiMTkxZGNhM2EzNzczYTM4 MWQ2MTk3Yi4uNGIzNzcyOGEwODc2Mjg2MjE0MWNlOTAwZTBhODkzNmM5NjdkNWQxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTA0LTMwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBzcGVlZG9tZXRlciBwYXRjaCB0byBwcm92aWRlIGJldHRlciBVSSwgZml4IG1l cmdlIHJlc3VsdCBidWcgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYyB0byBzcGVlZG9tZXRlciBiZW5j aG1hcmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQ0ODcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5tZXJnZSk6IEZpeCBidWcuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRj aDogVXBkYXRlIGFwcGVhcmFuY2UgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYy4KKwogMjAxNS0wNC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRl IGEgcnVudGltZSBmbGFnIHRvIHJ1bi13ZWJraXQtdGVzdHMgdGhhdCBzaG93cyB0aGUgdGVzdCB2 aWV3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDg0MzUwY2Y4NTBlNzE4NzVmZTc3ZDgxZDY5 Nzg1ZmEwZjIzOTA4NTYuLmJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5j aG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC05Niw5ICs5Niw3IEBAIGNsYXNzIEJlbmNobWFy a1J1bm5lcihvYmplY3QpOgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhLCB0eXBlKGIpKSkK ICAgICAgICAgYXJnVHlwZSA9IHR5cGUoYSkKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3Ig bGlzdCB0eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKLSAgICAg ICAgaWYgYXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKLSAgICAgICAgICAgIHJldHVybiBhICsg YgotICAgICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuTGlzdFR5 cGUgYW5kIGxlbihhKSBhbmQgKHR5cGUoYVswXSkgPT0gdHlwZXMuU3RyaW5nVHlwZSBvciB0eXBl KGFbMF0pID09IHR5cGVzLlVuaWNvZGVUeXBlKToKICAgICAgICAgICAgIHJldHVybiBhCiAgICAg ICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuRGljdFR5cGU6CiAgICAgICAgICAgICByZXN1bHQgPSB7 fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvU3BlZWRvbWV0ZXIucGF0Y2gKaW5kZXggMzNiMGYz MmUxZWIzMjQ0YmMwMDQ0ODQ1MmI0ZjU3ZDA4MjkzMDU5Zi4uZjQwOTJkNTlmZTYwNmFmMTc1ZDgz OTIwNmEyZTlkNDVkNjNiYjkxYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaAorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoCkBAIC0xMSwxMCArMTEsMTAgQEAgaW5kZXggNDE5YjlmMi4uMGIwNGM2OSAxMDA2 NDQKICA8L2hlYWQ+CiAgPGJvZHk+CiBkaWZmIC0tZ2l0IGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2Vz L2JlbmNobWFyay1yZXBvcnQuanMgYi9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJl cG9ydC5qcwotaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKK2luZGV4IGM0YjRjNjQuLjg3 NGY1OTcgMTAwNjQ0CiAtLS0gYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJlcG9y dC5qcwogKysrIGIvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL2JlbmNobWFyay1yZXBvcnQuanMKLUBA IC0xLDE2ICsxLDkgQEAKK0BAIC0xLDMwICsxLDI2IEBACiAgLy8gVGhpcyBmaWxlIGNhbiBiZSBj dXN0b21pemVkIHRvIHJlcG9ydCByZXN1bHRzIGFzIG5lZWRlZC4KICAKICAoZnVuY3Rpb24gKCkg ewpAQCAtMjgsMTAgKzI4LDMyIEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAtICAg IHNjcmlwdEVsZW1lbnQuc3JjID0gJy4uL3Jlc291cmNlcy9ydW5uZXIuanMnOwogLSAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZENoaWxkKHNjcmlwdEVsZW1lbnQpOwogLQotICAgICB2YXIgc3R5bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2MDBweDsgfSc7Ci0gICAgIGRv Y3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKLUBAIC0zNiwxMCArMjksOCBA QAorLSAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUn KTsKKy0gICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2 MDBweDsgfSc7CistICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsK Ky0KKysgICAgc2hvd1NlY3Rpb24oJ3J1bm5pbmcnKQorICAgICB2YXIgY3JlYXRlVGVzdDsKKyAg ICAgdmFyIHZhbHVlc0J5SXRlcmF0aW9uID0gbmV3IEFycmF5OworKyAgICB2YXIgdGltZVZhbHVl cyA9IG5ldyBBcnJheTsKKyAKKyAgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uICgpIHsKKy0g ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign bWFpbicpKTsKKyAgICAgICAgIHN0YXJ0QmVuY2htYXJrKCk7CisgICAgIH0KKyAKKyAgICAgd2lu ZG93LmJlbmNobWFya0NsaWVudCA9IHsKKyAgICAgICAgIGl0ZXJhdGlvbkNvdW50OiA1LCAvLyBV c2UgNCBkaWZmZXJlbnQgaW5zdGFuY2VzIG9mIERSVC9XVFIgdG8gcnVuIDUgaXRlcmF0aW9ucy4K KysgICAgICAgIHdpbGxBZGRUZXN0RnJhbWU6IGZ1bmN0aW9uIChmcmFtZSkgeworKyAgICAgICAg ICAgIHZhciBtYWluID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWFpbicpOworKyAgICAgICAg ICAgIHZhciBzdHlsZSA9IGdldENvbXB1dGVkU3R5bGUobWFpbik7CisrICAgICAgICAgICAgZnJh bWUuc3R5bGUubGVmdCA9IG1haW4ub2Zmc2V0TGVmdCArIHBhcnNlSW50KHN0eWxlLmJvcmRlckxl ZnRXaWR0aCkgKyBwYXJzZUludChzdHlsZS5wYWRkaW5nTGVmdCkgKyAncHgnOworKyAgICAgICAg ICAgIGZyYW1lLnN0eWxlLnRvcCA9IG1haW4ub2Zmc2V0VG9wICsgcGFyc2VJbnQoc3R5bGUuYm9y ZGVyVG9wV2lkdGgpICsgcGFyc2VJbnQoc3R5bGUucGFkZGluZ1RvcCkgKyAncHgnOworKyAgICAg ICAgfSwKKyAgICAgICAgIHdpbGxTdGFydEZpcnN0SXRlcmF0aW9uOiBmdW5jdGlvbiAoaXRlcmF0 aW9uQ291bnQpIHsKKyAgICAgICAgICAgICBjcmVhdGVUZXN0ID0gZnVuY3Rpb24gKG5hbWUsIGFn Z3JlZ2F0b3IsIGlzTGFzdFRlc3QpIHsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHsKK0BAIC0z NiwxNSArMzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgIG5hbWU6IG5hbWUsCiAgICAgICAg ICAgICAgICAgICAgICBhZ2dyZWdhdG9yOiBhZ2dyZWdhdG9yfTsKICAgICAgICAgICAgICB9CkBA IC00MCwyMiArNjIsMjggQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAg IGRpZFJ1blN1aXRlczogZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAtICAgICAgICAgICAg UGVyZlRlc3RSdW5uZXIubWVhc3VyZVZhbHVlQXN5bmMobWVhc3VyZWRWYWx1ZXMudG90YWwpOwog ICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLnB1c2gobWVhc3VyZWRWYWx1ZXMudGVzdHMp OworKyAgICAgICAgICAgIHRpbWVWYWx1ZXMucHVzaChtZWFzdXJlZFZhbHVlcy50b3RhbCk7CiAg ICAgICAgICB9LAogICAgICAgICAgZGlkRmluaXNoTGFzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkg ewotQEAgLTUyLDE5ICs0MywzMCBAQAorLSAgICAgICAgICAgIGRvY3VtZW50LmhlYWQucmVtb3Zl Q2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc3R5bGUnKSk7CistCisgICAgICAgICAgICAg dmFyIG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZSA9IHt9OworICAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvTWVhc3VyZWRWYWx1ZSh2YWx1ZSwgZnVsbE5hbWUsIGFnZ3JlZ2F0b3IpIHsKKyAgICAg ICAgICAgICAgICAgdmFyIHZhbHVlcyA9IG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZVtmdWxsTmFt ZV0gfHwgbmV3IEFycmF5OworQEAgLTUyLDE5ICs0NSwzMCBAQAogICAgICAgICAgICAgICAgICB2 YWx1ZXMucHVzaCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgIHZhbHVlcy5hZ2dyZWdhdG9yID0g YWdncmVnYXRvcjsKICAgICAgICAgICAgICB9CiAtCiArICAgICAgICAgICAgdmFyIGRpY3QgPSB7 fQorKyAgICAgICAgICAgIHZhciBzY29yZXM9IHRpbWVWYWx1ZXMubWFwKGNvbXB1dGVTY29yZSk7 CiArICAgICAgICAgICAgZnVuY3Rpb24gYWRkVG9EaWN0aW9uYXJ5VmFsdWUodmFsdWUsIHN1aXRl TmFtZSwgdGVzdE5hbWUsIHN1YnRlc3ROYW1lKSB7Ci0rICAgICAgICAgICAgICAgIGRpY3RbIlNw ZWVkb21ldGVyIl0gPSBkaWN0WyJTcGVlZG9tZXRlciJdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGlt ZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6IHt9fTsKKysgICAgICAgICAgICAgICAgZGlj dFsiU3BlZWRvbWV0ZXIiXSA9IGRpY3RbIlNwZWVkb21ldGVyIl0gfHwgeyAibWV0cmljcyIgOiB7 ICJUaW1lIiA6IFsgIlRvdGFsIiwgXSwgIlNjb3JlIjogeyAiY3VycmVudCIgOiBbc2NvcmVzXSB9 IH0sICJ0ZXN0cyIgOiB7fX07CiArICAgICAgICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl1b InRlc3RzIl1bc3VpdGVOYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVO YW1lXSB8fCB7Im1ldHJpY3MiIDogeyAiVGltZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6 IHt9fTsKICsgICAgICAgICAgICAgICAgZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0 ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1b c3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFtZV0gfHwgeyAibWV0cmljcyIgOiB7ICJUaW1lIiA6 IFsgIlRvdGFsIiwgXSB9LCAidGVzdHMiIDoge319OwogKyAgICAgICAgICAgICAgICBkaWN0WyJT cGVlZG9tZXRlciJdWyJ0ZXN0cyJdW3N1aXRlTmFtZV1bInRlc3RzIl1bdGVzdE5hbWVdWyJ0ZXN0 cyJdW3N1YnRlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1l XVsidGVzdHMiXVt0ZXN0TmFtZV1bInRlc3RzIl1bc3VidGVzdE5hbWVdIHx8IHsgIm1ldHJpY3Mi IDogeyAiVGltZSIgOiB7ICJjdXJyZW50IiA6IFtbXV0gfSB9fTsKICsgICAgICAgICAgICAgICAg ZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1l XVsidGVzdHMiXVtzdWJ0ZXN0TmFtZV1bIm1ldHJpY3MiXVsiVGltZSJdWyJjdXJyZW50Il1bMF0u cHVzaCh2YWx1ZSk7CiArICAgICAgICAgICAgfQotKyAgICAgICAgICAgIAogICAgICAgICAgICAg IHZhbHVlc0J5SXRlcmF0aW9uLmZvckVhY2goZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAg ICAgICAgICAgICAgICAgIGZvciAodmFyIHN1aXRlTmFtZSBpbiBtZWFzdXJlZFZhbHVlcykgewog ICAgICAgICAgICAgICAgICAgICAgdmFyIHN1aXRlID0gbWVhc3VyZWRWYWx1ZXNbc3VpdGVOYW1l XTsKQEAgLTc1LDcgKzEwMyw3IEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAgCiAg ICAgICAgICAgICAgdmFyIGZ1bGxOYW1lcyA9IG5ldyBBcnJheTsKICAgICAgICAgICAgICBmb3Ig KHZhciBmdWxsTmFtZSBpbiBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWUpCi1AQCAtNzIsOCArNzQs MjIgQEAKK0BAIC03Miw4ICs3NiwyMiBAQAogIAogICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgZnVsbE5hbWVzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgIHZhciB2YWx1 ZXMgPSBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWVbZnVsbE5hbWVzW2ldXTsKQEAgLTgzLDExICsx MTEsMTEgQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAgICAgICB9CiAr ICAgICAgICAgICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogKyAgICAgICAgICAg IHhoci5vcGVuKCJQT1NUIiwgIi9yZXBvcnQiKTsKLSsgCisrCiArICAgICAgICAgICAgeGhyLnNl dFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtdHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CiArICAg ICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5s ZW5ndGgpOwogKyAgICAgICAgICAgIHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwg ImNsb3NlIik7Ci0rIAorKwogKyAgICAgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBm dW5jdGlvbigpIHsKICsgICAgICAgICAgICAgICAgaWYoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0 cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAgICAgICAgICAgICAg ICAgdmFyIGNsb3NlUmVxdWVzdCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwpkaWZmIC0tZ2l0IGEv UGVyZm9ybWFuY2VUZXN0cy9TcGVlZG9tZXRlci9yZXNvdXJjZXMvbWFpbi5qcyBiL1BlcmZvcm1h bmNlVGVzdHMvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL21haW4uanMKaW5kZXggODg3ZmViYmY5ODY3 NmRjMTY0ZDE1OTY4ZTQ3NWZmMjFjYzQ2M2M2Ny4uNTM1ZjVmYjg1NjgxMDkwOTVjNTljODZmMDIw ZjZmY2Y0ZGFhYjRkYSAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9TcGVlZG9tZXRlci9y ZXNvdXJjZXMvbWFpbi5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL1NwZWVkb21ldGVyL3Jlc291 cmNlcy9tYWluLmpzCkBAIC01Miw3ICs1Miw3IEBAIHdpbmRvdy5iZW5jaG1hcmtDbGllbnQgPSB7 CiAgICAgICAgIGZ1bmN0aW9uIHRvdGFsVGltZUluRGlzcGxheVVuaXQodGltZSkgewogICAgICAg ICAgICAgaWYgKGRpc3BsYXlVbml0ID09ICdtcycpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRp bWU7Ci0gICAgICAgICAgICByZXR1cm4gNjAgKiAxMDAwICogc3VpdGVzQ291bnQgLyB0aW1lOwor ICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVyU2NvcmUodGltZSk7CiAgICAgICAgIH0KIAogICAg ICAgICBmdW5jdGlvbiBzaWdGaWdGcm9tUGVyY2VudERlbHRhKHBlcmNlbnREZWx0YSkgewpAQCAt MTU4LDYgKzE1OCwxMCBAQCBmdW5jdGlvbiBzdGFydEJlbmNobWFyaygpIHsKICAgICBydW5uZXIu cnVuTXVsdGlwbGVJdGVyYXRpb25zKGJlbmNobWFya0NsaWVudC5pdGVyYXRpb25Db3VudCk7CiB9 CiAKK2Z1bmN0aW9uIGNvbXB1dGVTY29yZSh0aW1lKSB7CisgICAgcmV0dXJuIDYwICogMTAwMCAq IGJlbmNobWFya0NsaWVudC5zdWl0ZXNDb3VudCAvIHRpbWU7Cit9CisKIGZ1bmN0aW9uIHNob3dT ZWN0aW9uKHNlY3Rpb25JZGVudGlmaWVyLCBwdXNoU3RhdGUpIHsKICAgICB2YXIgY3VycmVudFNl Y3Rpb25FbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc2VjdGlvbi5zZWxlY3RlZCcp OwogICAgIGNvbnNvbGUuYXNzZXJ0KGN1cnJlbnRTZWN0aW9uRWxlbWVudCk7Cg== 252173 2015-05-01 15:14:34 -0700 2015-05-01 15:15:40 -0700 Patch bug-144487-20150501151323.patch text/plain 8253 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI3Zjc1MDMwYmQ0YTM0ZDBiMTkxZGNhM2EzNzczYTM4 MWQ2MTk3Yi4uNGIzNzcyOGEwODc2Mjg2MjE0MWNlOTAwZTBhODkzNmM5NjdkNWQxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTA0LTMwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIFVwZGF0ZSBzcGVlZG9tZXRlciBwYXRjaCB0byBwcm92aWRlIGJldHRlciBVSSwgZml4IG1l cmdlIHJlc3VsdCBidWcgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYyB0byBzcGVlZG9tZXRlciBiZW5j aG1hcmsuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQ0ODcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5tZXJnZSk6IEZpeCBidWcuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRj aDogVXBkYXRlIGFwcGVhcmFuY2UgYW5kIGFkZCAiU2NvcmUiIG1ldHJpYy4KKwogMjAxNS0wNC0z MCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRl IGEgcnVudGltZSBmbGFnIHRvIHJ1bi13ZWJraXQtdGVzdHMgdGhhdCBzaG93cyB0aGUgdGVzdCB2 aWV3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDg0MzUwY2Y4NTBlNzE4NzVmZTc3ZDgxZDY5 Nzg1ZmEwZjIzOTA4NTYuLmJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5j aG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC05Niw5ICs5Niw3IEBAIGNsYXNzIEJlbmNobWFy a1J1bm5lcihvYmplY3QpOgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhLCB0eXBlKGIpKSkK ICAgICAgICAgYXJnVHlwZSA9IHR5cGUoYSkKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3Ig bGlzdCB0eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKLSAgICAg ICAgaWYgYXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKLSAgICAgICAgICAgIHJldHVybiBhICsg YgotICAgICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuTGlzdFR5 cGUgYW5kIGxlbihhKSBhbmQgKHR5cGUoYVswXSkgPT0gdHlwZXMuU3RyaW5nVHlwZSBvciB0eXBl KGFbMF0pID09IHR5cGVzLlVuaWNvZGVUeXBlKToKICAgICAgICAgICAgIHJldHVybiBhCiAgICAg ICAgIGlmIGFyZ1R5cGUgPT0gdHlwZXMuRGljdFR5cGU6CiAgICAgICAgICAgICByZXN1bHQgPSB7 fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvU3BlZWRvbWV0ZXIucGF0Y2gKaW5kZXggMzNiMGYz MmUxZWIzMjQ0YmMwMDQ0ODQ1MmI0ZjU3ZDA4MjkzMDU5Zi4uZjQwOTJkNTlmZTYwNmFmMTc1ZDgz OTIwNmEyZTlkNDVkNjNiYjkxYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TcGVlZG9tZXRlci5wYXRjaAorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoCkBAIC0xMSwxMCArMTEsMTAgQEAgaW5kZXggNDE5YjlmMi4uMGIwNGM2OSAxMDA2 NDQKICA8L2hlYWQ+CiAgPGJvZHk+CiBkaWZmIC0tZ2l0IGEvU3BlZWRvbWV0ZXIvcmVzb3VyY2Vz L2JlbmNobWFyay1yZXBvcnQuanMgYi9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJl cG9ydC5qcwotaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKK2luZGV4IGM0YjRjNjQuLjg3 NGY1OTcgMTAwNjQ0CiAtLS0gYS9TcGVlZG9tZXRlci9yZXNvdXJjZXMvYmVuY2htYXJrLXJlcG9y dC5qcwogKysrIGIvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL2JlbmNobWFyay1yZXBvcnQuanMKLUBA IC0xLDE2ICsxLDkgQEAKK0BAIC0xLDMwICsxLDI2IEBACiAgLy8gVGhpcyBmaWxlIGNhbiBiZSBj dXN0b21pemVkIHRvIHJlcG9ydCByZXN1bHRzIGFzIG5lZWRlZC4KICAKICAoZnVuY3Rpb24gKCkg ewpAQCAtMjgsMTAgKzI4LDMyIEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAtICAg IHNjcmlwdEVsZW1lbnQuc3JjID0gJy4uL3Jlc291cmNlcy9ydW5uZXIuanMnOwogLSAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZENoaWxkKHNjcmlwdEVsZW1lbnQpOwogLQotICAgICB2YXIgc3R5bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2MDBweDsgfSc7Ci0gICAgIGRv Y3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKLUBAIC0zNiwxMCArMjksOCBA QAorLSAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUn KTsKKy0gICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gJ3ByZSB7IHBhZGRpbmctdG9wOiA2 MDBweDsgfSc7CistICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsK Ky0KKysgICAgc2hvd1NlY3Rpb24oJ3J1bm5pbmcnKQorICAgICB2YXIgY3JlYXRlVGVzdDsKKyAg ICAgdmFyIHZhbHVlc0J5SXRlcmF0aW9uID0gbmV3IEFycmF5OworKyAgICB2YXIgdGltZVZhbHVl cyA9IG5ldyBBcnJheTsKKyAKKyAgICAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uICgpIHsKKy0g ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign bWFpbicpKTsKKyAgICAgICAgIHN0YXJ0QmVuY2htYXJrKCk7CisgICAgIH0KKyAKKyAgICAgd2lu ZG93LmJlbmNobWFya0NsaWVudCA9IHsKKyAgICAgICAgIGl0ZXJhdGlvbkNvdW50OiA1LCAvLyBV c2UgNCBkaWZmZXJlbnQgaW5zdGFuY2VzIG9mIERSVC9XVFIgdG8gcnVuIDUgaXRlcmF0aW9ucy4K KysgICAgICAgIHdpbGxBZGRUZXN0RnJhbWU6IGZ1bmN0aW9uIChmcmFtZSkgeworKyAgICAgICAg ICAgIHZhciBtYWluID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWFpbicpOworKyAgICAgICAg ICAgIHZhciBzdHlsZSA9IGdldENvbXB1dGVkU3R5bGUobWFpbik7CisrICAgICAgICAgICAgZnJh bWUuc3R5bGUubGVmdCA9IG1haW4ub2Zmc2V0TGVmdCArIHBhcnNlSW50KHN0eWxlLmJvcmRlckxl ZnRXaWR0aCkgKyBwYXJzZUludChzdHlsZS5wYWRkaW5nTGVmdCkgKyAncHgnOworKyAgICAgICAg ICAgIGZyYW1lLnN0eWxlLnRvcCA9IG1haW4ub2Zmc2V0VG9wICsgcGFyc2VJbnQoc3R5bGUuYm9y ZGVyVG9wV2lkdGgpICsgcGFyc2VJbnQoc3R5bGUucGFkZGluZ1RvcCkgKyAncHgnOworKyAgICAg ICAgfSwKKyAgICAgICAgIHdpbGxTdGFydEZpcnN0SXRlcmF0aW9uOiBmdW5jdGlvbiAoaXRlcmF0 aW9uQ291bnQpIHsKKyAgICAgICAgICAgICBjcmVhdGVUZXN0ID0gZnVuY3Rpb24gKG5hbWUsIGFn Z3JlZ2F0b3IsIGlzTGFzdFRlc3QpIHsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHsKK0BAIC0z NiwxNSArMzIsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgIG5hbWU6IG5hbWUsCiAgICAgICAg ICAgICAgICAgICAgICBhZ2dyZWdhdG9yOiBhZ2dyZWdhdG9yfTsKICAgICAgICAgICAgICB9CkBA IC00MCwyMiArNjIsMjggQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAg IGRpZFJ1blN1aXRlczogZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAtICAgICAgICAgICAg UGVyZlRlc3RSdW5uZXIubWVhc3VyZVZhbHVlQXN5bmMobWVhc3VyZWRWYWx1ZXMudG90YWwpOwog ICAgICAgICAgICAgIHZhbHVlc0J5SXRlcmF0aW9uLnB1c2gobWVhc3VyZWRWYWx1ZXMudGVzdHMp OworKyAgICAgICAgICAgIHRpbWVWYWx1ZXMucHVzaChtZWFzdXJlZFZhbHVlcy50b3RhbCk7CiAg ICAgICAgICB9LAogICAgICAgICAgZGlkRmluaXNoTGFzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkg ewotQEAgLTUyLDE5ICs0MywzMCBAQAorLSAgICAgICAgICAgIGRvY3VtZW50LmhlYWQucmVtb3Zl Q2hpbGQoZG9jdW1lbnQucXVlcnlTZWxlY3Rvcignc3R5bGUnKSk7CistCisgICAgICAgICAgICAg dmFyIG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZSA9IHt9OworICAgICAgICAgICAgIGZ1bmN0aW9u IGFkZFRvTWVhc3VyZWRWYWx1ZSh2YWx1ZSwgZnVsbE5hbWUsIGFnZ3JlZ2F0b3IpIHsKKyAgICAg ICAgICAgICAgICAgdmFyIHZhbHVlcyA9IG1lYXN1cmVkVmFsdWVzQnlGdWxsTmFtZVtmdWxsTmFt ZV0gfHwgbmV3IEFycmF5OworQEAgLTUyLDE5ICs0NSwzMCBAQAogICAgICAgICAgICAgICAgICB2 YWx1ZXMucHVzaCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgIHZhbHVlcy5hZ2dyZWdhdG9yID0g YWdncmVnYXRvcjsKICAgICAgICAgICAgICB9CiAtCiArICAgICAgICAgICAgdmFyIGRpY3QgPSB7 fQorKyAgICAgICAgICAgIHZhciBzY29yZXM9IHRpbWVWYWx1ZXMubWFwKGNvbXB1dGVTY29yZSk7 CiArICAgICAgICAgICAgZnVuY3Rpb24gYWRkVG9EaWN0aW9uYXJ5VmFsdWUodmFsdWUsIHN1aXRl TmFtZSwgdGVzdE5hbWUsIHN1YnRlc3ROYW1lKSB7Ci0rICAgICAgICAgICAgICAgIGRpY3RbIlNw ZWVkb21ldGVyIl0gPSBkaWN0WyJTcGVlZG9tZXRlciJdIHx8IHsgIm1ldHJpY3MiIDogeyAiVGlt ZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6IHt9fTsKKysgICAgICAgICAgICAgICAgZGlj dFsiU3BlZWRvbWV0ZXIiXSA9IGRpY3RbIlNwZWVkb21ldGVyIl0gfHwgeyAibWV0cmljcyIgOiB7 ICJUaW1lIiA6IFsgIlRvdGFsIiwgXSwgIlNjb3JlIjogeyAiY3VycmVudCIgOiBbc2NvcmVzXSB9 IH0sICJ0ZXN0cyIgOiB7fX07CiArICAgICAgICAgICAgICAgIGRpY3RbIlNwZWVkb21ldGVyIl1b InRlc3RzIl1bc3VpdGVOYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVO YW1lXSB8fCB7Im1ldHJpY3MiIDogeyAiVGltZSIgOiBbICJUb3RhbCIsIF0gfSwgInRlc3RzIiA6 IHt9fTsKICsgICAgICAgICAgICAgICAgZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0 ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1b c3VpdGVOYW1lXVsidGVzdHMiXVt0ZXN0TmFtZV0gfHwgeyAibWV0cmljcyIgOiB7ICJUaW1lIiA6 IFsgIlRvdGFsIiwgXSB9LCAidGVzdHMiIDoge319OwogKyAgICAgICAgICAgICAgICBkaWN0WyJT cGVlZG9tZXRlciJdWyJ0ZXN0cyJdW3N1aXRlTmFtZV1bInRlc3RzIl1bdGVzdE5hbWVdWyJ0ZXN0 cyJdW3N1YnRlc3ROYW1lXSA9IGRpY3RbIlNwZWVkb21ldGVyIl1bInRlc3RzIl1bc3VpdGVOYW1l XVsidGVzdHMiXVt0ZXN0TmFtZV1bInRlc3RzIl1bc3VidGVzdE5hbWVdIHx8IHsgIm1ldHJpY3Mi IDogeyAiVGltZSIgOiB7ICJjdXJyZW50IiA6IFtbXV0gfSB9fTsKICsgICAgICAgICAgICAgICAg ZGljdFsiU3BlZWRvbWV0ZXIiXVsidGVzdHMiXVtzdWl0ZU5hbWVdWyJ0ZXN0cyJdW3Rlc3ROYW1l XVsidGVzdHMiXVtzdWJ0ZXN0TmFtZV1bIm1ldHJpY3MiXVsiVGltZSJdWyJjdXJyZW50Il1bMF0u cHVzaCh2YWx1ZSk7CiArICAgICAgICAgICAgfQotKyAgICAgICAgICAgIAogICAgICAgICAgICAg IHZhbHVlc0J5SXRlcmF0aW9uLmZvckVhY2goZnVuY3Rpb24gKG1lYXN1cmVkVmFsdWVzKSB7CiAg ICAgICAgICAgICAgICAgIGZvciAodmFyIHN1aXRlTmFtZSBpbiBtZWFzdXJlZFZhbHVlcykgewog ICAgICAgICAgICAgICAgICAgICAgdmFyIHN1aXRlID0gbWVhc3VyZWRWYWx1ZXNbc3VpdGVOYW1l XTsKQEAgLTc1LDcgKzEwMyw3IEBAIGluZGV4IGM0YjRjNjQuLmM0NDUzY2QgMTAwNjQ0CiAgCiAg ICAgICAgICAgICAgdmFyIGZ1bGxOYW1lcyA9IG5ldyBBcnJheTsKICAgICAgICAgICAgICBmb3Ig KHZhciBmdWxsTmFtZSBpbiBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWUpCi1AQCAtNzIsOCArNzQs MjIgQEAKK0BAIC03Miw4ICs3NiwyMiBAQAogIAogICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgZnVsbE5hbWVzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgIHZhciB2YWx1 ZXMgPSBtZWFzdXJlZFZhbHVlc0J5RnVsbE5hbWVbZnVsbE5hbWVzW2ldXTsKQEAgLTgzLDExICsx MTEsMTEgQEAgaW5kZXggYzRiNGM2NC4uYzQ0NTNjZCAxMDA2NDQKICAgICAgICAgICAgICB9CiAr ICAgICAgICAgICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogKyAgICAgICAgICAg IHhoci5vcGVuKCJQT1NUIiwgIi9yZXBvcnQiKTsKLSsgCisrCiArICAgICAgICAgICAgeGhyLnNl dFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtdHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CiArICAg ICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5s ZW5ndGgpOwogKyAgICAgICAgICAgIHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwg ImNsb3NlIik7Ci0rIAorKwogKyAgICAgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBm dW5jdGlvbigpIHsKICsgICAgICAgICAgICAgICAgaWYoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0 cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAgICAgICAgICAgICAg ICAgdmFyIGNsb3NlUmVxdWVzdCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwpkaWZmIC0tZ2l0IGEv UGVyZm9ybWFuY2VUZXN0cy9TcGVlZG9tZXRlci9yZXNvdXJjZXMvbWFpbi5qcyBiL1BlcmZvcm1h bmNlVGVzdHMvU3BlZWRvbWV0ZXIvcmVzb3VyY2VzL21haW4uanMKaW5kZXggODg3ZmViYmY5ODY3 NmRjMTY0ZDE1OTY4ZTQ3NWZmMjFjYzQ2M2M2Ny4uYzEwN2YyNzk1ZjhlYWYxYjdiYWFlYmJjZjU5 MTc2ZmIwOGZmMWNiZCAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9TcGVlZG9tZXRlci9y ZXNvdXJjZXMvbWFpbi5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL1NwZWVkb21ldGVyL3Jlc291 cmNlcy9tYWluLmpzCkBAIC01Miw3ICs1Miw3IEBAIHdpbmRvdy5iZW5jaG1hcmtDbGllbnQgPSB7 CiAgICAgICAgIGZ1bmN0aW9uIHRvdGFsVGltZUluRGlzcGxheVVuaXQodGltZSkgewogICAgICAg ICAgICAgaWYgKGRpc3BsYXlVbml0ID09ICdtcycpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRp bWU7Ci0gICAgICAgICAgICByZXR1cm4gNjAgKiAxMDAwICogc3VpdGVzQ291bnQgLyB0aW1lOwor ICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVTY29yZSh0aW1lKTsKICAgICAgICAgfQogCiAgICAg ICAgIGZ1bmN0aW9uIHNpZ0ZpZ0Zyb21QZXJjZW50RGVsdGEocGVyY2VudERlbHRhKSB7CkBAIC0x NTgsNiArMTU4LDEwIEBAIGZ1bmN0aW9uIHN0YXJ0QmVuY2htYXJrKCkgewogICAgIHJ1bm5lci5y dW5NdWx0aXBsZUl0ZXJhdGlvbnMoYmVuY2htYXJrQ2xpZW50Lml0ZXJhdGlvbkNvdW50KTsKIH0K IAorZnVuY3Rpb24gY29tcHV0ZVNjb3JlKHRpbWUpIHsKKyAgICByZXR1cm4gNjAgKiAxMDAwICog YmVuY2htYXJrQ2xpZW50LnN1aXRlc0NvdW50IC8gdGltZTsKK30KKwogZnVuY3Rpb24gc2hvd1Nl Y3Rpb24oc2VjdGlvbklkZW50aWZpZXIsIHB1c2hTdGF0ZSkgewogICAgIHZhciBjdXJyZW50U2Vj dGlvbkVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdzZWN0aW9uLnNlbGVjdGVkJyk7 CiAgICAgY29uc29sZS5hc3NlcnQoY3VycmVudFNlY3Rpb25FbGVtZW50KTsK