79813 2012-02-28 11:12:09 -0800 Add size field to Metadata in FileSystem API 2012-02-29 10:53:36 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kinuko kinuko abarth dglazkov ericu fishd levin ojan webkit.review.bot oldest_to_newest 566888 0 kinuko 2012-02-28 11:12:09 -0800 We should add size field to Metadata in FileSystem API as proposed in: http://lists.w3.org/Archives/Public/public-webapps/2012JanMar/0905.html 567208 1 129352 kinuko 2012-02-28 16:29:23 -0800 Created attachment 129352 Patch 567237 2 129352 levin 2012-02-28 16:56:03 -0800 Comment on attachment 129352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129352&action=review > Source/WebCore/fileapi/FileSystemCallbacks.cpp:34 > +#include <stdio.h> Why include stdio? > Source/WebCore/fileapi/Metadata.h:41 > class Metadata : public RefCounted<Metadata> { What is the differenence between Metadata and FileMetadata? Metadata::m_metadata is confusing to me. I guess Metadata is what is exposed to js code and FileMetadata is internal. I wonder if m_metadata should be call m_internalMetadata. Slightly more verbose but at least you wouldn't have Metadata::m_metadata. 567279 3 129352 webkit.review.bot 2012-02-28 17:38:57 -0800 Comment on attachment 129352 Patch Attachment 129352 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11686064 New failing tests: fast/filesystem/op-get-metadata.html 567297 4 129367 kinuko 2012-02-28 18:05:34 -0800 Created attachment 129367 Patch 567299 5 webkit.review.bot 2012-02-28 18:11:21 -0800 Attachment 129367 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast..." exit_code: 1 Source/WebKit2/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] WebKitLibraries/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] WebKitLibraries/WebKitSystemInterface.h:339: The parameter name "layer" adds no information, so it should be removed. [readability/parameter_name] [5] WebKitLibraries/WebKitSystemInterface.h:339: The parameter name "context" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/mac/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 5 in 17 files If any of these errors are false positives, please file a bug against check-webkit-style. 129352 2012-02-28 16:29:23 -0800 2012-02-28 18:05:29 -0800 Patch bug-79813-20120229092922.patch text/plain 12696 kinuko U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg3NTIyNWU1ZDczMzYx YWZkNGU0M2FjNWEwMmQ0ODA1MTYxZmE1NS4uNDBmNTk1N2VlZGUxZDMxNDQzYTBjODExMjVkYzkw YTA0NGRjYjBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAyLTI4ICBLaW51 a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc2l6ZSBmaWVs ZCB0byBNZXRhZGF0YSBpbiBGaWxlU3lzdGVtIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2ZpbGVzeXN0ZW0vb3AtZ2V0LW1ldGFk YXRhLmh0bWwKKworICAgICAgICAqIGZpbGVhcGkvRmlsZVN5c3RlbUNhbGxiYWNrcy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZXRhZGF0YUNhbGxiYWNrczo6ZGlkUmVhZE1ldGFkYXRhKToKKyAg ICAgICAgKiBmaWxlYXBpL01ldGFkYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpNZXRhZGF0YTo6 Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1ldGFkYXRhOjptb2RpZmljYXRpb25UaW1lKToK KyAgICAgICAgKFdlYkNvcmU6Ok1ldGFkYXRhOjpzaXplKTogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpNZXRhZGF0YTo6TWV0YWRhdGEpOgorICAgICAgICAqIGZpbGVhcGkvTWV0YWRhdGEuaWRs OgorCiAyMDEyLTAyLTI4ICBBZGFtIEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIGZpeCBjci13aW4gYnVpbGQgYWZ0ZXIgcjEwOTExOS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVN5c3RlbUNhbGxiYWNrcy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVTeXN0ZW1DYWxsYmFja3MuY3BwCmluZGV4IDA2ZjNiOTM4 MzRmYmFiNDg0ZmMzNzE0YjE5NDFhODExMWM3MzQzY2EuLjY3ZWM0N2RiNDYwYmE2MzJjODJmMjMz MzM5ZjJiMDdmNTZiZDE3ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmls ZVN5c3RlbUNhbGxiYWNrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlU3lz dGVtQ2FsbGJhY2tzLmNwcApAQCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIkZpbGVTeXN0ZW1DYWxsYmFja3MuaCIKIAorI2luY2x1ZGUgPHN0ZGlvLmg+CisK ICNpZiBFTkFCTEUoRklMRV9TWVNURU0pCiAKICNpbmNsdWRlICJBc3luY0ZpbGVTeXN0ZW0uaCIK QEAgLTI2OCw3ICsyNzAsNyBAQCBNZXRhZGF0YUNhbGxiYWNrczo6TWV0YWRhdGFDYWxsYmFja3Mo UGFzc1JlZlB0cjxNZXRhZGF0YUNhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhYwogdm9pZCBNZXRhZGF0 YUNhbGxiYWNrczo6ZGlkUmVhZE1ldGFkYXRhKGNvbnN0IEZpbGVNZXRhZGF0YSYgbWV0YWRhdGEp CiB7CiAgICAgaWYgKG1fc3VjY2Vzc0NhbGxiYWNrKQotICAgICAgICBtX3N1Y2Nlc3NDYWxsYmFj ay0+aGFuZGxlRXZlbnQoTWV0YWRhdGE6OmNyZWF0ZShtZXRhZGF0YS5tb2RpZmljYXRpb25UaW1l KS5nZXQoKSk7CisgICAgICAgIG1fc3VjY2Vzc0NhbGxiYWNrLT5oYW5kbGVFdmVudChNZXRhZGF0 YTo6Y3JlYXRlKG1ldGFkYXRhKS5nZXQoKSk7CiAgICAgbV9zdWNjZXNzQ2FsbGJhY2suY2xlYXIo KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9NZXRhZGF0YS5oIGIv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9NZXRhZGF0YS5oCmluZGV4IGI3MDgwNmIwOWVkNDIxMjY0 MGRiYzYwMGY4MGNhY2I3NWEyZjM4MGEuLjU5MTgwYWY5ZTE1OWJhMGI5ODZhMTJkODAyODM2ZmFm MTE1YzhiNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvTWV0YWRhdGEuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL01ldGFkYXRhLmgKQEAgLTMzLDMyICszMywzNCBA QAogCiAjaWYgRU5BQkxFKEZJTEVfU1lTVEVNKQogCisjaW5jbHVkZSAiRmlsZU1ldGFkYXRhLmgi CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBNZXRhZGF0YSA6IHB1YmxpYyBSZWZDb3VudGVkPE1ldGFkYXRhPiB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFBhc3NSZWZQdHI8TWV0YWRhdGE+IGNyZWF0ZShkb3VibGUgbW9kaWZpY2F0aW9u VGltZSkKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZXRhZGF0YT4gY3JlYXRlKGNvbnN0IEZpbGVN ZXRhZGF0YSYgbWV0YWRhdGEpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1l dGFkYXRhKG1vZGlmaWNhdGlvblRpbWUpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBN ZXRhZGF0YShtZXRhZGF0YSkpOwogICAgIH0KIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1ldGFk YXRhPiBjcmVhdGUoTWV0YWRhdGEqIG1ldGFkYXRhKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBNZXRhZGF0YShtZXRhZGF0YS0+bV9tb2RpZmljYXRpb25UaW1lKSk7CisgICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWV0YWRhdGEobWV0YWRhdGEtPm1fbWV0YWRhdGEpKTsK ICAgICB9CiAKLSAgICAvLyBOZWVkcyB0byByZXR1cm4gZXBvY2ggdGltZSBpbiBtaWxsaXNlY29u ZHMgZm9yIERhdGUuCi0gICAgZG91YmxlIG1vZGlmaWNhdGlvblRpbWUoKSBjb25zdCB7IHJldHVy biBtX21vZGlmaWNhdGlvblRpbWUgKiAxMDAwLjA7IH0KKyAgICAvLyBOZWVkcyB0byByZXR1cm4g ZXBvY2ggdGltZSBpbiBtaWxsaXNlY29uZHMgZm9yIERhdGUgd2hpbGUgRmlsZU1ldGFkYXRhJ3Mg bW9kaWZpY2F0aW9uVGltZSBpcyBpbiBzZWNvbmRzLgorICAgIGRvdWJsZSBtb2RpZmljYXRpb25U aW1lKCkgY29uc3QgeyByZXR1cm4gbV9tZXRhZGF0YS5tb2RpZmljYXRpb25UaW1lICogMTAwMC4w OyB9CisgICAgdW5zaWduZWQgbG9uZyBsb25nIHNpemUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDx1bnNpZ25lZCBsb25nIGxvbmc+KG1fbWV0YWRhdGEubGVuZ3RoKTsgfQogCiBwcml2YXRl OgotICAgIE1ldGFkYXRhKGRvdWJsZSBtb2RpZmljYXRpb25UaW1lKQotICAgICAgICA6IG1fbW9k aWZpY2F0aW9uVGltZShtb2RpZmljYXRpb25UaW1lKQorICAgIE1ldGFkYXRhKGNvbnN0IEZpbGVN ZXRhZGF0YSYgbWV0YWRhdGEpCisgICAgICAgIDogbV9tZXRhZGF0YShtZXRhZGF0YSkKICAgICB7 CiAgICAgfQogCi0gICAgZG91YmxlIG1fbW9kaWZpY2F0aW9uVGltZTsKKyAgICBGaWxlTWV0YWRh dGEgbV9tZXRhZGF0YTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9maWxlYXBpL01ldGFkYXRhLmlkbCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvTWV0 YWRhdGEuaWRsCmluZGV4IGFkNDc3Zjc3MTdmNzk1OWZmZDQyMDY5N2RjNGY0ZmJhMjMwODMyMmQu LmNlYWYyMWI1YWUxZjFjMThmZWM3NTA3MWUyZDE5YmJiYWE4Y2RhOGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2ZpbGVhcGkvTWV0YWRhdGEuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvTWV0YWRhdGEuaWRsCkBAIC0zNCw1ICszNCw2IEBAIG1vZHVsZSBzdG9yYWdlIHsKICAg ICAgICAgSlNOb1N0YXRpY1RhYmxlcwogICAgIF0gTWV0YWRhdGEgewogICAgICAgICByZWFkb25s eSBhdHRyaWJ1dGUgRGF0ZSBtb2RpZmljYXRpb25UaW1lOworICAgICAgICByZWFkb25seSBhdHRy aWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIHNpemU7CiAgICAgfTsKIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhMzZhODNk YTQ1M2E4MzE0ZTI2MjVjMmQyMTcwY2NjZjIyOWI3ODQxLi5jNTkyYzE0YzVhNjJjZDZkNWY4Y2E3 NDhiZjk2ZDUwOWQxNTZlMmZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDItMjggIEtp bnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBzaXplIGZp ZWxkIHRvIE1ldGFkYXRhIGluIEZpbGVTeXN0ZW0gQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTgxMworCisgICAgICAgIENoYW5nZWQgZmFzdC9m aWxlc3lzdGVtL29wLWdldC1tZXRhZGF0YSB0ZXN0IHRvIGFsc28gdGVzdCBpZgorICAgICAgICBn ZXRNZXRhZGF0YSByZXR1cm5zIGNvcnJlY3QgZmlsZSBzaXplcy4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZmlsZXN5c3RlbS9vcC1nZXQt bWV0YWRhdGEtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvZmlsZXN5c3RlbS9yZXNvdXJj ZXMvb3AtZ2V0LW1ldGFkYXRhLmpzOgorICAgICAgICAqIGZhc3QvZmlsZXN5c3RlbS9yZXNvdXJj ZXMvb3AtdGVzdHMtaGVscGVyLmpzOgorICAgICAgICAoY3JlYXRlVGVzdEVudmlyb25tZW50Lkhl bHBlci50aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFjay5lbnRyeS5jcmVhdGVXcml0ZXIpOiBBZGRl ZC4KKyAgICAgICAgKGNyZWF0ZVRlc3RFbnZpcm9ubWVudC5IZWxwZXIudGhpcy5jcmVhdGVTdWNj ZXNzQ2FsbGJhY2spOgorICAgICAgICAoY3JlYXRlVGVzdEVudmlyb25tZW50LkhlbHBlci50aGlz LmNyZWF0ZU5leHRFbnRyeSk6CisgICAgICAgIChydW5PcGVyYXRpb25UZXN0Lk9wZXJhdGlvblRl c3RIZWxwZXIudGhpcy50ZXN0TWV0YWRhdGFTdWNjZXNzQ2FsbGJhY2spOgorCiAyMDEyLTAyLTI4 ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggcHJpbnRp bmcvem9vbWVkLWRvY3VtZW50Lmh0bWwgZm9yIFFUCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2ZpbGVzeXN0ZW0vb3AtZ2V0LW1ldGFkYXRhLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2Zhc3QvZmlsZXN5c3RlbS9vcC1nZXQtbWV0YWRhdGEtZXhwZWN0ZWQudHh0CmluZGV4IGI2ZjMw ZGI1ZjZkNTg1ODFmOGExN2ZjYjM3MmZkZDE4ZDY1ODBkYTguLjdlYzE3NWNkZjQwOTE2OTE3MTU0 MTQxYWQ2MTlkYzJjZDU2YjBjZmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXN5 c3RlbS9vcC1nZXQtbWV0YWRhdGEtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv ZmlsZXN5c3RlbS9vcC1nZXQtbWV0YWRhdGEtZXhwZWN0ZWQudHh0CkBAIC0yLDE1ICsyLDI1IEBA CiBQQVNTIFN1Y2NlZWRlZDogIi8iLmdldE1ldGFkYXRhKCkKIFBBU1MgU3VjY2VlZGVkOiAiLyIu Z2V0RGlyZWN0b3J5KCIvYSIpCiBQQVNTIFN1Y2NlZWRlZDogIi9hIi5nZXRNZXRhZGF0YSgpCi1Q QVNTIHRoaXMuZW52aXJvbm1lbnRbIi9hLm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLnJv dW5kZWRTdGFydERhdGUKK1BBU1MgdGhpcy5lbnZpcm9ubWVudFsiL2EucmV0dXJuZWQubW9kaWZp Y2F0aW9uVGltZSJdIGlzID49IHRoaXMucm91bmRlZFN0YXJ0RGF0ZQorUEFTUyBTdWNjZWVkZWQ6 ICIvZmlsZTEiLmdldE1ldGFkYXRhKCkKK1BBU1MgdGhpcy5lbnZpcm9ubWVudFsiL2ZpbGUxLnJl dHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLnJvdW5kZWRTdGFydERhdGUKK1BB U1MgU3VjY2VlZGVkOiAiL2ZpbGUyIi5nZXRNZXRhZGF0YSgpCitQQVNTIHRoaXMuZW52aXJvbm1l bnRbIi9maWxlMi5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0gdGhpcy5yb3VuZGVk U3RhcnREYXRlCitTaXplOiAxMAorUEFTUyB0aGlzLmVudmlyb25tZW50WyIvZmlsZTIuc2l6ZSJd IGlzIHRoaXMuZW52aXJvbm1lbnRbIi9maWxlMi5yZXR1cm5lZC5zaXplIl0KK1BBU1MgU3VjY2Vl ZGVkOiAiL2ZpbGUzIi5nZXRNZXRhZGF0YSgpCitQQVNTIHRoaXMuZW52aXJvbm1lbnRbIi9maWxl My5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0gdGhpcy5yb3VuZGVkU3RhcnREYXRl CitTaXplOiAxMDAKK1BBU1MgdGhpcy5lbnZpcm9ubWVudFsiL2ZpbGUzLnNpemUiXSBpcyB0aGlz LmVudmlyb25tZW50WyIvZmlsZTMucmV0dXJuZWQuc2l6ZSJdCiBQQVNTIFN1Y2NlZWRlZDogIi8i LmdldEZpbGUoIi9iIikKIFBBU1MgU3VjY2VlZGVkOiAiL2IiLmdldE1ldGFkYXRhKCkKLVBBU1Mg dGhpcy5lbnZpcm9ubWVudFsiL2IubW9kaWZpY2F0aW9uVGltZSJdIGlzID49IHRoaXMucm91bmRl ZFN0YXJ0RGF0ZQorUEFTUyB0aGlzLmVudmlyb25tZW50WyIvYi5yZXR1cm5lZC5tb2RpZmljYXRp b25UaW1lIl0gaXMgPj0gdGhpcy5yb3VuZGVkU3RhcnREYXRlCiBQQVNTIFN1Y2NlZWRlZDogIi90 bXAiLnJlbW92ZSgpCiBQQVNTIHRoaXMuZXhwZWN0ZWRFcnJvckNvZGUgKyAiIiBpcyAiMSIKLVBB U1MgdGhpcy5lbnZpcm9ubWVudFsiL2EubW9kaWZpY2F0aW9uVGltZSJdIGlzID49IHRoaXMuZW52 aXJvbm1lbnRbIi8ubW9kaWZpY2F0aW9uVGltZSJdCi1QQVNTIHRoaXMuZW52aXJvbm1lbnRbIi9i Lm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLmVudmlyb25tZW50WyIvLm1vZGlmaWNhdGlv blRpbWUiXQotUEFTUyB0aGlzLmVudmlyb25tZW50WyIvYi5tb2RpZmljYXRpb25UaW1lIl0gaXMg Pj0gdGhpcy5lbnZpcm9ubWVudFsiL2EubW9kaWZpY2F0aW9uVGltZSJdCitQQVNTIHRoaXMuZW52 aXJvbm1lbnRbIi9hLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLmVudmly b25tZW50WyIvLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXQorUEFTUyB0aGlzLmVudmlyb25t ZW50WyIvYi5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0gdGhpcy5lbnZpcm9ubWVu dFsiLy5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0KK1BBU1MgdGhpcy5lbnZpcm9ubWVudFsi L2IucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJdIGlzID49IHRoaXMuZW52aXJvbm1lbnRbIi9h LnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXQogRmluaXNoZWQgcnVubmluZyB0ZXN0cy4KIFBB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC1nZXQtbWV0YWRhdGEuanMgYi9MYXlvdXRUZXN0 cy9mYXN0L2ZpbGVzeXN0ZW0vcmVzb3VyY2VzL29wLWdldC1tZXRhZGF0YS5qcwppbmRleCBmNGFk ZWEwM2RiMjA2NzY3YjBjMzc3ZTM4NmMwM2EzMzBhOGQ5NTFhLi4zYzI5MWYzZTgwMTcyZjYxOWZh NzFhNWI1NGNjMzY3NWIxZTE4ZmM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVz eXN0ZW0vcmVzb3VyY2VzL29wLWdldC1tZXRhZGF0YS5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2ZpbGVzeXN0ZW0vcmVzb3VyY2VzL29wLWdldC1tZXRhZGF0YS5qcwpAQCAtMywxOCArMywyNCBA QCB2YXIgdGVzdENhc2VzID0gWwogICAgICAgICBuYW1lOiAnR2V0TWV0YWRhdGEnLAogICAgICAg ICBwcmVjb25kaXRpb246IFsKICAgICAgICAgICAgIHtmdWxsUGF0aDonL3RtcCd9LAorICAgICAg ICAgICAge2Z1bGxQYXRoOicvZmlsZTEnLCBzaXplOjB9LAorICAgICAgICAgICAge2Z1bGxQYXRo OicvZmlsZTInLCBzaXplOjEwfSwKKyAgICAgICAgICAgIHtmdWxsUGF0aDonL2ZpbGUzJywgc2l6 ZToxMDB9LAogICAgICAgICBdLAogICAgICAgICB0ZXN0czogWwogICAgICAgICAgICAgZnVuY3Rp b24oaGVscGVyKSB7IGhlbHBlci5nZXRNZXRhZGF0YSgnLycpOyB9LAogICAgICAgICAgICAgZnVu Y3Rpb24oaGVscGVyKSB7IGhlbHBlci5nZXREaXJlY3RvcnkoJy8nLCAnL2EnLCB7Y3JlYXRlOnRy dWV9KTsgfSwKICAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIuZ2V0TWV0YWRh dGEoJy9hJyk7IH0sCisgICAgICAgICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLmdldE1l dGFkYXRhKCcvZmlsZTEnKTsgfSwKKyAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxw ZXIuZ2V0TWV0YWRhdGEoJy9maWxlMicpOyB9LAorICAgICAgICAgICAgZnVuY3Rpb24oaGVscGVy KSB7IGhlbHBlci5nZXRNZXRhZGF0YSgnL2ZpbGUzJyk7IH0sCiAgICAgICAgICAgICBmdW5jdGlv bihoZWxwZXIpIHsgaGVscGVyLmdldEZpbGUoJy8nLCAnL2InLCB7Y3JlYXRlOnRydWV9KTsgfSwK ICAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIuZ2V0TWV0YWRhdGEoJy9iJyk7 IH0sCiAgICAgICAgICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLnJlbW92ZSgnL3RtcCcp OyB9LAogICAgICAgICAgICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBlci5nZXRNZXRhZGF0YSgn L3RtcCcsIEZpbGVFcnJvci5OT1RfRk9VTkRfRVJSKTsgfSwKLSAgICAgICAgICAgIGZ1bmN0aW9u KGhlbHBlcikgeyBoZWxwZXIuc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoJy9hLm1vZGlmaWNh dGlvblRpbWUnLCAnLy5tb2RpZmljYXRpb25UaW1lJyk7IH0sCi0gICAgICAgICAgICBmdW5jdGlv bihoZWxwZXIpIHsgaGVscGVyLnNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCcvYi5tb2RpZmlj YXRpb25UaW1lJywgJy8ubW9kaWZpY2F0aW9uVGltZScpOyB9LAotICAgICAgICAgICAgZnVuY3Rp b24oaGVscGVyKSB7IGhlbHBlci5zaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgnL2IubW9kaWZp Y2F0aW9uVGltZScsICcvYS5tb2RpZmljYXRpb25UaW1lJyk7IH0KKyAgICAgICAgICAgIGZ1bmN0 aW9uKGhlbHBlcikgeyBoZWxwZXIuc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoJy9hLnJldHVy bmVkLm1vZGlmaWNhdGlvblRpbWUnLCAnLy5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lJyk7IH0s CisgICAgICAgICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLnNob3VsZEJlR3JlYXRlclRo YW5PckVxdWFsKCcvYi5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lJywgJy8ucmV0dXJuZWQubW9k aWZpY2F0aW9uVGltZScpOyB9LAorICAgICAgICAgICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBl ci5zaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgnL2IucmV0dXJuZWQubW9kaWZpY2F0aW9uVGlt ZScsICcvYS5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lJyk7IH0KICAgICAgICAgXSwKICAgICAg ICAgcG9zdGNvbmRpdGlvbjogWyBdLAogICAgIH0sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2ZpbGVzeXN0ZW0vcmVzb3VyY2VzL29wLXRlc3RzLWhlbHBlci5qcyBiL0xheW91dFRlc3Rz L2Zhc3QvZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtdGVzdHMtaGVscGVyLmpzCmluZGV4IDA3NDNk MTFlNThiZWU4MTg1YzY0OTgwYWVhZjZjNDIxNTQ5NjU4ODQuLjQyZTllZjVhZWEzNzY4Y2ExMTE4 YWI4ZWJhNDEyMGZjM2RkOTA1YjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXN5 c3RlbS9yZXNvdXJjZXMvb3AtdGVzdHMtaGVscGVyLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv ZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtdGVzdHMtaGVscGVyLmpzCkBAIC0zMSw5ICszMSwyMiBA QCBmdW5jdGlvbiBjcmVhdGVUZXN0RW52aXJvbm1lbnQoZmlsZVN5c3RlbSwgZW50cmllcywgc3Vj Y2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYQogICAgICAgICB0aGlzLmVycm9yQ2FsbGJhY2sgPSBl cnJvckNhbGxiYWNrOwogICAgICAgICB0aGlzLmVudmlyb25tZW50ID0ge307CiAKLSAgICAgICAg dGhpcy5jcmVhdGVTdWNjZXNzQ2FsbGJhY2sgPSBmdW5jdGlvbihlbnRyeSkKKyAgICAgICAgdGhp cy5jcmVhdGVTdWNjZXNzQ2FsbGJhY2sgPSBmdW5jdGlvbihlbnRyeSwgc2l6ZSkKICAgICAgICAg eworICAgICAgICAgICAgaWYgKGVudHJ5LmlzRmlsZSAmJiBzaXplID4gMCkgeworICAgICAgICAg ICAgICAgIGVudHJ5LmNyZWF0ZVdyaXRlcihiaW5kQ2FsbGJhY2sodGhpcywgZnVuY3Rpb24od3Jp dGVyKSB7CisgICAgICAgICAgICAgICAgICAgIHdyaXRlci50cnVuY2F0ZShzaXplKTsKKyAgICAg ICAgICAgICAgICAgICAgd3JpdGVyLm9uZXJyb3IgPSBiaW5kQ2FsbGJhY2sodGhpcywgdGhpcy5j cmVhdGVFcnJvckNhbGxiYWNrKTsKKyAgICAgICAgICAgICAgICAgICAgd3JpdGVyLm9ud3JpdGVl bmQgPSBiaW5kQ2FsbGJhY2sodGhpcywgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICB0aGlzLmVudmlyb25tZW50W2VudHJ5LmZ1bGxQYXRoXSA9IGVudHJ5OworICAgICAgICAg ICAgICAgICAgICAgICAgdGhpcy5lbnZpcm9ubWVudFtlbnRyeS5mdWxsUGF0aCArICcuc2l6ZSdd ID0gc2l6ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuY3JlYXRlTmV4dEVudHJ5KCk7 CisgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0pLCBiaW5kQ2FsbGJh Y2sodGhpcywgdGhpcy5jcmVhdGVFcnJvckNhbGxiYWNrKSk7CisgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgfQogICAgICAgICAgICAgdGhpcy5lbnZpcm9ubWVudFtlbnRyeS5m dWxsUGF0aF0gPSBlbnRyeTsKKyAgICAgICAgICAgIHRoaXMuZW52aXJvbm1lbnRbZW50cnkuZnVs bFBhdGggKyAnLnNpemUnXSA9IDA7CiAgICAgICAgICAgICB0aGlzLmNyZWF0ZU5leHRFbnRyeSgp OwogICAgICAgICB9CiAKQEAgLTUzLDcgKzY2LDcgQEAgZnVuY3Rpb24gY3JlYXRlVGVzdEVudmly b25tZW50KGZpbGVTeXN0ZW0sIGVudHJpZXMsIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmEK ICAgICAgICAgICAgIGlmIChlbnRyeS5pc0RpcmVjdG9yeSkKICAgICAgICAgICAgICAgICBmaWxl U3lzdGVtLnJvb3QuZ2V0RGlyZWN0b3J5KGVudHJ5LmZ1bGxQYXRoLCB7Y3JlYXRlOnRydWV9LCBi aW5kQ2FsbGJhY2sodGhpcywgdGhpcy5jcmVhdGVTdWNjZXNzQ2FsbGJhY2spLCBiaW5kQ2FsbGJh Y2sodGhpcywgdGhpcy5jcmVhdGVFcnJvckNhbGxiYWNrKSk7CiAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgZmlsZVN5c3RlbS5yb290LmdldEZpbGUoZW50cnkuZnVsbFBhdGgsIHtj cmVhdGU6dHJ1ZX0sIGJpbmRDYWxsYmFjayh0aGlzLCB0aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFj ayksIGJpbmRDYWxsYmFjayh0aGlzLCB0aGlzLmNyZWF0ZUVycm9yQ2FsbGJhY2spKTsKKyAgICAg ICAgICAgICAgICBmaWxlU3lzdGVtLnJvb3QuZ2V0RmlsZShlbnRyeS5mdWxsUGF0aCwge2NyZWF0 ZTp0cnVlfSwgYmluZENhbGxiYWNrKHRoaXMsIHRoaXMuY3JlYXRlU3VjY2Vzc0NhbGxiYWNrLCBl bnRyeS5zaXplKSwgYmluZENhbGxiYWNrKHRoaXMsIHRoaXMuY3JlYXRlRXJyb3JDYWxsYmFjaykp OwogICAgICAgICB9OwogICAgIH07CiAKQEAgLTIxMSwxMiArMjI0LDE4IEBAIGZ1bmN0aW9uIHJ1 bk9wZXJhdGlvblRlc3QoZmlsZVN5c3RlbSwgdGVzdENhc2UsIHN1Y2Nlc3NDYWxsYmFjaywgZXJy b3JDYWxsYmFjaykKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCF0aGlzLmV4cGVjdGVkRXJy b3JDb2RlKSB7CiAgICAgICAgICAgICAgICAgdGVzdFBhc3NlZCgnU3VjY2VlZGVkOiAnICsgdGhp cy5zdGFnZSk7Ci0gICAgICAgICAgICAgICAgdmFyIHN5bWJvbCA9IGVudHJ5ICsgJy5tb2RpZmlj YXRpb25UaW1lJzsKKyAgICAgICAgICAgICAgICB2YXIgc3ltYm9sID0gZW50cnkgKyAnLnJldHVy bmVkLm1vZGlmaWNhdGlvblRpbWUnOwogICAgICAgICAgICAgICAgIHRoaXMuZW52aXJvbm1lbnRb c3ltYm9sXSA9IG1ldGFkYXRhLm1vZGlmaWNhdGlvblRpbWU7Ci0KICAgICAgICAgICAgICAgICB2 YXIgZW50cnlNZXRhZGF0YVN0cmluZyA9IHRoaXMuZ2V0U3ltYm9sU3RyaW5nKHN5bWJvbCk7Ci0g ICAgICAgICAgICAgICAgaWYgKGVudHJ5ICE9ICcvJykKKyAgICAgICAgICAgICAgICBpZiAoZW50 cnkgIT0gJy8nKSB7CiAgICAgICAgICAgICAgICAgICAgIHNob3VsZEJlR3JlYXRlclRoYW5PckVx dWFsLmFwcGx5KHRoaXMsIFtlbnRyeU1ldGFkYXRhU3RyaW5nLCAndGhpcy5yb3VuZGVkU3RhcnRE YXRlJ10pOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAobWV0YWRhdGEu c2l6ZSkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLmVudmlyb25tZW50W2VudHJ5ICsgJy5y ZXR1cm5lZC5zaXplJ10gPSBtZXRhZGF0YS5zaXplOworICAgICAgICAgICAgICAgICAgICB2YXIg ZW50cnlTaXplU3RyaW5nID0gdGhpcy5nZXRTeW1ib2xTdHJpbmcoZW50cnkgKyAnLnJldHVybmVk LnNpemUnKTsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGV4cGVjdGVkU2l6ZVN0cmluZyA9IHRo aXMuZ2V0U3ltYm9sU3RyaW5nKGVudHJ5ICsgJy5zaXplJyk7CisgICAgICAgICAgICAgICAgICAg IHNob3VsZEJlLmFwcGx5KHRoaXMsIFtleHBlY3RlZFNpemVTdHJpbmcsIGVudHJ5U2l6ZVN0cmlu Z10pOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB0aGlzLnJ1bk5leHRUZXN0 KCk7CiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCdVbmV4 cGVjdGVkbHkgc3VjY2VlZGVkIHdoaWxlICcgKyB0aGlzLnN0YWdlKTsK 129367 2012-02-28 18:05:34 -0800 2012-02-29 10:53:29 -0800 Patch bug-79813-20120229110533.patch text/plain 12593 kinuko U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg3NTIyNWU1ZDczMzYx YWZkNGU0M2FjNWEwMmQ0ODA1MTYxZmE1NS4uNDBmNTk1N2VlZGUxZDMxNDQzYTBjODExMjVkYzkw YTA0NGRjYjBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAyLTI4ICBLaW51 a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgc2l6ZSBmaWVs ZCB0byBNZXRhZGF0YSBpbiBGaWxlU3lzdGVtIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2ZpbGVzeXN0ZW0vb3AtZ2V0LW1ldGFk YXRhLmh0bWwKKworICAgICAgICAqIGZpbGVhcGkvRmlsZVN5c3RlbUNhbGxiYWNrcy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZXRhZGF0YUNhbGxiYWNrczo6ZGlkUmVhZE1ldGFkYXRhKToKKyAg ICAgICAgKiBmaWxlYXBpL01ldGFkYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpNZXRhZGF0YTo6 Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1ldGFkYXRhOjptb2RpZmljYXRpb25UaW1lKToK KyAgICAgICAgKFdlYkNvcmU6Ok1ldGFkYXRhOjpzaXplKTogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpNZXRhZGF0YTo6TWV0YWRhdGEpOgorICAgICAgICAqIGZpbGVhcGkvTWV0YWRhdGEuaWRs OgorCiAyMDEyLTAyLTI4ICBBZGFtIEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIGZpeCBjci13aW4gYnVpbGQgYWZ0ZXIgcjEwOTExOS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVN5c3RlbUNhbGxiYWNrcy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVTeXN0ZW1DYWxsYmFja3MuY3BwCmluZGV4IDA2ZjNiOTM4 MzRmYmFiNDg0ZmMzNzE0YjE5NDFhODExMWM3MzQzY2EuLjc1NWYwYzZkYWZiMjQzYWVmNmMzYTNm ZTNjN2U2ZmQ1MGQ4NTYxYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmls ZVN5c3RlbUNhbGxiYWNrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlU3lz dGVtQ2FsbGJhY2tzLmNwcApAQCAtMjY4LDcgKzI2OCw3IEBAIE1ldGFkYXRhQ2FsbGJhY2tzOjpN ZXRhZGF0YUNhbGxiYWNrcyhQYXNzUmVmUHRyPE1ldGFkYXRhQ2FsbGJhY2s+IHN1Y2Nlc3NDYWxs YmFjCiB2b2lkIE1ldGFkYXRhQ2FsbGJhY2tzOjpkaWRSZWFkTWV0YWRhdGEoY29uc3QgRmlsZU1l dGFkYXRhJiBtZXRhZGF0YSkKIHsKICAgICBpZiAobV9zdWNjZXNzQ2FsbGJhY2spCi0gICAgICAg IG1fc3VjY2Vzc0NhbGxiYWNrLT5oYW5kbGVFdmVudChNZXRhZGF0YTo6Y3JlYXRlKG1ldGFkYXRh Lm1vZGlmaWNhdGlvblRpbWUpLmdldCgpKTsKKyAgICAgICAgbV9zdWNjZXNzQ2FsbGJhY2stPmhh bmRsZUV2ZW50KE1ldGFkYXRhOjpjcmVhdGUobWV0YWRhdGEpLmdldCgpKTsKICAgICBtX3N1Y2Nl c3NDYWxsYmFjay5jbGVhcigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9maWxl YXBpL01ldGFkYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL01ldGFkYXRhLmgKaW5kZXgg YjcwODA2YjA5ZWQ0MjEyNjQwZGJjNjAwZjgwY2FjYjc1YTJmMzgwYS4uN2QxMjUzYTEyNmZlNmQy MDNkZWNiYjQwZmQyYTdlODMyNGZkNjAxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmls ZWFwaS9NZXRhZGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvTWV0YWRhdGEuaApA QCAtMzMsMzIgKzMzLDM0IEBACiAKICNpZiBFTkFCTEUoRklMRV9TWVNURU0pCiAKKyNpbmNsdWRl ICJGaWxlTWV0YWRhdGEuaCIKICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIE1ldGFkYXRhIDogcHVibGljIFJlZkNvdW50ZWQ8TWV0YWRh dGE+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZXRhZGF0YT4gY3JlYXRlKGRv dWJsZSBtb2RpZmljYXRpb25UaW1lKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1ldGFkYXRhPiBj cmVhdGUoY29uc3QgRmlsZU1ldGFkYXRhJiBwbGF0Zm9ybU1ldGFkYXRhKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZXRhZGF0YShtb2RpZmljYXRpb25UaW1lKSk7CisgICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWV0YWRhdGEocGxhdGZvcm1NZXRhZGF0YSkpOwogICAg IH0KIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1ldGFkYXRhPiBjcmVhdGUoTWV0YWRhdGEqIG1l dGFkYXRhKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZXRhZGF0YShtZXRh ZGF0YS0+bV9tb2RpZmljYXRpb25UaW1lKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg TWV0YWRhdGEobWV0YWRhdGEtPm1fcGxhdGZvcm1NZXRhZGF0YSkpOwogICAgIH0KIAotICAgIC8v IE5lZWRzIHRvIHJldHVybiBlcG9jaCB0aW1lIGluIG1pbGxpc2Vjb25kcyBmb3IgRGF0ZS4KLSAg ICBkb3VibGUgbW9kaWZpY2F0aW9uVGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fbW9kaWZpY2F0aW9u VGltZSAqIDEwMDAuMDsgfQorICAgIC8vIE5lZWRzIHRvIHJldHVybiBlcG9jaCB0aW1lIGluIG1p bGxpc2Vjb25kcyBmb3IgRGF0ZSB3aGlsZSBGaWxlTWV0YWRhdGEncyBtb2RpZmljYXRpb25UaW1l IGlzIGluIHNlY29uZHMuCisgICAgZG91YmxlIG1vZGlmaWNhdGlvblRpbWUoKSBjb25zdCB7IHJl dHVybiBtX3BsYXRmb3JtTWV0YWRhdGEubW9kaWZpY2F0aW9uVGltZSAqIDEwMDAuMDsgfQorICAg IHVuc2lnbmVkIGxvbmcgbG9uZyBzaXplKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8dW5z aWduZWQgbG9uZyBsb25nPihtX3BsYXRmb3JtTWV0YWRhdGEubGVuZ3RoKTsgfQogCiBwcml2YXRl OgotICAgIE1ldGFkYXRhKGRvdWJsZSBtb2RpZmljYXRpb25UaW1lKQotICAgICAgICA6IG1fbW9k aWZpY2F0aW9uVGltZShtb2RpZmljYXRpb25UaW1lKQorICAgIE1ldGFkYXRhKGNvbnN0IEZpbGVN ZXRhZGF0YSYgcGxhdGZvcm1NZXRhZGF0YSkKKyAgICAgICAgOiBtX3BsYXRmb3JtTWV0YWRhdGEo cGxhdGZvcm1NZXRhZGF0YSkKICAgICB7CiAgICAgfQogCi0gICAgZG91YmxlIG1fbW9kaWZpY2F0 aW9uVGltZTsKKyAgICBGaWxlTWV0YWRhdGEgbV9wbGF0Zm9ybU1ldGFkYXRhOwogfTsKIAogfSAv LyBuYW1lc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvTWV0YWRhdGEu aWRsIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9NZXRhZGF0YS5pZGwKaW5kZXggYWQ0NzdmNzcx N2Y3OTU5ZmZkNDIwNjk3ZGM0ZjRmYmEyMzA4MzIyZC4uY2VhZjIxYjVhZTFmMWMxOGZlYzc1MDcx ZTJkMTliYmJhYThjZGE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9NZXRh ZGF0YS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9NZXRhZGF0YS5pZGwKQEAgLTM0 LDUgKzM0LDYgQEAgbW9kdWxlIHN0b3JhZ2UgewogICAgICAgICBKU05vU3RhdGljVGFibGVzCiAg ICAgXSBNZXRhZGF0YSB7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBEYXRlIG1vZGlmaWNh dGlvblRpbWU7CisgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxvbmcg c2l6ZTsKICAgICB9OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGEzNmE4M2RhNDUzYTgzMTRlMjYyNWMyZDIxNzBjY2Nm MjI5Yjc4NDEuLmM1OTJjMTRjNWE2MmNkNmQ1ZjhjYTc0OGJmOTZkNTA5ZDE1NmUyZmEgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMSBAQAorMjAxMi0wMi0yOCAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgQWRkIHNpemUgZmllbGQgdG8gTWV0YWRhdGEgaW4gRmlsZVN5 c3RlbSBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc5ODEzCisKKyAgICAgICAgQ2hhbmdlZCBmYXN0L2ZpbGVzeXN0ZW0vb3AtZ2V0LW1ldGFkYXRh IHRlc3QgdG8gYWxzbyB0ZXN0IGlmCisgICAgICAgIGdldE1ldGFkYXRhIHJldHVybnMgY29ycmVj dCBmaWxlIHNpemVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogZmFzdC9maWxlc3lzdGVtL29wLWdldC1tZXRhZGF0YS1leHBlY3RlZC50eHQ6Cisg ICAgICAgICogZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC1nZXQtbWV0YWRhdGEuanM6Cisg ICAgICAgICogZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC10ZXN0cy1oZWxwZXIuanM6Cisg ICAgICAgIChjcmVhdGVUZXN0RW52aXJvbm1lbnQuSGVscGVyLnRoaXMuY3JlYXRlU3VjY2Vzc0Nh bGxiYWNrLmVudHJ5LmNyZWF0ZVdyaXRlcik6IEFkZGVkLgorICAgICAgICAoY3JlYXRlVGVzdEVu dmlyb25tZW50LkhlbHBlci50aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFjayk6CisgICAgICAgIChj cmVhdGVUZXN0RW52aXJvbm1lbnQuSGVscGVyLnRoaXMuY3JlYXRlTmV4dEVudHJ5KToKKyAgICAg ICAgKHJ1bk9wZXJhdGlvblRlc3QuT3BlcmF0aW9uVGVzdEhlbHBlci50aGlzLnRlc3RNZXRhZGF0 YVN1Y2Nlc3NDYWxsYmFjayk6CisKIDIwMTItMDItMjggIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBwcmludGluZy96b29tZWQtZG9jdW1lbnQuaHRtbCBm b3IgUVQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXN5c3RlbS9vcC1nZXQtbWV0 YWRhdGEtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlc3lzdGVtL29wLWdldC1t ZXRhZGF0YS1leHBlY3RlZC50eHQKaW5kZXggYjZmMzBkYjVmNmQ1ODU4MWY4YTE3ZmNiMzcyZmRk MThkNjU4MGRhOC4uM2M3NjRmOThkZDE1MThkNDYyM2FhMTRiNzU3ZDUwOWZiYTk2MjUxMCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlc3lzdGVtL29wLWdldC1tZXRhZGF0YS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlc3lzdGVtL29wLWdldC1tZXRhZGF0 YS1leHBlY3RlZC50eHQKQEAgLTIsMTUgKzIsMjMgQEAKIFBBU1MgU3VjY2VlZGVkOiAiLyIuZ2V0 TWV0YWRhdGEoKQogUEFTUyBTdWNjZWVkZWQ6ICIvIi5nZXREaXJlY3RvcnkoIi9hIikKIFBBU1Mg U3VjY2VlZGVkOiAiL2EiLmdldE1ldGFkYXRhKCkKLVBBU1MgdGhpcy5lbnZpcm9ubWVudFsiL2Eu bW9kaWZpY2F0aW9uVGltZSJdIGlzID49IHRoaXMucm91bmRlZFN0YXJ0RGF0ZQorUEFTUyB0aGlz LmVudmlyb25tZW50WyIvYS5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0gdGhpcy5y b3VuZGVkU3RhcnREYXRlCitQQVNTIFN1Y2NlZWRlZDogIi9maWxlMSIuZ2V0TWV0YWRhdGEoKQor UEFTUyB0aGlzLmVudmlyb25tZW50WyIvZmlsZTEucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJd IGlzID49IHRoaXMucm91bmRlZFN0YXJ0RGF0ZQorUEFTUyBTdWNjZWVkZWQ6ICIvZmlsZTIiLmdl dE1ldGFkYXRhKCkKK1BBU1MgdGhpcy5lbnZpcm9ubWVudFsiL2ZpbGUyLnJldHVybmVkLm1vZGlm aWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLnJvdW5kZWRTdGFydERhdGUKK1BBU1MgdGhpcy5lbnZp cm9ubWVudFsiL2ZpbGUyLnNpemUiXSBpcyB0aGlzLmVudmlyb25tZW50WyIvZmlsZTIucmV0dXJu ZWQuc2l6ZSJdCitQQVNTIFN1Y2NlZWRlZDogIi9maWxlMyIuZ2V0TWV0YWRhdGEoKQorUEFTUyB0 aGlzLmVudmlyb25tZW50WyIvZmlsZTMucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJdIGlzID49 IHRoaXMucm91bmRlZFN0YXJ0RGF0ZQorUEFTUyB0aGlzLmVudmlyb25tZW50WyIvZmlsZTMuc2l6 ZSJdIGlzIHRoaXMuZW52aXJvbm1lbnRbIi9maWxlMy5yZXR1cm5lZC5zaXplIl0KIFBBU1MgU3Vj Y2VlZGVkOiAiLyIuZ2V0RmlsZSgiL2IiKQogUEFTUyBTdWNjZWVkZWQ6ICIvYiIuZ2V0TWV0YWRh dGEoKQotUEFTUyB0aGlzLmVudmlyb25tZW50WyIvYi5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0g dGhpcy5yb3VuZGVkU3RhcnREYXRlCitQQVNTIHRoaXMuZW52aXJvbm1lbnRbIi9iLnJldHVybmVk Lm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlzLnJvdW5kZWRTdGFydERhdGUKIFBBU1MgU3Vj Y2VlZGVkOiAiL3RtcCIucmVtb3ZlKCkKIFBBU1MgdGhpcy5leHBlY3RlZEVycm9yQ29kZSArICIi IGlzICIxIgotUEFTUyB0aGlzLmVudmlyb25tZW50WyIvYS5tb2RpZmljYXRpb25UaW1lIl0gaXMg Pj0gdGhpcy5lbnZpcm9ubWVudFsiLy5tb2RpZmljYXRpb25UaW1lIl0KLVBBU1MgdGhpcy5lbnZp cm9ubWVudFsiL2IubW9kaWZpY2F0aW9uVGltZSJdIGlzID49IHRoaXMuZW52aXJvbm1lbnRbIi8u bW9kaWZpY2F0aW9uVGltZSJdCi1QQVNTIHRoaXMuZW52aXJvbm1lbnRbIi9iLm1vZGlmaWNhdGlv blRpbWUiXSBpcyA+PSB0aGlzLmVudmlyb25tZW50WyIvYS5tb2RpZmljYXRpb25UaW1lIl0KK1BB U1MgdGhpcy5lbnZpcm9ubWVudFsiL2EucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJdIGlzID49 IHRoaXMuZW52aXJvbm1lbnRbIi8ucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJdCitQQVNTIHRo aXMuZW52aXJvbm1lbnRbIi9iLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXSBpcyA+PSB0aGlz LmVudmlyb25tZW50WyIvLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUiXQorUEFTUyB0aGlzLmVu dmlyb25tZW50WyIvYi5yZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lIl0gaXMgPj0gdGhpcy5lbnZp cm9ubWVudFsiL2EucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSJdCiBGaW5pc2hlZCBydW5uaW5n IHRlc3RzLgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2ZpbGVzeXN0ZW0vcmVzb3VyY2VzL29wLWdldC1tZXRhZGF0YS5qcyBi L0xheW91dFRlc3RzL2Zhc3QvZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtZ2V0LW1ldGFkYXRhLmpz CmluZGV4IGY0YWRlYTAzZGIyMDY3NjdiMGMzNzdlMzg2YzAzYTMzMGE4ZDk1MWEuLjNjMjkxZjNl ODAxNzJmNjE5ZmE3MWE1YjU0Y2MzNjc1YjFlMThmYzYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2Zhc3QvZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtZ2V0LW1ldGFkYXRhLmpzCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtZ2V0LW1ldGFkYXRhLmpzCkBAIC0z LDE4ICszLDI0IEBAIHZhciB0ZXN0Q2FzZXMgPSBbCiAgICAgICAgIG5hbWU6ICdHZXRNZXRhZGF0 YScsCiAgICAgICAgIHByZWNvbmRpdGlvbjogWwogICAgICAgICAgICAge2Z1bGxQYXRoOicvdG1w J30sCisgICAgICAgICAgICB7ZnVsbFBhdGg6Jy9maWxlMScsIHNpemU6MH0sCisgICAgICAgICAg ICB7ZnVsbFBhdGg6Jy9maWxlMicsIHNpemU6MTB9LAorICAgICAgICAgICAge2Z1bGxQYXRoOicv ZmlsZTMnLCBzaXplOjEwMH0sCiAgICAgICAgIF0sCiAgICAgICAgIHRlc3RzOiBbCiAgICAgICAg ICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLmdldE1ldGFkYXRhKCcvJyk7IH0sCiAgICAg ICAgICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLmdldERpcmVjdG9yeSgnLycsICcvYScs IHtjcmVhdGU6dHJ1ZX0pOyB9LAogICAgICAgICAgICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBl ci5nZXRNZXRhZGF0YSgnL2EnKTsgfSwKKyAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBo ZWxwZXIuZ2V0TWV0YWRhdGEoJy9maWxlMScpOyB9LAorICAgICAgICAgICAgZnVuY3Rpb24oaGVs cGVyKSB7IGhlbHBlci5nZXRNZXRhZGF0YSgnL2ZpbGUyJyk7IH0sCisgICAgICAgICAgICBmdW5j dGlvbihoZWxwZXIpIHsgaGVscGVyLmdldE1ldGFkYXRhKCcvZmlsZTMnKTsgfSwKICAgICAgICAg ICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIuZ2V0RmlsZSgnLycsICcvYicsIHtjcmVhdGU6 dHJ1ZX0pOyB9LAogICAgICAgICAgICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBlci5nZXRNZXRh ZGF0YSgnL2InKTsgfSwKICAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIucmVt b3ZlKCcvdG1wJyk7IH0sCiAgICAgICAgICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLmdl dE1ldGFkYXRhKCcvdG1wJywgRmlsZUVycm9yLk5PVF9GT1VORF9FUlIpOyB9LAotICAgICAgICAg ICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBlci5zaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgn L2EubW9kaWZpY2F0aW9uVGltZScsICcvLm1vZGlmaWNhdGlvblRpbWUnKTsgfSwKLSAgICAgICAg ICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIuc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwo Jy9iLm1vZGlmaWNhdGlvblRpbWUnLCAnLy5tb2RpZmljYXRpb25UaW1lJyk7IH0sCi0gICAgICAg ICAgICBmdW5jdGlvbihoZWxwZXIpIHsgaGVscGVyLnNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFs KCcvYi5tb2RpZmljYXRpb25UaW1lJywgJy9hLm1vZGlmaWNhdGlvblRpbWUnKTsgfQorICAgICAg ICAgICAgZnVuY3Rpb24oaGVscGVyKSB7IGhlbHBlci5zaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVh bCgnL2EucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZScsICcvLnJldHVybmVkLm1vZGlmaWNhdGlv blRpbWUnKTsgfSwKKyAgICAgICAgICAgIGZ1bmN0aW9uKGhlbHBlcikgeyBoZWxwZXIuc2hvdWxk QmVHcmVhdGVyVGhhbk9yRXF1YWwoJy9iLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUnLCAnLy5y ZXR1cm5lZC5tb2RpZmljYXRpb25UaW1lJyk7IH0sCisgICAgICAgICAgICBmdW5jdGlvbihoZWxw ZXIpIHsgaGVscGVyLnNob3VsZEJlR3JlYXRlclRoYW5PckVxdWFsKCcvYi5yZXR1cm5lZC5tb2Rp ZmljYXRpb25UaW1lJywgJy9hLnJldHVybmVkLm1vZGlmaWNhdGlvblRpbWUnKTsgfQogICAgICAg ICBdLAogICAgICAgICBwb3N0Y29uZGl0aW9uOiBbIF0sCiAgICAgfSwKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvZmlsZXN5c3RlbS9yZXNvdXJjZXMvb3AtdGVzdHMtaGVscGVyLmpzIGIv TGF5b3V0VGVzdHMvZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC10ZXN0cy1oZWxwZXIuanMK aW5kZXggMDc0M2QxMWU1OGJlZTgxODVjNjQ5ODBhZWFmNmM0MjE1NDk2NTg4NC4uNDJlOWVmNWFl YTM3NjhjYTExMThhYjhlYmE0MTIwZmMzZGQ5MDViNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC10ZXN0cy1oZWxwZXIuanMKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9maWxlc3lzdGVtL3Jlc291cmNlcy9vcC10ZXN0cy1oZWxwZXIuanMKQEAgLTMx LDkgKzMxLDIyIEBAIGZ1bmN0aW9uIGNyZWF0ZVRlc3RFbnZpcm9ubWVudChmaWxlU3lzdGVtLCBl bnRyaWVzLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhCiAgICAgICAgIHRoaXMuZXJyb3JD YWxsYmFjayA9IGVycm9yQ2FsbGJhY2s7CiAgICAgICAgIHRoaXMuZW52aXJvbm1lbnQgPSB7fTsK IAotICAgICAgICB0aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFjayA9IGZ1bmN0aW9uKGVudHJ5KQor ICAgICAgICB0aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFjayA9IGZ1bmN0aW9uKGVudHJ5LCBzaXpl KQogICAgICAgICB7CisgICAgICAgICAgICBpZiAoZW50cnkuaXNGaWxlICYmIHNpemUgPiAwKSB7 CisgICAgICAgICAgICAgICAgZW50cnkuY3JlYXRlV3JpdGVyKGJpbmRDYWxsYmFjayh0aGlzLCBm dW5jdGlvbih3cml0ZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgd3JpdGVyLnRydW5jYXRlKHNp emUpOworICAgICAgICAgICAgICAgICAgICB3cml0ZXIub25lcnJvciA9IGJpbmRDYWxsYmFjayh0 aGlzLCB0aGlzLmNyZWF0ZUVycm9yQ2FsbGJhY2spOworICAgICAgICAgICAgICAgICAgICB3cml0 ZXIub253cml0ZWVuZCA9IGJpbmRDYWxsYmFjayh0aGlzLCBmdW5jdGlvbigpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIHRoaXMuZW52aXJvbm1lbnRbZW50cnkuZnVsbFBhdGhdID0gZW50cnk7 CisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLmVudmlyb25tZW50W2VudHJ5LmZ1bGxQYXRo ICsgJy5zaXplJ10gPSBzaXplOworICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5jcmVhdGVO ZXh0RW50cnkoKTsKKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgfSks IGJpbmRDYWxsYmFjayh0aGlzLCB0aGlzLmNyZWF0ZUVycm9yQ2FsbGJhY2spKTsKKyAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgICAgICB0aGlzLmVudmlyb25t ZW50W2VudHJ5LmZ1bGxQYXRoXSA9IGVudHJ5OworICAgICAgICAgICAgdGhpcy5lbnZpcm9ubWVu dFtlbnRyeS5mdWxsUGF0aCArICcuc2l6ZSddID0gMDsKICAgICAgICAgICAgIHRoaXMuY3JlYXRl TmV4dEVudHJ5KCk7CiAgICAgICAgIH0KIApAQCAtNTMsNyArNjYsNyBAQCBmdW5jdGlvbiBjcmVh dGVUZXN0RW52aXJvbm1lbnQoZmlsZVN5c3RlbSwgZW50cmllcywgc3VjY2Vzc0NhbGxiYWNrLCBl cnJvckNhbGxiYQogICAgICAgICAgICAgaWYgKGVudHJ5LmlzRGlyZWN0b3J5KQogICAgICAgICAg ICAgICAgIGZpbGVTeXN0ZW0ucm9vdC5nZXREaXJlY3RvcnkoZW50cnkuZnVsbFBhdGgsIHtjcmVh dGU6dHJ1ZX0sIGJpbmRDYWxsYmFjayh0aGlzLCB0aGlzLmNyZWF0ZVN1Y2Nlc3NDYWxsYmFjayks IGJpbmRDYWxsYmFjayh0aGlzLCB0aGlzLmNyZWF0ZUVycm9yQ2FsbGJhY2spKTsKICAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICBmaWxlU3lzdGVtLnJvb3QuZ2V0RmlsZShlbnRyeS5m dWxsUGF0aCwge2NyZWF0ZTp0cnVlfSwgYmluZENhbGxiYWNrKHRoaXMsIHRoaXMuY3JlYXRlU3Vj Y2Vzc0NhbGxiYWNrKSwgYmluZENhbGxiYWNrKHRoaXMsIHRoaXMuY3JlYXRlRXJyb3JDYWxsYmFj aykpOworICAgICAgICAgICAgICAgIGZpbGVTeXN0ZW0ucm9vdC5nZXRGaWxlKGVudHJ5LmZ1bGxQ YXRoLCB7Y3JlYXRlOnRydWV9LCBiaW5kQ2FsbGJhY2sodGhpcywgdGhpcy5jcmVhdGVTdWNjZXNz Q2FsbGJhY2ssIGVudHJ5LnNpemUpLCBiaW5kQ2FsbGJhY2sodGhpcywgdGhpcy5jcmVhdGVFcnJv ckNhbGxiYWNrKSk7CiAgICAgICAgIH07CiAgICAgfTsKIApAQCAtMjExLDEyICsyMjQsMTggQEAg ZnVuY3Rpb24gcnVuT3BlcmF0aW9uVGVzdChmaWxlU3lzdGVtLCB0ZXN0Q2FzZSwgc3VjY2Vzc0Nh bGxiYWNrLCBlcnJvckNhbGxiYWNrKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIXRoaXMu ZXhwZWN0ZWRFcnJvckNvZGUpIHsKICAgICAgICAgICAgICAgICB0ZXN0UGFzc2VkKCdTdWNjZWVk ZWQ6ICcgKyB0aGlzLnN0YWdlKTsKLSAgICAgICAgICAgICAgICB2YXIgc3ltYm9sID0gZW50cnkg KyAnLm1vZGlmaWNhdGlvblRpbWUnOworICAgICAgICAgICAgICAgIHZhciBzeW1ib2wgPSBlbnRy eSArICcucmV0dXJuZWQubW9kaWZpY2F0aW9uVGltZSc7CiAgICAgICAgICAgICAgICAgdGhpcy5l bnZpcm9ubWVudFtzeW1ib2xdID0gbWV0YWRhdGEubW9kaWZpY2F0aW9uVGltZTsKLQogICAgICAg ICAgICAgICAgIHZhciBlbnRyeU1ldGFkYXRhU3RyaW5nID0gdGhpcy5nZXRTeW1ib2xTdHJpbmco c3ltYm9sKTsKLSAgICAgICAgICAgICAgICBpZiAoZW50cnkgIT0gJy8nKQorICAgICAgICAgICAg ICAgIGlmIChlbnRyeSAhPSAnLycpIHsKICAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmVHcmVh dGVyVGhhbk9yRXF1YWwuYXBwbHkodGhpcywgW2VudHJ5TWV0YWRhdGFTdHJpbmcsICd0aGlzLnJv dW5kZWRTdGFydERhdGUnXSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlm IChtZXRhZGF0YS5zaXplKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuZW52aXJvbm1lbnRb ZW50cnkgKyAnLnJldHVybmVkLnNpemUnXSA9IG1ldGFkYXRhLnNpemU7CisgICAgICAgICAgICAg ICAgICAgIHZhciBlbnRyeVNpemVTdHJpbmcgPSB0aGlzLmdldFN5bWJvbFN0cmluZyhlbnRyeSAr ICcucmV0dXJuZWQuc2l6ZScpOworICAgICAgICAgICAgICAgICAgICB2YXIgZXhwZWN0ZWRTaXpl U3RyaW5nID0gdGhpcy5nZXRTeW1ib2xTdHJpbmcoZW50cnkgKyAnLnNpemUnKTsKKyAgICAgICAg ICAgICAgICAgICAgc2hvdWxkQmUuYXBwbHkodGhpcywgW2V4cGVjdGVkU2l6ZVN0cmluZywgZW50 cnlTaXplU3RyaW5nXSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHRoaXMu cnVuTmV4dFRlc3QoKTsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHRlc3RG YWlsZWQoJ1VuZXhwZWN0ZWRseSBzdWNjZWVkZWQgd2hpbGUgJyArIHRoaXMuc3RhZ2UpOwo=