199483 2019-07-03 17:11:57 -0700 Test freshness page should expose revision information for latest build on tooltip. 2019-07-08 11:52:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu rniwa oldest_to_newest 1550101 0 dewei_zhu 2019-07-03 17:11:57 -0700 Test freshness page should expose revision information for latest build on tooltip. 1550103 1 373440 dewei_zhu 2019-07-03 17:14:27 -0700 Created attachment 373440 Patch 1550110 2 373442 dewei_zhu 2019-07-03 17:27:47 -0700 Created attachment 373442 Patch 1550194 3 373442 rniwa 2019-07-04 01:55:16 -0700 Comment on attachment 373442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373442&action=review > Websites/perf.webkit.org/public/v3/pages/test-freshness-page.js:94 > + let commitSet = null; commitSetOfLastPoint? > Websites/perf.webkit.org/public/v3/pages/test-freshness-page.js:178 > + for (const repository of Repository.sortByNamePreferringOnesWithURL(commitSet.repositories())) { > + const commit = commitSet.commitForRepository(repository); > + tableContent.push(element('tr', [ Better written as: tableContent.push(Repository.sortByNamePreferringOnesWithURL(commitSet.repositories()).map((repository) => { ~ }); Note: CommonComponentBase._addContentToElement would unwrap nested arrays. 1550910 4 dewei_zhu 2019-07-08 11:52:51 -0700 Landed in r247168. 373440 2019-07-03 17:14:27 -0700 2019-07-03 17:27:46 -0700 Patch bug-199483-20190703171427.patch text/plain 10704 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTE4CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiNjE0MTliYzY5NTQzNTdkOWQzYmJjYThlMDAwODM4Y2MwYmUxOGE4Li4yNzgzNGY5YmI5 ZjFkNWFhMDAwNmYxODI4YWZiZGM4Y2UzM2NhZTMzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOS0wNy0wMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBUZXN0IGZyZXNobmVzcyBwYWdlIHNob3VsZCBleHBvc2Ug cmV2aXNpb24gaW5mb3JtYXRpb24gZm9yIGxhdGVzdCBidWlsZCBvbiB0b29sdGlwLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NDgzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbGF0ZXN0IGJ1 aWxkIHJldmlzaW9uIGluZm9ybWF0aW9uIG9uIHRlc3QgZnJlc2huZXNzIHBhZ2UgdG9vbHRpcC4K KworICAgICAgICAqIHB1YmxpYy92My9wYWdlcy90ZXN0LWZyZXNobmVzcy1wYWdlLmpzOiBBZGQg YnVpbGQgcmV2aXNpb24gaW5mb3JtYXRpb24gb24gdG9vbHRpcC4KKyAgICAgICAgKFRlc3RGcmVz aG5lc3NQYWdlLnByb3RvdHlwZS5kaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKToKKyAgICAgICAgKFRl c3RGcmVzaG5lc3NQYWdlLnByb3RvdHlwZS5fZmV0Y2hUZXN0UmVzdWx0cyk6CisgICAgICAgIChU ZXN0RnJlc2huZXNzUGFnZS5wcm90b3R5cGUucmVuZGVyKToKKyAgICAgICAgKFRlc3RGcmVzaG5l c3NQYWdlLnByb3RvdHlwZS5fcmVuZGVyVG9vbHRpcCk6CisgICAgICAgIChUZXN0RnJlc2huZXNz UGFnZS5jc3NUZW1wbGF0ZSk6CisKIDIwMTktMDYtMjYgIERld2VpIFpodSAgPGRld2VpX3podUBh cHBsZS5jb20+CiAKICAgICAgICAgY29tbWl0IGFwaSBzaG91bGQgbm90IHJldHVybiAnQW1iaWd1 b3VzUmV2aXNpb25QcmVmaXgnIGlmIHRoZXJlIGlzIGFuIGV4YWN0IHJldmlzaW9uIG1hdGNoCmRp ZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3Rlc3Qt ZnJlc2huZXNzLXBhZ2UuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3Bh Z2VzL3Rlc3QtZnJlc2huZXNzLXBhZ2UuanMKaW5kZXggNWVkNDMzZDMwOTg4NTQ5OGY2N2JmZDIw NzdiNzg2ODc3NjA0ODU4MC4uZDJiNjQwNjkzNDZhYTk4NjM5ODZkNTc3OTI4ZDM5MmFmZWQxOGQy OCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy90 ZXN0LWZyZXNobmVzcy1wYWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjMvcGFnZXMvdGVzdC1mcmVzaG5lc3MtcGFnZS5qcwpAQCAtMTksMTIgKzE5LDEyIEBAIGNs YXNzIFRlc3RGcmVzaG5lc3NQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKIAogICAgIGRp ZENvbnN0cnVjdFNoYWRvd1RyZWUoKQogICAgIHsKLSAgICAgICAgY29uc3QgdG9vbHRpcENvbnRh aW5lciA9IHRoaXMuY29udGVudCgndG9vbHRpcC1jb250YWluZXInKTsKLSAgICAgICAgdG9vbHRp cENvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCdtb3VzZWVudGVyJywgKCkgPT4geworICAgICAg ICBjb25zdCB0b29sdGlwVGFibGUgPSB0aGlzLmNvbnRlbnQoJ3Rvb2x0aXAtdGFibGUnKTsKKyAg ICAgICAgdG9vbHRpcFRhYmxlLmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlZW50ZXInLCAoKSA9PiB7 CiAgICAgICAgICAgICB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAgPSB0cnVlOwogICAgICAgICAgICAg dGhpcy5lbnF1ZXVlVG9SZW5kZXIoKTsKICAgICAgICAgfSk7Ci0gICAgICAgIHRvb2x0aXBDb250 YWluZXIuYWRkRXZlbnRMaXN0ZW5lcignbW91c2VsZWF2ZScsICgpID0+IHsKKyAgICAgICAgdG9v bHRpcFRhYmxlLmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlbGVhdmUnLCAoKSA9PiB7CiAgICAgICAg ICAgICB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuZW5x dWV1ZVRvUmVuZGVyKCk7CiAgICAgICAgIH0pOwpAQCAtODksOCArODksOSBAQCBjbGFzcyBUZXN0 RnJlc2huZXNzUGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGN1cnJlbnRUaW1lU2VyaWVzID0gbWVhc3VyZW1lbnRTZXQuZmV0Y2hlZFRpbWVT ZXJpZXMoJ2N1cnJlbnQnLCBmYWxzZSwgZmFsc2UpOwogCiAgICAgICAgICAgICAgICAgICAgIGxl dCB0aW1lRm9yTGF0ZXN0QnVpbGQgPSBzdGFydFRpbWU7Ci0gICAgICAgICAgICAgICAgICAgIGxl dCBsYXN0QnVpbGRMaW5rID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGxhc3RCdWls ZCA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAgIGxldCBidWlsZGVyID0gbnVsbDsKKyAgICAg ICAgICAgICAgICAgICAgbGV0IGNvbW1pdFNldCA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGxhc3RQb2ludCA9IGN1cnJlbnRUaW1lU2VyaWVzLmxhc3RQb2ludCgpOwogICAgICAg ICAgICAgICAgICAgICBpZiAobGFzdFBvaW50KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICB0 aW1lRm9yTGF0ZXN0QnVpbGQgPSBsYXN0UG9pbnQuYnVpbGQoKS5idWlsZFRpbWUoKS5nZXRUaW1l KCk7CkBAIC0xMDEsMTQgKzEwMiwxNSBAQCBjbGFzcyBUZXN0RnJlc2huZXNzUGFnZSBleHRlbmRz IFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChidWlsZC5idWlsZFRpbWUoKS5n ZXRUaW1lKCkgPj0gdGltZUZvckxhdGVzdEJ1aWxkKSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWVGb3JMYXRlc3RCdWlsZCA9IGJ1aWxkLmJ1aWxkVGltZSgpLmdldFRpbWUo KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEJ1aWxkTGluayA9IGJ1aWxk LnVybCgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXN0QnVpbGQgPSBidWls ZDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRlciA9IGJ1aWxkLmJ1aWxk ZXIoKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBjb21taXRTZXQgPSBsYXN0UG9pbnQuY29t bWl0U2V0KCk7CiAgICAgICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgICAgICBs YXN0RGF0YVBvaW50QnlNZXRyaWMuc2V0KG1ldHJpYywge3RpbWU6IHRpbWVGb3JMYXRlc3RCdWls ZCwgaGFzQ3VycmVudERhdGFQb2ludDogISFsYXN0UG9pbnQsCi0gICAgICAgICAgICAgICAgICAg ICAgICBsYXN0QnVpbGRMaW5rLCBidWlsZGVyfSk7CisgICAgICAgICAgICAgICAgICAgICAgICBs YXN0QnVpbGQsIGJ1aWxkZXIsIGNvbW1pdFNldH0pOwogICAgICAgICAgICAgICAgICAgICB0aGlz LmVucXVldWVUb1JlbmRlcigpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQpA QCAtMTIyLDcgKzEyNCw4IEBAIGNsYXNzIFRlc3RGcmVzaG5lc3NQYWdlIGV4dGVuZHMgUGFnZVdp dGhIZWFkaW5nIHsKICAgICAgICAgdGhpcy5fcmVuZGVyVGFibGVMYXppbHkuZXZhbHVhdGUodGhp cy5fcGxhdGZvcm1zLCB0aGlzLl9tZXRyaWNzKTsKIAogICAgICAgICBsZXQgYnVpbGRTdW1tYXJ5 Rm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOwotICAgICAgICBsZXQgYnVp bGRMaW5rRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOworICAgICAgICBs ZXQgYnVpbGRGb3JDdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA9IG51bGw7CisgICAgICAg IGxldCBjb21taXRTZXRGb3JDdXJyZW50SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOwogICAg ICAgICBjb25zdCBidWlsZGVyRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSB0aGlz Ll9jdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA/IHRoaXMuX2J1aWxkZXJCeUluZGljYXRv ci5nZXQodGhpcy5fY3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IpIDogbnVsbDsKICAgICAg ICAgZm9yIChjb25zdCBbcGxhdGZvcm0sIGxhc3REYXRhUG9pbnRCeU1ldHJpY10gb2YgdGhpcy5f bGFzdERhdGFQb2ludEJ5Q29uZmlndXJhdGlvbi5lbnRyaWVzKCkpIHsKICAgICAgICAgICAgIGZv ciAoY29uc3QgW21ldHJpYywgbGFzdERhdGFQb2ludF0gb2YgbGFzdERhdGFQb2ludEJ5TWV0cmlj LmVudHJpZXMoKSkgewpAQCAtMTM2LDM2ICsxMzksNTggQEAgY2xhc3MgVGVzdEZyZXNobmVzc1Bh Z2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICAgICAgICAgIGNvbnN0IGluZGlj YXRvciA9IHRoaXMuX2luZGljYXRvckJ5Q29uZmlndXJhdGlvbi5nZXQocGxhdGZvcm0pLmdldCht ZXRyaWMpOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZElu ZGljYXRvciAmJiB0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA9PT0gaW5kaWNh dG9yKSB7CiAgICAgICAgICAgICAgICAgICAgIGJ1aWxkU3VtbWFyeUZvckN1cnJlbnRseUhpZ2hs aWdodGVkSW5kaWNhdG9yID0gc3VtbWFyeTsKLSAgICAgICAgICAgICAgICAgICAgYnVpbGRMaW5r Rm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBsYXN0RGF0YVBvaW50Lmxhc3RCdWls ZExpbms7CisgICAgICAgICAgICAgICAgICAgIGJ1aWxkRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJ bmRpY2F0b3IgPSBsYXN0RGF0YVBvaW50Lmxhc3RCdWlsZDsKKyAgICAgICAgICAgICAgICAgICAg Y29tbWl0U2V0Rm9yQ3VycmVudEhpZ2hsaWdodGVkSW5kaWNhdG9yID0gbGFzdERhdGFQb2ludC5j b21taXRTZXQ7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHRoaXMuX2J1aWxk ZXJCeUluZGljYXRvci5zZXQoaW5kaWNhdG9yLCBsYXN0RGF0YVBvaW50LmJ1aWxkZXIpOwogICAg ICAgICAgICAgICAgIGluZGljYXRvci51cGRhdGUodGltZUR1cmF0aW9uLCB0aGlzLl90ZXN0QWdl VG9sZXJhbmNlLCB1cmwsIGJ1aWxkZXJGb3JDdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciAm JiBidWlsZGVyRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPT09IGxhc3REYXRhUG9p bnQuYnVpbGRlcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fcmVu ZGVyVG9vbHRpcExhemlseS5ldmFsdWF0ZSh0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZEluZGlj YXRvciwgdGhpcy5faG92ZXJpbmdUb29sdGlwLCBidWlsZFN1bW1hcnlGb3JDdXJyZW50bHlIaWdo bGlnaHRlZEluZGljYXRvciwgYnVpbGRMaW5rRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0 b3IpOworICAgICAgICB0aGlzLl9yZW5kZXJUb29sdGlwTGF6aWx5LmV2YWx1YXRlKHRoaXMuX2N1 cnJlbnRseUhpZ2hsaWdodGVkSW5kaWNhdG9yLCB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAsIGJ1aWxk U3VtbWFyeUZvckN1cnJlbnRseUhpZ2hsaWdodGVkSW5kaWNhdG9yLCBidWlsZEZvckN1cnJlbnRs eUhpZ2hsaWdodGVkSW5kaWNhdG9yLCBjb21taXRTZXRGb3JDdXJyZW50SGlnaGxpZ2h0ZWRJbmRp Y2F0b3IpOwogICAgIH0KIAotICAgIF9yZW5kZXJUb29sdGlwKGluZGljYXRvciwgaG92ZXJpbmdU b29sdGlwLCBidWlsZFN1bW1hcnksIGJ1aWxkTGluaykKKyAgICBfcmVuZGVyVG9vbHRpcChpbmRp Y2F0b3IsIGhvdmVyaW5nVG9vbHRpcCwgYnVpbGRTdW1tYXJ5LCBidWlsZCwgY29tbWl0U2V0KQog ICAgIHsKICAgICAgICAgaWYgKCFpbmRpY2F0b3IgfHwgIWJ1aWxkU3VtbWFyeSkgewotICAgICAg ICAgICAgdGhpcy5jb250ZW50KCd0b29sdGlwLWNvbnRhaW5lcicpLnN0eWxlLmRpc3BsYXkgPSBo b3ZlcmluZ1Rvb2x0aXAgPyBudWxsIDogJ25vbmUnOworICAgICAgICAgICAgdGhpcy5jb250ZW50 KCd0b29sdGlwLXRhYmxlJykuc3R5bGUuZGlzcGxheSA9IGhvdmVyaW5nVG9vbHRpcCA/IG51bGwg OiAnbm9uZSc7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgY29uc3Qg ZWxlbWVudCA9IENvbXBvbmVudEJhc2UuY3JlYXRlRWxlbWVudDsKKyAgICAgICAgY29uc3QgbGlu ayA9IENvbXBvbmVudEJhc2UuY3JlYXRlTGluazsKIAogICAgICAgICBjb25zdCByZWN0ID0gaW5k aWNhdG9yLmVsZW1lbnQoKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgY29uc3Qg dG9vbHRpcENvbnRhaW5lciA9IHRoaXMuY29udGVudCgndG9vbHRpcC1jb250YWluZXInKTsKLSAg ICAgICAgdG9vbHRpcENvbnRhaW5lci5zdHlsZS5kaXNwbGF5ID0gbnVsbDsKKyAgICAgICAgY29u c3QgdG9vbHRpcFRhYmxlID0gdGhpcy5jb250ZW50KCd0b29sdGlwLXRhYmxlJyk7CisgICAgICAg IHRvb2x0aXBUYWJsZS5zdHlsZS5kaXNwbGF5ID0gbnVsbDsKIAotICAgICAgICBjb25zdCB0b29s dGlwQ29udGFpbmVyQ29tcHV0ZWRTdHlsZSA9IGdldENvbXB1dGVkU3R5bGUodG9vbHRpcENvbnRh aW5lcik7CisgICAgICAgIGNvbnN0IHRvb2x0aXBDb250YWluZXJDb21wdXRlZFN0eWxlID0gZ2V0 Q29tcHV0ZWRTdHlsZSh0b29sdGlwVGFibGUpOwogICAgICAgICBjb25zdCBjb250YWluZXJNYXJn aW5Ub3AgPSBwYXJzZUZsb2F0KHRvb2x0aXBDb250YWluZXJDb21wdXRlZFN0eWxlLnBhZGRpbmdU b3ApOwogICAgICAgICBjb25zdCBjb250YWluZXJNYXJnaW5MZWZ0ID0gcGFyc2VGbG9hdCh0b29s dGlwQ29udGFpbmVyQ29tcHV0ZWRTdHlsZS5tYXJnaW5MZWZ0KTsKIAotICAgICAgICB0b29sdGlw Q29udGFpbmVyLnN0eWxlLnBvc2l0aW9uID0gJ2Fic29sdXRlJzsKLSAgICAgICAgdG9vbHRpcENv bnRhaW5lci5zdHlsZS50b3AgPSByZWN0LnRvcCAtICh0b29sdGlwQ29udGFpbmVyLm9mZnNldEhl aWdodCArIGNvbnRhaW5lck1hcmdpblRvcCkgICsgJ3B4JzsKLSAgICAgICAgdG9vbHRpcENvbnRh aW5lci5zdHlsZS5sZWZ0ID0gcmVjdC5sZWZ0ICsgcmVjdC53aWR0aCAvIDIgLSB0b29sdGlwQ29u dGFpbmVyLm9mZnNldFdpZHRoIC8gMiArIGNvbnRhaW5lck1hcmdpbkxlZnQgKyAncHgnOworICAg ICAgICB0b29sdGlwVGFibGUuc3R5bGUucG9zaXRpb24gPSAnYWJzb2x1dGUnOworICAgICAgICB0 b29sdGlwVGFibGUuc3R5bGUudG9wID0gcmVjdC50b3AgLSAodG9vbHRpcFRhYmxlLm9mZnNldEhl aWdodCArIGNvbnRhaW5lck1hcmdpblRvcCkgICsgJ3B4JzsKKyAgICAgICAgdG9vbHRpcFRhYmxl LnN0eWxlLmxlZnQgPSByZWN0LmxlZnQgKyByZWN0LndpZHRoIC8gMiAtIHRvb2x0aXBUYWJsZS5v ZmZzZXRXaWR0aCAvIDIgKyBjb250YWluZXJNYXJnaW5MZWZ0ICsgJ3B4JzsKKworICAgICAgICBs ZXQgdGFibGVDb250ZW50ID0gW2VsZW1lbnQoJ3RyJywgZWxlbWVudCgndGQnLCB7Y29sc3Bhbjog Mn0sIGJ1aWxkU3VtbWFyeSkpLCBlbGVtZW50KCd0cicsIGVsZW1lbnQoJ3RoJywge2NvbHNwYW46 IDJ9LCAnTGF0ZXN0IGJ1aWxkIGluZm9ybWF0aW9uJykpXTsKKyAgICAgICAgZm9yIChjb25zdCBy ZXBvc2l0b3J5IG9mIFJlcG9zaXRvcnkuc29ydEJ5TmFtZVByZWZlcnJpbmdPbmVzV2l0aFVSTChj b21taXRTZXQucmVwb3NpdG9yaWVzKCkpKSB7CisgICAgICAgICAgICBjb25zdCBjb21taXQgPSBj b21taXRTZXQuY29tbWl0Rm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5KTsKKyAgICAgICAgICAgIHRh YmxlQ29udGVudC5wdXNoKGVsZW1lbnQoJ3RyJywgWworICAgICAgICAgICAgICAgIGVsZW1lbnQo J3RkJywgcmVwb3NpdG9yeS5uYW1lKCkpLAorICAgICAgICAgICAgICAgIGVsZW1lbnQoJ3RkJywg Y29tbWl0LnVybCgpID8gbGluayhjb21taXQubGFiZWwoKSwgY29tbWl0LmxhYmVsKCksIGNvbW1p dC51cmwoKSwgdHJ1ZSkgOiBjb21taXQubGFiZWwoKSkKKyAgICAgICAgICAgIF0pKQorICAgICAg ICB9CisKKyAgICAgICAgaWYgKGJ1aWxkKSB7CisgICAgICAgICAgICBjb25zdCB1cmwgPSBidWls ZC51cmwoKTsKKyAgICAgICAgICAgIGNvbnN0IGJ1aWxkTnVtYmVyID0gYnVpbGQuYnVpbGROdW1i ZXIoKTsKKyAgICAgICAgICAgIHRhYmxlQ29udGVudC5wdXNoKGVsZW1lbnQoJ3RyJywgWworICAg ICAgICAgICAgICAgIGVsZW1lbnQoJ3RkJywgJ0J1aWxkJyksCisgICAgICAgICAgICAgICAgZWxl bWVudCgndGQnLCB7Y29sc3BhbjogMn0sIFsKKyAgICAgICAgICAgICAgICAgICAgdXJsID8gbGlu ayhidWlsZE51bWJlciwgYnVpbGQubGFiZWwoKSwgdXJsLCB0cnVlKSA6IGJ1aWxkTnVtYmVyCisg ICAgICAgICAgICAgICAgXSksCisgICAgICAgICAgICBdKSk7CisgICAgICAgIH0KIAotICAgICAg ICB0aGlzLnJlbmRlclJlcGxhY2UodG9vbHRpcENvbnRhaW5lciwgW2VsZW1lbnQoJ3AnLCBidWls ZFN1bW1hcnkpLCBidWlsZExpbmsgPyBlbGVtZW50KCdhJywge2hyZWY6IGJ1aWxkTGlua30sICdM YXRlc3QgQnVpbGQnKSA6IFtdXSk7CisgICAgICAgIHRoaXMucmVuZGVyUmVwbGFjZSh0b29sdGlw VGFibGUsICB0YWJsZUNvbnRlbnQpOwogICAgIH0KIAogICAgIF9yZW5kZXJUYWJsZShwbGF0Zm9y bXMsIG1ldHJpY3MpCkBAIC0yMTcsNyArMjQyLDcgQEAgY2xhc3MgVGVzdEZyZXNobmVzc1BhZ2Ug ZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCiAgICAgc3RhdGljIGh0bWxUZW1wbGF0ZSgpCiAg ICAgewotICAgICAgICByZXR1cm4gYDxzZWN0aW9uIGNsYXNzPSJwYWdlLXdpdGgtaGVhZGluZyI+ PGRpdiBpZD0idG9vbHRpcC1jb250YWluZXIiPjwvZGl2Pjx0YWJsZSBpZD0idGVzdC1oZWFsdGgi PjwvdGFibGU+PC9zZWN0aW9uPmA7CisgICAgICAgIHJldHVybiBgPHNlY3Rpb24gY2xhc3M9InBh Z2Utd2l0aC1oZWFkaW5nIj48dGFibGUgaWQ9InRvb2x0aXAtdGFibGUiPjwvdGFibGU+PHRhYmxl IGlkPSJ0ZXN0LWhlYWx0aCI+PC90YWJsZT48L3NlY3Rpb24+YDsKICAgICB9CiAKICAgICBzdGF0 aWMgY3NzVGVtcGxhdGUoKQpAQCAtMzA4LDkgKzMzMyw4IEBAIGNsYXNzIFRlc3RGcmVzaG5lc3NQ YWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgICAgICAgICBib3JkZXItcmln aHQ6IGNhbGMoMS42cmVtIC0gMXB4KSBzb2xpZCAjRjlGOUY5OwogICAgICAgICAgICAgICAgIGJv cmRlci10b3A6IGNhbGMoMS42cmVtIC0gMXB4KSBzb2xpZCB0cmFuc3BhcmVudDsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgICN0b29sdGlwLWNvbnRhaW5lciB7CisgICAgICAgICAgICAjdG9v bHRpcC10YWJsZSB7CiAgICAgICAgICAgICAgICAgd2lkdGg6IDIycmVtOwotICAgICAgICAgICAg ICAgIGhlaWdodDogMnJlbTsKICAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMzQ0 OTVFOwogICAgICAgICAgICAgICAgIG9wYWNpdHk6IDAuOTsKICAgICAgICAgICAgICAgICBtYXJn aW46IDAuM3JlbTsKQEAgLTMxOCw4ICszNDIsMTUgQEAgY2xhc3MgVGVzdEZyZXNobmVzc1BhZ2Ug ZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6 IDAuNHJlbTsKICAgICAgICAgICAgICAgICB6LWluZGV4OiAxOwogICAgICAgICAgICAgICAgIHRl eHQtYWxpZ246IGNlbnRlcjsKKyAgICAgICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUtdGFibGU7 CisgICAgICAgICAgICAgICAgY29sb3I6IHdoaXRlOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgI3Rvb2x0aXAtY29udGFpbmVyOjphZnRlciB7CisgICAgICAgICAgICAjdG9vbHRpcC10YWJs ZSB0ZCB7CisgICAgICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAgICAg ICBtYXgtd2lkdGg6IDIycmVtOworICAgICAgICAgICAgICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlw c2lzOworICAgICAgICAgICAgfQorICAgICAgICAgICAgI3Rvb2x0aXAtdGFibGU6OmFmdGVyIHsK ICAgICAgICAgICAgICAgICBjb250ZW50OiAiICI7CiAgICAgICAgICAgICAgICAgcG9zaXRpb246 IGFic29sdXRlOwogICAgICAgICAgICAgICAgIHRvcDogMTAwJTsKQEAgLTMyOSwxMSArMzYwLDcg QEAgY2xhc3MgVGVzdEZyZXNobmVzc1BhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAg ICAgICAgICAgICAgIGJvcmRlci1zdHlsZTogc29saWQ7CiAgICAgICAgICAgICAgICAgYm9yZGVy LWNvbG9yOiAjMzQ0OTVFIHRyYW5zcGFyZW50IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50OwogICAg ICAgICAgICAgfQotICAgICAgICAgICAgI3Rvb2x0aXAtY29udGFpbmVyIHAgewotICAgICAgICAg ICAgICAgIGNvbG9yOiB3aGl0ZTsKLSAgICAgICAgICAgICAgICBtYXJnaW46IDA7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICAjdG9vbHRpcC1jb250YWluZXIgYSB7CisgICAgICAgICAgICAj dG9vbHRpcC10YWJsZSBhIHsKICAgICAgICAgICAgICAgICBjb2xvcjogI0IwM0EyRTsKICAgICAg ICAgICAgICAgICBmb250LXdlaWdodDogYm9sZDsKICAgICAgICAgICAgIH0K 373442 2019-07-03 17:27:47 -0700 2019-07-04 01:55:16 -0700 Patch bug-199483-20190703172746.patch text/plain 10776 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTE4CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiNjE0MTliYzY5NTQzNTdkOWQzYmJjYThlMDAwODM4Y2MwYmUxOGE4Li4yNzgzNGY5YmI5 ZjFkNWFhMDAwNmYxODI4YWZiZGM4Y2UzM2NhZTMzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOS0wNy0wMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBUZXN0IGZyZXNobmVzcyBwYWdlIHNob3VsZCBleHBvc2Ug cmV2aXNpb24gaW5mb3JtYXRpb24gZm9yIGxhdGVzdCBidWlsZCBvbiB0b29sdGlwLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NDgzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbGF0ZXN0IGJ1 aWxkIHJldmlzaW9uIGluZm9ybWF0aW9uIG9uIHRlc3QgZnJlc2huZXNzIHBhZ2UgdG9vbHRpcC4K KworICAgICAgICAqIHB1YmxpYy92My9wYWdlcy90ZXN0LWZyZXNobmVzcy1wYWdlLmpzOiBBZGQg YnVpbGQgcmV2aXNpb24gaW5mb3JtYXRpb24gb24gdG9vbHRpcC4KKyAgICAgICAgKFRlc3RGcmVz aG5lc3NQYWdlLnByb3RvdHlwZS5kaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKToKKyAgICAgICAgKFRl c3RGcmVzaG5lc3NQYWdlLnByb3RvdHlwZS5fZmV0Y2hUZXN0UmVzdWx0cyk6CisgICAgICAgIChU ZXN0RnJlc2huZXNzUGFnZS5wcm90b3R5cGUucmVuZGVyKToKKyAgICAgICAgKFRlc3RGcmVzaG5l c3NQYWdlLnByb3RvdHlwZS5fcmVuZGVyVG9vbHRpcCk6CisgICAgICAgIChUZXN0RnJlc2huZXNz UGFnZS5jc3NUZW1wbGF0ZSk6CisKIDIwMTktMDYtMjYgIERld2VpIFpodSAgPGRld2VpX3podUBh cHBsZS5jb20+CiAKICAgICAgICAgY29tbWl0IGFwaSBzaG91bGQgbm90IHJldHVybiAnQW1iaWd1 b3VzUmV2aXNpb25QcmVmaXgnIGlmIHRoZXJlIGlzIGFuIGV4YWN0IHJldmlzaW9uIG1hdGNoCmRp ZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3Rlc3Qt ZnJlc2huZXNzLXBhZ2UuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3Bh Z2VzL3Rlc3QtZnJlc2huZXNzLXBhZ2UuanMKaW5kZXggNWVkNDMzZDMwOTg4NTQ5OGY2N2JmZDIw NzdiNzg2ODc3NjA0ODU4MC4uMzcwMDA3MDQ4ZmNlZWI2NWU4Nzc1ZDRhYjY1NjRkYWU5NjI4ZGNi YSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy90 ZXN0LWZyZXNobmVzcy1wYWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjMvcGFnZXMvdGVzdC1mcmVzaG5lc3MtcGFnZS5qcwpAQCAtMTksMTIgKzE5LDEyIEBAIGNs YXNzIFRlc3RGcmVzaG5lc3NQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKIAogICAgIGRp ZENvbnN0cnVjdFNoYWRvd1RyZWUoKQogICAgIHsKLSAgICAgICAgY29uc3QgdG9vbHRpcENvbnRh aW5lciA9IHRoaXMuY29udGVudCgndG9vbHRpcC1jb250YWluZXInKTsKLSAgICAgICAgdG9vbHRp cENvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCdtb3VzZWVudGVyJywgKCkgPT4geworICAgICAg ICBjb25zdCB0b29sdGlwVGFibGUgPSB0aGlzLmNvbnRlbnQoJ3Rvb2x0aXAtdGFibGUnKTsKKyAg ICAgICAgdG9vbHRpcFRhYmxlLmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlZW50ZXInLCAoKSA9PiB7 CiAgICAgICAgICAgICB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAgPSB0cnVlOwogICAgICAgICAgICAg dGhpcy5lbnF1ZXVlVG9SZW5kZXIoKTsKICAgICAgICAgfSk7Ci0gICAgICAgIHRvb2x0aXBDb250 YWluZXIuYWRkRXZlbnRMaXN0ZW5lcignbW91c2VsZWF2ZScsICgpID0+IHsKKyAgICAgICAgdG9v bHRpcFRhYmxlLmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlbGVhdmUnLCAoKSA9PiB7CiAgICAgICAg ICAgICB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuZW5x dWV1ZVRvUmVuZGVyKCk7CiAgICAgICAgIH0pOwpAQCAtODksOCArODksOSBAQCBjbGFzcyBUZXN0 RnJlc2huZXNzUGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGN1cnJlbnRUaW1lU2VyaWVzID0gbWVhc3VyZW1lbnRTZXQuZmV0Y2hlZFRpbWVT ZXJpZXMoJ2N1cnJlbnQnLCBmYWxzZSwgZmFsc2UpOwogCiAgICAgICAgICAgICAgICAgICAgIGxl dCB0aW1lRm9yTGF0ZXN0QnVpbGQgPSBzdGFydFRpbWU7Ci0gICAgICAgICAgICAgICAgICAgIGxl dCBsYXN0QnVpbGRMaW5rID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGxhc3RCdWls ZCA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAgIGxldCBidWlsZGVyID0gbnVsbDsKKyAgICAg ICAgICAgICAgICAgICAgbGV0IGNvbW1pdFNldCA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGxhc3RQb2ludCA9IGN1cnJlbnRUaW1lU2VyaWVzLmxhc3RQb2ludCgpOwogICAgICAg ICAgICAgICAgICAgICBpZiAobGFzdFBvaW50KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICB0 aW1lRm9yTGF0ZXN0QnVpbGQgPSBsYXN0UG9pbnQuYnVpbGQoKS5idWlsZFRpbWUoKS5nZXRUaW1l KCk7CkBAIC0xMDEsMTQgKzEwMiwxNSBAQCBjbGFzcyBUZXN0RnJlc2huZXNzUGFnZSBleHRlbmRz IFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChidWlsZC5idWlsZFRpbWUoKS5n ZXRUaW1lKCkgPj0gdGltZUZvckxhdGVzdEJ1aWxkKSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWVGb3JMYXRlc3RCdWlsZCA9IGJ1aWxkLmJ1aWxkVGltZSgpLmdldFRpbWUo KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEJ1aWxkTGluayA9IGJ1aWxk LnVybCgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXN0QnVpbGQgPSBidWls ZDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRlciA9IGJ1aWxkLmJ1aWxk ZXIoKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBjb21taXRTZXQgPSBsYXN0UG9pbnQuY29t bWl0U2V0KCk7CiAgICAgICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgICAgICBs YXN0RGF0YVBvaW50QnlNZXRyaWMuc2V0KG1ldHJpYywge3RpbWU6IHRpbWVGb3JMYXRlc3RCdWls ZCwgaGFzQ3VycmVudERhdGFQb2ludDogISFsYXN0UG9pbnQsCi0gICAgICAgICAgICAgICAgICAg ICAgICBsYXN0QnVpbGRMaW5rLCBidWlsZGVyfSk7CisgICAgICAgICAgICAgICAgICAgICAgICBs YXN0QnVpbGQsIGJ1aWxkZXIsIGNvbW1pdFNldH0pOwogICAgICAgICAgICAgICAgICAgICB0aGlz LmVucXVldWVUb1JlbmRlcigpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQpA QCAtMTIyLDcgKzEyNCw4IEBAIGNsYXNzIFRlc3RGcmVzaG5lc3NQYWdlIGV4dGVuZHMgUGFnZVdp dGhIZWFkaW5nIHsKICAgICAgICAgdGhpcy5fcmVuZGVyVGFibGVMYXppbHkuZXZhbHVhdGUodGhp cy5fcGxhdGZvcm1zLCB0aGlzLl9tZXRyaWNzKTsKIAogICAgICAgICBsZXQgYnVpbGRTdW1tYXJ5 Rm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOwotICAgICAgICBsZXQgYnVp bGRMaW5rRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOworICAgICAgICBs ZXQgYnVpbGRGb3JDdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA9IG51bGw7CisgICAgICAg IGxldCBjb21taXRTZXRGb3JDdXJyZW50SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBudWxsOwogICAg ICAgICBjb25zdCBidWlsZGVyRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSB0aGlz Ll9jdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA/IHRoaXMuX2J1aWxkZXJCeUluZGljYXRv ci5nZXQodGhpcy5fY3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IpIDogbnVsbDsKICAgICAg ICAgZm9yIChjb25zdCBbcGxhdGZvcm0sIGxhc3REYXRhUG9pbnRCeU1ldHJpY10gb2YgdGhpcy5f bGFzdERhdGFQb2ludEJ5Q29uZmlndXJhdGlvbi5lbnRyaWVzKCkpIHsKICAgICAgICAgICAgIGZv ciAoY29uc3QgW21ldHJpYywgbGFzdERhdGFQb2ludF0gb2YgbGFzdERhdGFQb2ludEJ5TWV0cmlj LmVudHJpZXMoKSkgewpAQCAtMTM2LDM2ICsxMzksNjAgQEAgY2xhc3MgVGVzdEZyZXNobmVzc1Bh Z2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICAgICAgICAgIGNvbnN0IGluZGlj YXRvciA9IHRoaXMuX2luZGljYXRvckJ5Q29uZmlndXJhdGlvbi5nZXQocGxhdGZvcm0pLmdldCht ZXRyaWMpOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZElu ZGljYXRvciAmJiB0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciA9PT0gaW5kaWNh dG9yKSB7CiAgICAgICAgICAgICAgICAgICAgIGJ1aWxkU3VtbWFyeUZvckN1cnJlbnRseUhpZ2hs aWdodGVkSW5kaWNhdG9yID0gc3VtbWFyeTsKLSAgICAgICAgICAgICAgICAgICAgYnVpbGRMaW5r Rm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPSBsYXN0RGF0YVBvaW50Lmxhc3RCdWls ZExpbms7CisgICAgICAgICAgICAgICAgICAgIGJ1aWxkRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJ bmRpY2F0b3IgPSBsYXN0RGF0YVBvaW50Lmxhc3RCdWlsZDsKKyAgICAgICAgICAgICAgICAgICAg Y29tbWl0U2V0Rm9yQ3VycmVudEhpZ2hsaWdodGVkSW5kaWNhdG9yID0gbGFzdERhdGFQb2ludC5j b21taXRTZXQ7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHRoaXMuX2J1aWxk ZXJCeUluZGljYXRvci5zZXQoaW5kaWNhdG9yLCBsYXN0RGF0YVBvaW50LmJ1aWxkZXIpOwogICAg ICAgICAgICAgICAgIGluZGljYXRvci51cGRhdGUodGltZUR1cmF0aW9uLCB0aGlzLl90ZXN0QWdl VG9sZXJhbmNlLCB1cmwsIGJ1aWxkZXJGb3JDdXJyZW50bHlIaWdobGlnaHRlZEluZGljYXRvciAm JiBidWlsZGVyRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0b3IgPT09IGxhc3REYXRhUG9p bnQuYnVpbGRlcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fcmVu ZGVyVG9vbHRpcExhemlseS5ldmFsdWF0ZSh0aGlzLl9jdXJyZW50bHlIaWdobGlnaHRlZEluZGlj YXRvciwgdGhpcy5faG92ZXJpbmdUb29sdGlwLCBidWlsZFN1bW1hcnlGb3JDdXJyZW50bHlIaWdo bGlnaHRlZEluZGljYXRvciwgYnVpbGRMaW5rRm9yQ3VycmVudGx5SGlnaGxpZ2h0ZWRJbmRpY2F0 b3IpOworICAgICAgICB0aGlzLl9yZW5kZXJUb29sdGlwTGF6aWx5LmV2YWx1YXRlKHRoaXMuX2N1 cnJlbnRseUhpZ2hsaWdodGVkSW5kaWNhdG9yLCB0aGlzLl9ob3ZlcmluZ1Rvb2x0aXAsIGJ1aWxk U3VtbWFyeUZvckN1cnJlbnRseUhpZ2hsaWdodGVkSW5kaWNhdG9yLCBidWlsZEZvckN1cnJlbnRs eUhpZ2hsaWdodGVkSW5kaWNhdG9yLCBjb21taXRTZXRGb3JDdXJyZW50SGlnaGxpZ2h0ZWRJbmRp Y2F0b3IpOwogICAgIH0KIAotICAgIF9yZW5kZXJUb29sdGlwKGluZGljYXRvciwgaG92ZXJpbmdU b29sdGlwLCBidWlsZFN1bW1hcnksIGJ1aWxkTGluaykKKyAgICBfcmVuZGVyVG9vbHRpcChpbmRp Y2F0b3IsIGhvdmVyaW5nVG9vbHRpcCwgYnVpbGRTdW1tYXJ5LCBidWlsZCwgY29tbWl0U2V0KQog ICAgIHsKICAgICAgICAgaWYgKCFpbmRpY2F0b3IgfHwgIWJ1aWxkU3VtbWFyeSkgewotICAgICAg ICAgICAgdGhpcy5jb250ZW50KCd0b29sdGlwLWNvbnRhaW5lcicpLnN0eWxlLmRpc3BsYXkgPSBo b3ZlcmluZ1Rvb2x0aXAgPyBudWxsIDogJ25vbmUnOworICAgICAgICAgICAgdGhpcy5jb250ZW50 KCd0b29sdGlwLXRhYmxlJykuc3R5bGUuZGlzcGxheSA9IGhvdmVyaW5nVG9vbHRpcCA/IG51bGwg OiAnbm9uZSc7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgY29uc3Qg ZWxlbWVudCA9IENvbXBvbmVudEJhc2UuY3JlYXRlRWxlbWVudDsKKyAgICAgICAgY29uc3QgbGlu ayA9IENvbXBvbmVudEJhc2UuY3JlYXRlTGluazsKIAogICAgICAgICBjb25zdCByZWN0ID0gaW5k aWNhdG9yLmVsZW1lbnQoKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgY29uc3Qg dG9vbHRpcENvbnRhaW5lciA9IHRoaXMuY29udGVudCgndG9vbHRpcC1jb250YWluZXInKTsKLSAg ICAgICAgdG9vbHRpcENvbnRhaW5lci5zdHlsZS5kaXNwbGF5ID0gbnVsbDsKKyAgICAgICAgY29u c3QgdG9vbHRpcFRhYmxlID0gdGhpcy5jb250ZW50KCd0b29sdGlwLXRhYmxlJyk7CisgICAgICAg IHRvb2x0aXBUYWJsZS5zdHlsZS5kaXNwbGF5ID0gbnVsbDsKIAotICAgICAgICBjb25zdCB0b29s dGlwQ29udGFpbmVyQ29tcHV0ZWRTdHlsZSA9IGdldENvbXB1dGVkU3R5bGUodG9vbHRpcENvbnRh aW5lcik7CisgICAgICAgIGNvbnN0IHRvb2x0aXBDb250YWluZXJDb21wdXRlZFN0eWxlID0gZ2V0 Q29tcHV0ZWRTdHlsZSh0b29sdGlwVGFibGUpOwogICAgICAgICBjb25zdCBjb250YWluZXJNYXJn aW5Ub3AgPSBwYXJzZUZsb2F0KHRvb2x0aXBDb250YWluZXJDb21wdXRlZFN0eWxlLnBhZGRpbmdU b3ApOwogICAgICAgICBjb25zdCBjb250YWluZXJNYXJnaW5MZWZ0ID0gcGFyc2VGbG9hdCh0b29s dGlwQ29udGFpbmVyQ29tcHV0ZWRTdHlsZS5tYXJnaW5MZWZ0KTsKIAotICAgICAgICB0b29sdGlw Q29udGFpbmVyLnN0eWxlLnBvc2l0aW9uID0gJ2Fic29sdXRlJzsKLSAgICAgICAgdG9vbHRpcENv bnRhaW5lci5zdHlsZS50b3AgPSByZWN0LnRvcCAtICh0b29sdGlwQ29udGFpbmVyLm9mZnNldEhl aWdodCArIGNvbnRhaW5lck1hcmdpblRvcCkgICsgJ3B4JzsKLSAgICAgICAgdG9vbHRpcENvbnRh aW5lci5zdHlsZS5sZWZ0ID0gcmVjdC5sZWZ0ICsgcmVjdC53aWR0aCAvIDIgLSB0b29sdGlwQ29u dGFpbmVyLm9mZnNldFdpZHRoIC8gMiArIGNvbnRhaW5lck1hcmdpbkxlZnQgKyAncHgnOworICAg ICAgICB0b29sdGlwVGFibGUuc3R5bGUucG9zaXRpb24gPSAnYWJzb2x1dGUnOworICAgICAgICB0 b29sdGlwVGFibGUuc3R5bGUudG9wID0gcmVjdC50b3AgLSAodG9vbHRpcFRhYmxlLm9mZnNldEhl aWdodCArIGNvbnRhaW5lck1hcmdpblRvcCkgICsgJ3B4JzsKKyAgICAgICAgdG9vbHRpcFRhYmxl LnN0eWxlLmxlZnQgPSByZWN0LmxlZnQgKyByZWN0LndpZHRoIC8gMiAtIHRvb2x0aXBUYWJsZS5v ZmZzZXRXaWR0aCAvIDIgKyBjb250YWluZXJNYXJnaW5MZWZ0ICsgJ3B4JzsKKworICAgICAgICBs ZXQgdGFibGVDb250ZW50ID0gW2VsZW1lbnQoJ3RyJywgZWxlbWVudCgndGQnLCB7Y29sc3Bhbjog Mn0sIGJ1aWxkU3VtbWFyeSkpXTsKKyAgICAgICAgaWYgKGNvbW1pdFNldC5yZXBvc2l0b3JpZXMo KS5zaXplKQorICAgICAgICAgICAgdGFibGVDb250ZW50ID0gZWxlbWVudCgndHInLCBlbGVtZW50 KCd0aCcsIHtjb2xzcGFuOiAyfSwgJ0xhdGVzdCBidWlsZCBpbmZvcm1hdGlvbicpKTsKKyAgICAg ICAgZm9yIChjb25zdCByZXBvc2l0b3J5IG9mIFJlcG9zaXRvcnkuc29ydEJ5TmFtZVByZWZlcnJp bmdPbmVzV2l0aFVSTChjb21taXRTZXQucmVwb3NpdG9yaWVzKCkpKSB7CisgICAgICAgICAgICBj b25zdCBjb21taXQgPSBjb21taXRTZXQuY29tbWl0Rm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5KTsK KyAgICAgICAgICAgIHRhYmxlQ29udGVudC5wdXNoKGVsZW1lbnQoJ3RyJywgWworICAgICAgICAg ICAgICAgIGVsZW1lbnQoJ3RkJywgcmVwb3NpdG9yeS5uYW1lKCkpLAorICAgICAgICAgICAgICAg IGVsZW1lbnQoJ3RkJywgY29tbWl0LnVybCgpID8gbGluayhjb21taXQubGFiZWwoKSwgY29tbWl0 LmxhYmVsKCksIGNvbW1pdC51cmwoKSwgdHJ1ZSkgOiBjb21taXQubGFiZWwoKSkKKyAgICAgICAg ICAgIF0pKQorICAgICAgICB9CisKKyAgICAgICAgaWYgKGJ1aWxkKSB7CisgICAgICAgICAgICBj b25zdCB1cmwgPSBidWlsZC51cmwoKTsKKyAgICAgICAgICAgIGNvbnN0IGJ1aWxkTnVtYmVyID0g YnVpbGQuYnVpbGROdW1iZXIoKTsKKyAgICAgICAgICAgIHRhYmxlQ29udGVudC5wdXNoKGVsZW1l bnQoJ3RyJywgWworICAgICAgICAgICAgICAgIGVsZW1lbnQoJ3RkJywgJ0J1aWxkJyksCisgICAg ICAgICAgICAgICAgZWxlbWVudCgndGQnLCB7Y29sc3BhbjogMn0sIFsKKyAgICAgICAgICAgICAg ICAgICAgdXJsID8gbGluayhidWlsZE51bWJlciwgYnVpbGQubGFiZWwoKSwgdXJsLCB0cnVlKSA6 IGJ1aWxkTnVtYmVyCisgICAgICAgICAgICAgICAgXSksCisgICAgICAgICAgICBdKSk7CisgICAg ICAgIH0KIAotICAgICAgICB0aGlzLnJlbmRlclJlcGxhY2UodG9vbHRpcENvbnRhaW5lciwgW2Vs ZW1lbnQoJ3AnLCBidWlsZFN1bW1hcnkpLCBidWlsZExpbmsgPyBlbGVtZW50KCdhJywge2hyZWY6 IGJ1aWxkTGlua30sICdMYXRlc3QgQnVpbGQnKSA6IFtdXSk7CisgICAgICAgIHRoaXMucmVuZGVy UmVwbGFjZSh0b29sdGlwVGFibGUsICB0YWJsZUNvbnRlbnQpOwogICAgIH0KIAogICAgIF9yZW5k ZXJUYWJsZShwbGF0Zm9ybXMsIG1ldHJpY3MpCkBAIC0yMTcsNyArMjQ0LDcgQEAgY2xhc3MgVGVz dEZyZXNobmVzc1BhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCiAgICAgc3RhdGljIGh0 bWxUZW1wbGF0ZSgpCiAgICAgewotICAgICAgICByZXR1cm4gYDxzZWN0aW9uIGNsYXNzPSJwYWdl LXdpdGgtaGVhZGluZyI+PGRpdiBpZD0idG9vbHRpcC1jb250YWluZXIiPjwvZGl2Pjx0YWJsZSBp ZD0idGVzdC1oZWFsdGgiPjwvdGFibGU+PC9zZWN0aW9uPmA7CisgICAgICAgIHJldHVybiBgPHNl Y3Rpb24gY2xhc3M9InBhZ2Utd2l0aC1oZWFkaW5nIj48dGFibGUgaWQ9InRvb2x0aXAtdGFibGUi PjwvdGFibGU+PHRhYmxlIGlkPSJ0ZXN0LWhlYWx0aCI+PC90YWJsZT48L3NlY3Rpb24+YDsKICAg ICB9CiAKICAgICBzdGF0aWMgY3NzVGVtcGxhdGUoKQpAQCAtMzA4LDkgKzMzNSw4IEBAIGNsYXNz IFRlc3RGcmVzaG5lc3NQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgICAg ICAgICBib3JkZXItcmlnaHQ6IGNhbGMoMS42cmVtIC0gMXB4KSBzb2xpZCAjRjlGOUY5OwogICAg ICAgICAgICAgICAgIGJvcmRlci10b3A6IGNhbGMoMS42cmVtIC0gMXB4KSBzb2xpZCB0cmFuc3Bh cmVudDsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICN0b29sdGlwLWNvbnRhaW5lciB7Cisg ICAgICAgICAgICAjdG9vbHRpcC10YWJsZSB7CiAgICAgICAgICAgICAgICAgd2lkdGg6IDIycmVt OwotICAgICAgICAgICAgICAgIGhlaWdodDogMnJlbTsKICAgICAgICAgICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiAjMzQ0OTVFOwogICAgICAgICAgICAgICAgIG9wYWNpdHk6IDAuOTsKICAgICAg ICAgICAgICAgICBtYXJnaW46IDAuM3JlbTsKQEAgLTMxOCw4ICszNDQsMTUgQEAgY2xhc3MgVGVz dEZyZXNobmVzc1BhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICAgICAgICAg IGJvcmRlci1yYWRpdXM6IDAuNHJlbTsKICAgICAgICAgICAgICAgICB6LWluZGV4OiAxOwogICAg ICAgICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICAgICAgICAgICAgICBkaXNwbGF5 OiBpbmxpbmUtdGFibGU7CisgICAgICAgICAgICAgICAgY29sb3I6IHdoaXRlOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgI3Rvb2x0aXAtY29udGFpbmVyOjphZnRlciB7CisgICAgICAgICAg ICAjdG9vbHRpcC10YWJsZSB0ZCB7CisgICAgICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsK KyAgICAgICAgICAgICAgICBtYXgtd2lkdGg6IDIycmVtOworICAgICAgICAgICAgICAgIHRleHQt b3ZlcmZsb3c6IGVsbGlwc2lzOworICAgICAgICAgICAgfQorICAgICAgICAgICAgI3Rvb2x0aXAt dGFibGU6OmFmdGVyIHsKICAgICAgICAgICAgICAgICBjb250ZW50OiAiICI7CiAgICAgICAgICAg ICAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgICAgICAgICAgICAgIHRvcDogMTAwJTsKQEAg LTMyOSwxMSArMzYyLDcgQEAgY2xhc3MgVGVzdEZyZXNobmVzc1BhZ2UgZXh0ZW5kcyBQYWdlV2l0 aEhlYWRpbmcgewogICAgICAgICAgICAgICAgIGJvcmRlci1zdHlsZTogc29saWQ7CiAgICAgICAg ICAgICAgICAgYm9yZGVyLWNvbG9yOiAjMzQ0OTVFIHRyYW5zcGFyZW50IHRyYW5zcGFyZW50IHRy YW5zcGFyZW50OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgI3Rvb2x0aXAtY29udGFpbmVy IHAgewotICAgICAgICAgICAgICAgIGNvbG9yOiB3aGl0ZTsKLSAgICAgICAgICAgICAgICBtYXJn aW46IDA7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAjdG9vbHRpcC1jb250YWluZXIgYSB7 CisgICAgICAgICAgICAjdG9vbHRpcC10YWJsZSBhIHsKICAgICAgICAgICAgICAgICBjb2xvcjog I0IwM0EyRTsKICAgICAgICAgICAgICAgICBmb250LXdlaWdodDogYm9sZDsKICAgICAgICAgICAg IH0K