111753 2013-03-07 10:17:40 -0800 Web Inspector: Get rid of file system ids and use file paths as uri for file based uiSourceCodes. 2013-03-08 07:41:46 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 850228 0 vsevik 2013-03-07 10:17:40 -0800 Patch to follow 850262 1 192042 vsevik 2013-03-07 10:39:31 -0800 Created attachment 192042 Patch 851189 2 192042 webkit.review.bot 2013-03-08 07:41:43 -0800 Comment on attachment 192042 Patch Clearing flags on attachment: 192042 Committed r145221: <http://trac.webkit.org/changeset/145221> 851190 3 webkit.review.bot 2013-03-08 07:41:46 -0800 All reviewed patches have been landed. Closing bug. 192042 2013-03-07 10:39:31 -0800 2013-03-08 07:41:43 -0800 Patch bug-111753-20130307223534.patch text/plain 21873 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEwMWM3OWQ4NjU5Y2Q1 NGVhODM2MGFhZTE5MDJlZjg1ZmE1MWZjYy4uZmY2Y2QwNDMwMWEwODQyYTcwMGM1MzFlNjFjYmEz ZGQxMWE4OTEyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAzLTA3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEdldCByaWQgb2YgZmlsZSBzeXN0ZW0gaWRzIGFuZCB1c2UgZmlsZSBwYXRoZXMgYXMgdXJp IGZvciBmaWxlIGJhc2VkIHVpU291cmNlQ29kZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1h cHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1hcHBpbmdJbXBsKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTWFwcGluZ0ltcGwucHJvdG90eXBlLl9s b2FkRnJvbVNldHRpbmdzLmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lz dGVtTWFwcGluZ0ltcGwucHJvdG90eXBlLl9sb2FkRnJvbVNldHRpbmdzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5GaWxlU3lzdGVtTWFwcGluZ0ltcGwucHJvdG90eXBlLl9zYXZlVG9TZXR0aW5n cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1hcHBpbmdJbXBsLnByb3RvdHlw ZS5zZXQgYWRkRmlsZVN5c3RlbU1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1NYXBwaW5nSW1wbC5wcm90b3R5cGUucmVtb3ZlRmlsZVN5c3RlbU1hcHBpbmcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1NYXBwaW5nSW1wbC5wcm90b3R5cGUuZmlsZVN5 c3RlbVBhdGhzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTWFwcGluZ0ltcGwu cHJvdG90eXBlLmZpbGVTeXN0ZW1QYXRoRm9yUHJlZml4KToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm9qZWN0SWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLmlkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5maWxl U3lzdGVtUGF0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVdvcmtzcGFjZVBy b3ZpZGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlk ZXIucHJvdG90eXBlLl9maWxlU3lzdGVtQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1Xb3Jrc3BhY2VQcm92aWRlci5wcm90b3R5cGUuX2ZpbGVTeXN0ZW1SZW1vdmVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlkZXIucHJvdG90 eXBlLmZpbGVTeXN0ZW1QYXRoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0lzb2xh dGVkRmlsZVN5c3RlbU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSXNvbGF0ZWRG aWxlU3lzdGVtTWFuYWdlci5wcm90b3R5cGUuX2lubmVyQWRkRmlsZVN5c3RlbSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSXNvbGF0ZWRGaWxlU3lzdGVtTWFuYWdlci5wcm90b3R5cGUuX2ZpbGVT eXN0ZW1SZW1vdmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UucHJvdG90eXBlLnVpU291cmNlQ29k ZUZvclVSTCk6CisKIDIwMTMtMDMtMDcgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIExpbWl0IHRoZSBzdXBwb3J0ZWQgY29tcGlsZXJzIHRvIEdD QyA+PSA0LjcgYW5kIENsYW5nID49IDMuMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTWFwcGluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1hcHBpbmcuanMKaW5kZXggMGNjYzI0NDYxZDQ1 ZWYwODEwYWNmMmE4OWYyMTU3ZTAyMzI4YmUwMC4uYjA2Y2VjMjU2OTAzNjRmMzdkN2U0ODE4MTA0 OWIwOTExNjVmYjE2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWxlU3lzdGVtTWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbGVTeXN0ZW1NYXBwaW5nLmpzCkBAIC01NSwxMiArNTUsOCBAQCBXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbU1hcHBpbmdJbXBsID0gZnVuY3Rpb24oKQogewogICAgIFdlYkluc3Bl Y3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKICAgICB0aGlzLl9maWxlU3lzdGVtTWFwcGluZ1NldHRp bmcgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygiZmlsZVN5c3RlbU1hcHBp bmciLCB7fSk7Ci0gICAgLyoqIEB0eXBlIHshT2JqZWN0LjxzdHJpbmcsIHN0cmluZz59ICovCisg ICAgLyoqIEB0eXBlIHshT2JqZWN0LjxzdHJpbmcsIGJvb2xlYW4+fSAqLwogICAgIHRoaXMuX2Zp bGVTeXN0ZW1QYXRocyA9IHt9OwotICAgIC8qKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCBzdHJp bmc+fSAqLwotICAgIHRoaXMuX2ZpbGVTeXN0ZW1JZHMgPSB7fTsKLSAgICAvKiogQHR5cGUgeyFP YmplY3QuPHN0cmluZywgc3RyaW5nPn0gKi8KLSAgICB0aGlzLl9maWxlU3lzdGVtTmFtZXMgPSB7 fTsKICAgICB0aGlzLl9sb2FkRnJvbVNldHRpbmdzKCk7CiB9CiAKQEAgLTY4LDY4ICs2NCwyOCBA QCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1hcHBpbmdJbXBsLnByb3RvdHlwZSA9IHsKICAgICBf bG9hZEZyb21TZXR0aW5nczogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIHNhdmVkTWFw cGluZyA9IHRoaXMuX2ZpbGVTeXN0ZW1NYXBwaW5nU2V0dGluZy5nZXQoKTsKLSAgICAgICAgdGhp cy5fbmV4dFVuaXF1ZUlkID0gc2F2ZWRNYXBwaW5nID8gc2F2ZWRNYXBwaW5nLl9uZXh0VW5pcXVl SWQgfHwgMCA6IDA7Ci0gICAgICAgIHRoaXMuX2ZpbGVTeXN0ZW1QYXRocyA9IHNhdmVkTWFwcGlu ZyA/IC8qKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCBzdHJpbmc+fSAqLyAoc2F2ZWRNYXBwaW5n LmZpbGVTeXN0ZW1QYXRocykgfHwge30gOiB7fTsKLSAgICAgICAgZm9yICh2YXIgaWQgaW4gdGhp cy5fZmlsZVN5c3RlbVBhdGhzKSB7Ci0gICAgICAgICAgICB2YXIgZmlsZVN5c3RlbVBhdGggPSB0 aGlzLl9maWxlU3lzdGVtUGF0aHNbaWRdOwotICAgICAgICAgICAgdmFyIG5hbWUgPSB0aGlzLl9m aWxlU3lzdGVtTmFtZShmaWxlU3lzdGVtUGF0aCk7Ci0gICAgICAgICAgICB0aGlzLl9maWxlU3lz dGVtSWRzW2ZpbGVTeXN0ZW1QYXRoXSA9IGlkOwotICAgICAgICAgICAgdGhpcy5fZmlsZVN5c3Rl bU5hbWVzW2lkXSA9IG5hbWU7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVBh dGhzID0gc2F2ZWRNYXBwaW5nID8gLyoqIEB0eXBlIHshT2JqZWN0LjxzdHJpbmcsIHN0cmluZz59 ICovIChzYXZlZE1hcHBpbmcucmVnaXN0ZXJlZEZpbGVTeXN0ZW1QYXRocykgfHwge30gOiB7fTsK ICAgICB9LAogCiAgICAgX3NhdmVUb1NldHRpbmdzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICB2YXIgc2F2ZWRNYXBwaW5nID0ge307Ci0gICAgICAgIHNhdmVkTWFwcGluZy5uZXh0VW5pcXVl SWQgPSB0aGlzLl9uZXh0VW5pcXVlSWQ7Ci0gICAgICAgIHNhdmVkTWFwcGluZy5maWxlU3lzdGVt UGF0aHMgPSB0aGlzLl9maWxlU3lzdGVtUGF0aHM7CisgICAgICAgIHNhdmVkTWFwcGluZy5yZWdp c3RlcmVkRmlsZVN5c3RlbVBhdGhzID0gdGhpcy5fZmlsZVN5c3RlbVBhdGhzOwogICAgICAgICB0 aGlzLl9maWxlU3lzdGVtTWFwcGluZ1NldHRpbmcuc2V0KHNhdmVkTWFwcGluZyk7CiAgICAgfSwK IAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmaWxlU3lzdGVtUGF0aAotICAgICAq LwotICAgIF9maWxlU3lzdGVtTmFtZTogZnVuY3Rpb24oZmlsZVN5c3RlbVBhdGgpCi0gICAgewot ICAgICAgICB2YXIgbGFzdEluZGV4T2ZTbGFzaCA9IGZpbGVTeXN0ZW1QYXRoLmxhc3RJbmRleE9m KCIvIik7Ci0gICAgICAgIHJldHVybiBmaWxlU3lzdGVtUGF0aC5zdWJzdHIobGFzdEluZGV4T2ZT bGFzaCArIDEpOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gZmls ZVN5c3RlbVBhdGgKLSAgICAgKiBAcmV0dXJuIHs/c3RyaW5nfQotICAgICAqLwotICAgIGZpbGVT eXN0ZW1JZDogZnVuY3Rpb24oZmlsZVN5c3RlbVBhdGgpCi0gICAgewotICAgICAgICByZXR1cm4g dGhpcy5fZmlsZVN5c3RlbUlkc1tmaWxlU3lzdGVtUGF0aF07Ci0gICAgfSwKLQotICAgIC8qKgot ICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmaWxlU3lzdGVtSWQKLSAgICAgKiBAcmV0dXJuIHs/c3Ry aW5nfQotICAgICAqLwotICAgIGZpbGVTeXN0ZW1QYXRoOiBmdW5jdGlvbihmaWxlU3lzdGVtSWQp Ci0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZmlsZVN5c3RlbVBhdGhzW2ZpbGVTeXN0ZW1J ZF07Ci0gICAgfSwKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmaWxlU3lzdGVt UGF0aAotICAgICAqIEByZXR1cm4ge3N0cmluZ30KICAgICAgKi8KICAgICBhZGRGaWxlU3lzdGVt TWFwcGluZzogZnVuY3Rpb24oZmlsZVN5c3RlbVBhdGgpCiAgICAgewotICAgICAgICBpZiAodGhp cy5fZmlsZVN5c3RlbUlkc1tmaWxlU3lzdGVtUGF0aF0pCi0gICAgICAgICAgICByZXR1cm4gdGhp cy5fZmlsZVN5c3RlbUlkc1tmaWxlU3lzdGVtUGF0aF07CisgICAgICAgIGlmICh0aGlzLl9maWxl U3lzdGVtUGF0aHNbZmlsZVN5c3RlbVBhdGhdKQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIHZhciBuYW1lID0gdGhpcy5fZmlsZVN5c3RlbU5hbWUoZmlsZVN5c3RlbVBhdGgpOwotICAg ICAgICB2YXIgaWQgPSBTdHJpbmcodGhpcy5fbmV4dFVuaXF1ZUlkKyspICsgIkAiICsgbmFtZTsK LSAgICAgICAgdGhpcy5fZmlsZVN5c3RlbUlkc1tmaWxlU3lzdGVtUGF0aF0gPSBpZDsKLSAgICAg ICAgdGhpcy5fZmlsZVN5c3RlbU5hbWVzW2lkXSA9IG5hbWU7Ci0gICAgICAgIHRoaXMuX2ZpbGVT eXN0ZW1QYXRoc1tpZF0gPSBmaWxlU3lzdGVtUGF0aDsKKyAgICAgICAgdGhpcy5fZmlsZVN5c3Rl bVBhdGhzW2ZpbGVTeXN0ZW1QYXRoXSA9IHRydWU7CiAgICAgICAgIHRoaXMuX3NhdmVUb1NldHRp bmdzKCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9jYWNoZWRGaWxlU3lzdGVtUGF0aHM7Ci0gICAg ICAgIHJldHVybiBpZDsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xMzcsMTIgKzkzLDkgQEAgV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1NYXBwaW5nSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgcmVtb3ZlRmlsZVN5c3RlbU1hcHBpbmc6IGZ1bmN0aW9uKGZpbGVTeXN0ZW1QYXRoKQogICAg IHsKLSAgICAgICAgdmFyIGlkID0gdGhpcy5fZmlsZVN5c3RlbUlkc1tmaWxlU3lzdGVtUGF0aF07 Ci0gICAgICAgIGlmICghaWQpCisgICAgICAgIGlmICghdGhpcy5fZmlsZVN5c3RlbVBhdGhzW2Zp bGVTeXN0ZW1QYXRoXSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgZGVsZXRlIHRoaXMu X2ZpbGVTeXN0ZW1JZHNbZmlsZVN5c3RlbVBhdGhdOwotICAgICAgICBkZWxldGUgdGhpcy5fZmls ZVN5c3RlbU5hbWVzW2lkXTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2ZpbGVTeXN0ZW1QYXRoc1tp ZF07CisgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlU3lzdGVtUGF0aHNbZmlsZVN5c3RlbVBhdGhd OwogICAgICAgICB0aGlzLl9zYXZlVG9TZXR0aW5ncygpOwogICAgICAgICBkZWxldGUgdGhpcy5f Y2FjaGVkRmlsZVN5c3RlbVBhdGhzOwogICAgIH0sCkBAIC0xNTIsNyArMTA1LDcgQEAgV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1NYXBwaW5nSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAg ZmlsZVN5c3RlbVBhdGhzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gT2JqZWN0 LnZhbHVlcyh0aGlzLl9maWxlU3lzdGVtUGF0aHMpOworICAgICAgICByZXR1cm4gT2JqZWN0Lmtl eXModGhpcy5fZmlsZVN5c3RlbVBhdGhzKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xNjUsOCAr MTE4LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1NYXBwaW5nSW1wbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmICh0aGlzLl9jYWNoZWRGaWxlU3lzdGVtUGF0aHMuaGFzT3duUHJvcGVydHko cHJlZml4KSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9jYWNoZWRGaWxlU3lzdGVtUGF0aHNb cHJlZml4XTsKICAgICAgICAgdmFyIHJlc3VsdCA9IG51bGw7Ci0gICAgICAgIGZvciAodmFyIGlk IGluIHRoaXMuX2ZpbGVTeXN0ZW1QYXRocykgewotICAgICAgICAgICAgdmFyIGZpbGVTeXN0ZW1Q YXRoID0gdGhpcy5fZmlsZVN5c3RlbVBhdGhzW2lkXTsKKyAgICAgICAgZm9yICh2YXIgZmlsZVN5 c3RlbVBhdGggaW4gdGhpcy5fZmlsZVN5c3RlbVBhdGhzKSB7CiAgICAgICAgICAgICBpZiAocHJl Zml4LnN0YXJ0c1dpdGgoZmlsZVN5c3RlbVBhdGggKyAiLyIpKSB7CiAgICAgICAgICAgICAgICAg cmVzdWx0ID0gZmlsZVN5c3RlbVBhdGg7CiAgICAgICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0 RGVsZWdhdGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0 ZW1Qcm9qZWN0RGVsZWdhdGUuanMKaW5kZXggYzE1ZmNkM2EyZjdlMzdiY2YzOTRhMGQ4NGIzMjI4 ZjUxOGUxZDQ2NC4uZDUyN2QwMTBmMGY2ZTNhMWI4YmQ3OTk2YTFjM2VlNjY0N2I3ZmM1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtUHJv amVjdERlbGVnYXRlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcwpAQCAtNDMsMTMgKzQzLDE4IEBAIFdlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlID0gZnVuY3Rpb24oaXNvbGF0ZWRGaWxlU3lz dGVtLCB3b3Jrc3BhY2UpCiAKIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRl Ll9zY3JpcHRFeHRlbnNpb25zID0gWyJqcyIsICJqYXZhIiwgImNjIiwgImNwcCIsICJoIiwgImNz IiwgInB5IiwgInBocCJdLmtleVNldCgpOwogCitXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2pl Y3REZWxlZ2F0ZS5wcm9qZWN0SWQgPSBmdW5jdGlvbihmaWxlU3lzdGVtUGF0aCkKK3sKKyAgICBy ZXR1cm4gImZpbGVzeXN0ZW06IiArIGZpbGVTeXN0ZW1QYXRoOworfQorCiBXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICog QHJldHVybiB7c3RyaW5nfQogICAgICAqLwogICAgIGlkOiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fZmlsZVN5c3RlbS5pZCgpOworICAgICAgICByZXR1cm4gV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvamVjdElkKHRoaXMuX2ZpbGVTeXN0 ZW0ucGF0aCgpKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC02Myw2ICs2OCwxNCBAQCBXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAg ICAgICogQHJldHVybiB7c3RyaW5nfQogICAgICAqLworICAgIGZpbGVTeXN0ZW1QYXRoOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZmlsZVN5c3RlbS5wYXRoKCk7Cisg ICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KICAgICBk aXNwbGF5TmFtZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbGVT eXN0ZW0ucGF0aCgpLnN1YnN0cih0aGlzLl9maWxlU3lzdGVtLnBhdGgoKS5sYXN0SW5kZXhPZigi LyIpICsgMSk7CkBAIC0yNDMsNiArMjU2LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Xb3Jr c3BhY2VQcm92aWRlciA9IGZ1bmN0aW9uKGlzb2xhdGVkRmlsZVN5c3RlbU1hbmFnZXIsIHcKICAg ICB0aGlzLl93b3Jrc3BhY2UgPSB3b3Jrc3BhY2U7CiAgICAgdGhpcy5faXNvbGF0ZWRGaWxlU3lz dGVtTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Jc29sYXRlZEZpbGVTeXN0 ZW1NYW5hZ2VyLkV2ZW50cy5GaWxlU3lzdGVtQWRkZWQsIHRoaXMuX2ZpbGVTeXN0ZW1BZGRlZCwg dGhpcyk7CiAgICAgdGhpcy5faXNvbGF0ZWRGaWxlU3lzdGVtTWFuYWdlci5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Jc29sYXRlZEZpbGVTeXN0ZW1NYW5hZ2VyLkV2ZW50cy5GaWxlU3lz dGVtUmVtb3ZlZCwgdGhpcy5fZmlsZVN5c3RlbVJlbW92ZWQsIHRoaXMpOworICAgIHRoaXMuX3Np bXBsZVByb2plY3REZWxlZ2F0ZXMgPSB7fTsKIH0KIAogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1X b3Jrc3BhY2VQcm92aWRlci5wcm90b3R5cGUgPSB7CkBAIC0yNTIsOCArMjY2LDEwIEBAIFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBlID0gewogICAgIF9m aWxlU3lzdGVtQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGZpbGVT eXN0ZW0gPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5Jc29sYXRlZEZpbGVTeXN0ZW19ICovIChl dmVudC5kYXRhKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX3dvcmtzcGFjZS5wcm9q ZWN0KGZpbGVTeXN0ZW0uaWQoKSkpOworICAgICAgICB2YXIgcHJvamVjdElkID0gV2ViSW5zcGVj dG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvamVjdElkKGZpbGVTeXN0ZW0ucGF0aCgp KTsKICAgICAgICAgdmFyIHByb2plY3REZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5 c3RlbVByb2plY3REZWxlZ2F0ZShmaWxlU3lzdGVtLCB0aGlzLl93b3Jrc3BhY2UpCisgICAgICAg IHRoaXMuX3NpbXBsZVByb2plY3REZWxlZ2F0ZXNbcHJvamVjdERlbGVnYXRlLmlkKCldID0gcHJv amVjdERlbGVnYXRlOworICAgICAgICBjb25zb2xlLmFzc2VydCghcHJvamVjdERlbGVnYXRlLmlk KCkpOwogICAgICAgICB0aGlzLl93b3Jrc3BhY2UuYWRkUHJvamVjdChwcm9qZWN0RGVsZWdhdGUp OwogICAgICAgICBwcm9qZWN0RGVsZWdhdGUucG9wdWxhdGUoKTsKICAgICB9LApAQCAtMjY0LDgg KzI4MCw5IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlkZXIucHJvdG90 eXBlID0gewogICAgIF9maWxlU3lzdGVtUmVtb3ZlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewog ICAgICAgICB2YXIgZmlsZVN5c3RlbSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLklzb2xhdGVk RmlsZVN5c3RlbX0gKi8gKGV2ZW50LmRhdGEpOwotICAgICAgICBpZiAoZmlsZVN5c3RlbS5pZCgp KQotICAgICAgICAgICAgdGhpcy5fd29ya3NwYWNlLnJlbW92ZVByb2plY3QoZmlsZVN5c3RlbS5p ZCgpKTsKKyAgICAgICAgdmFyIHByb2plY3RJZCA9IFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJv amVjdERlbGVnYXRlLnByb2plY3RJZChmaWxlU3lzdGVtLnBhdGgoKSk7CisgICAgICAgIHRoaXMu X3dvcmtzcGFjZS5yZW1vdmVQcm9qZWN0KHByb2plY3RJZCk7CisgICAgICAgIGRlbGV0ZSB0aGlz Ll9zaW1wbGVQcm9qZWN0RGVsZWdhdGVzW3Byb2plY3RJZF07CiAgICAgfSwKIAogICAgIC8qKgpA QCAtMjczLDggKzI5MCw4IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlk ZXIucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGZpbGVTeXN0ZW1QYXRoOiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgZmlsZVN5c3RlbUlkID0gdWlTb3VyY2VD b2RlLnByb2plY3QoKS5pZCgpOwotICAgICAgICByZXR1cm4gdGhpcy5faXNvbGF0ZWRGaWxlU3lz dGVtTWFuYWdlci5tYXBwaW5nKCkuZmlsZVN5c3RlbVBhdGgoZmlsZVN5c3RlbUlkKTsKKyAgICAg ICAgdmFyIHByb2plY3REZWxlZ2F0ZSA9IHRoaXMuX3NpbXBsZVByb2plY3REZWxlZ2F0ZXNbdWlT b3VyY2VDb2RlLnByb2plY3QoKS5pZCgpXTsKKyAgICAgICAgcmV0dXJuIHByb2plY3REZWxlZ2F0 ZS5maWxlU3lzdGVtUGF0aCgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Jc29sYXRlZEZpbGVTeXN0ZW0uanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lzb2xhdGVkRmlsZVN5c3RlbS5qcwppbmRleCA5NzRk MjI2MDZjMTlmYzA3Mjg2NzlkMGE4YTYxMzNlMWJhMzQ1YjczLi5iNTQ4MzgwNWZhMGNmM2E2ZmY5 ZGQ0YTNlNjE5YjA0MTE2ZGYwNjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0lzb2xhdGVkRmlsZVN5c3RlbS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0lzb2xhdGVkRmlsZVN5c3RlbS5qcwpAQCAtMzEsMTMgKzMxLDEx IEBACiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuSXNvbGF0 ZWRGaWxlU3lzdGVtTWFuYWdlcn0gbWFuYWdlcgotICogQHBhcmFtIHtzdHJpbmd9IGlkCiAgKiBA cGFyYW0ge3N0cmluZ30gcGF0aAogICovCi1XZWJJbnNwZWN0b3IuSXNvbGF0ZWRGaWxlU3lzdGVt ID0gZnVuY3Rpb24obWFuYWdlciwgaWQsIHBhdGgsIG5hbWUsIHJvb3RVUkwpCitXZWJJbnNwZWN0 b3IuSXNvbGF0ZWRGaWxlU3lzdGVtID0gZnVuY3Rpb24obWFuYWdlciwgcGF0aCwgbmFtZSwgcm9v dFVSTCkKIHsKICAgICB0aGlzLl9tYW5hZ2VyID0gbWFuYWdlcjsKLSAgICB0aGlzLl9pZCA9IGlk OwogICAgIHRoaXMuX3BhdGggPSBwYXRoOwogICAgIHRoaXMuX25hbWUgPSBuYW1lOwogICAgIHRo aXMuX3Jvb3RVUkwgPSByb290VVJMOwpAQCAtNzQsMTQgKzcyLDYgQEAgV2ViSW5zcGVjdG9yLklz b2xhdGVkRmlsZVN5c3RlbS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHJldHVybiB7 c3RyaW5nfQogICAgICAqLwotICAgIGlkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1 cm4gdGhpcy5faWQ7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEByZXR1cm4ge3N0cmluZ30K LSAgICAgKi8KICAgICBwYXRoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhp cy5fcGF0aDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SXNvbGF0ZWRGaWxlU3lzdGVtTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSXNvbGF0ZWRGaWxlU3lzdGVtTWFuYWdlci5qcwppbmRleCAyNGE5MzM0MTMyNTY4 YmQ1ZjE4NGQyYTExY2JjYmZhZjYxZDRjNDEyLi40ZTlmMjkzNzg1YTE4OGRhOWI1YjcyZjEyOTkz OTc2YTAxNzUwNDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0lzb2xhdGVkRmlsZVN5c3RlbU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Jc29sYXRlZEZpbGVTeXN0ZW1NYW5hZ2VyLmpzCkBAIC0xMTAsOCAr MTEwLDggQEAgV2ViSW5zcGVjdG9yLklzb2xhdGVkRmlsZVN5c3RlbU1hbmFnZXIucHJvdG90eXBl ID0gewogICAgIF9pbm5lckFkZEZpbGVTeXN0ZW06IGZ1bmN0aW9uKGZpbGVTeXN0ZW0pCiAgICAg ewogICAgICAgICB2YXIgZmlsZVN5c3RlbVBhdGggPSBmaWxlU3lzdGVtLmZpbGVTeXN0ZW1QYXRo OwotICAgICAgICB2YXIgZmlsZVN5c3RlbUlkID0gdGhpcy5fZmlsZVN5c3RlbU1hcHBpbmcuYWRk RmlsZVN5c3RlbU1hcHBpbmcoZmlsZVN5c3RlbVBhdGgpOwotICAgICAgICB2YXIgaXNvbGF0ZWRG aWxlU3lzdGVtID0gbmV3IFdlYkluc3BlY3Rvci5Jc29sYXRlZEZpbGVTeXN0ZW0odGhpcywgZmls ZVN5c3RlbUlkLCBmaWxlU3lzdGVtUGF0aCwgZmlsZVN5c3RlbS5maWxlU3lzdGVtTmFtZSwgZmls ZVN5c3RlbS5yb290VVJMKTsKKyAgICAgICAgdGhpcy5fZmlsZVN5c3RlbU1hcHBpbmcuYWRkRmls ZVN5c3RlbU1hcHBpbmcoZmlsZVN5c3RlbVBhdGgpOworICAgICAgICB2YXIgaXNvbGF0ZWRGaWxl U3lzdGVtID0gbmV3IFdlYkluc3BlY3Rvci5Jc29sYXRlZEZpbGVTeXN0ZW0odGhpcywgZmlsZVN5 c3RlbVBhdGgsIGZpbGVTeXN0ZW0uZmlsZVN5c3RlbU5hbWUsIGZpbGVTeXN0ZW0ucm9vdFVSTCk7 CiAgICAgICAgIHRoaXMuX2ZpbGVTeXN0ZW1zW2ZpbGVTeXN0ZW1QYXRoXSA9IGlzb2xhdGVkRmls ZVN5c3RlbTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLklzb2xhdGVkRmlsZVN5c3RlbU1hbmFnZXIuRXZlbnRzLkZpbGVTeXN0ZW1BZGRlZCwgaXNv bGF0ZWRGaWxlU3lzdGVtKTsKICAgICB9LApAQCAtMTU5LDcgKzE1OSw2IEBAIFdlYkluc3BlY3Rv ci5Jc29sYXRlZEZpbGVTeXN0ZW1NYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBf ZmlsZVN5c3RlbVJlbW92ZWQ6IGZ1bmN0aW9uKGZpbGVTeXN0ZW1QYXRoKQogICAgIHsKLSAgICAg ICAgdmFyIGZpbGVTeXN0ZW1JZCA9IHRoaXMuX2ZpbGVTeXN0ZW1NYXBwaW5nLmZpbGVTeXN0ZW1J ZChmaWxlU3lzdGVtUGF0aCk7CiAgICAgICAgIHRoaXMuX2ZpbGVTeXN0ZW1NYXBwaW5nLnJlbW92 ZUZpbGVTeXN0ZW1NYXBwaW5nKGZpbGVTeXN0ZW1QYXRoKTsKICAgICAgICAgdmFyIGlzb2xhdGVk RmlsZVN5c3RlbSA9IHRoaXMuX2ZpbGVTeXN0ZW1zW2ZpbGVTeXN0ZW1QYXRoXTsKICAgICAgICAg ZGVsZXRlIHRoaXMuX2ZpbGVTeXN0ZW1zW2ZpbGVTeXN0ZW1QYXRoXTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKaW5kZXggMjhhOGE1ODJmYjM2 MmM5ZTM3ZTU5NjgxYWI3MjAzNWYwMWE0NGY4Yy4uZTc3ZGNjNzNlYTYxZmJmNWY3NmEyZmIzNWQ2 YzRhYzgwZTU1NWVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Xb3Jrc3BhY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Xb3Jrc3BhY2UuanMKQEAgLTQ1OSw3ICs0NTksNyBAQCBXZWJJbnNwZWN0b3IuV29ya3NwYWNl LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBwcm9qZWN0ID8gcHJvamVjdC51aVNv dXJjZUNvZGUocGF0aCkgOiBudWxsOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIHByb2plY3RJ ZCA9IHRoaXMuX2ZpbGVTeXN0ZW1NYXBwaW5nLmZpbGVTeXN0ZW1JZChmaWxlU3lzdGVtUGF0aCk7 CisgICAgICAgIHZhciBwcm9qZWN0SWQgPSBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3RE ZWxlZ2F0ZS5wcm9qZWN0SWQoZmlsZVN5c3RlbVBhdGgpOwogICAgICAgICB2YXIgcGF0aFByZWZp eCA9IGVudHJ5LnBhdGhQcmVmaXguc3Vic3RyKGZpbGVTeXN0ZW1QYXRoLmxlbmd0aCArIDEpOwog ICAgICAgICB2YXIgcGF0aCA9IHBhdGhQcmVmaXggKyB1cmwuc3Vic3RyKGVudHJ5LnVybFByZWZp eC5sZW5ndGgpOwogICAgICAgICB2YXIgcHJvamVjdCA9IHRoaXMucHJvamVjdChwcm9qZWN0SWQp OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDQzMThmZDdjMjhjOTFiN2NmZDllNjFkMDJhOWFlZDVkNTk4YjMzNzguLjc4NDA1 NGU3MTAyYmY5NjlkYzQ4MDU4ODJkNjZkN2YyNzZhYjJmYTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMy0wMy0wNyAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBHZXQgcmlkIG9mIGZpbGUgc3lzdGVtIGlkcyBhbmQgdXNl IGZpbGUgcGF0aGVzIGFzIHVyaSBmb3IgZmlsZSBiYXNlZCB1aVNvdXJjZUNvZGVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzUzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZmls ZS1zeXN0ZW0tbWFwcGluZy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2ZpbGUt c3lzdGVtLW1hcHBpbmcuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZmlsZS1zeXN0ZW0tcHJv amVjdC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3dvcmtzcGFjZS1tYXBwaW5n LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmcuaHRt bDoKKwogMjAxMy0wMy0wNyAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFhTU0F1ZGl0b3Igc2hvdWxkIHNlbmQgb25seSBvbmUgY29uc29sZSBlcnJvciB3aGVuIGJs b2NraW5nIGEgcGFnZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9maWxlLXN5 c3RlbS1tYXBwaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9maWxlLXN5 c3RlbS1tYXBwaW5nLWV4cGVjdGVkLnR4dAppbmRleCBlZjU0Y2QwYmFhZDQ1ZGMwNGQ3OGRjM2Iy OTJjMzAzYjViNGVkMjY0Li45ZTYxZGI3NDU3NmY3NGEyZDY3NzU0ZWIwMGUxMDBkZDk1NGE5OTRm IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZmlsZS1zeXN0ZW0tbWFwcGluZy1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2ZpbGUtc3lzdGVtLW1hcHBp bmctZXhwZWN0ZWQudHh0CkBAIC03LDcgKzcsNyBAQCBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBp bmcuCiBBZGRpbmcgZmlsZSBzeXN0ZW0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9vCiBUZXN0 aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuCiAgICAgZmlsZSBzeXN0ZW0gcGF0aHM6Ci0gICAgIC0g L2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9vKGlkID0gMEBmb28pCisgICAgIC0gL2hvbWUvdXNl cm5hbWUvcHJvamVjdHMvZm9vCiAgICAgZmlsZVN5c3RlbVBhdGhGb3JQcmVmaXg6CiAgICAgICAg IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbyA9PiAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9m b28KICAgICAgICAgL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9vID0+IC9ob21lL3VzZXJuYW1l L3Byb2plY3RzL2ZvbwpAQCAtMTUsOCArMTUsOCBAQCBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBp bmcuCiBBZGRpbmcgZmlsZSBzeXN0ZW0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyCiBUZXN0 aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuCiAgICAgZmlsZSBzeXN0ZW0gcGF0aHM6Ci0gICAgIC0g L2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9vKGlkID0gMEBmb28pCi0gICAgIC0gL2hvbWUvdXNl cm5hbWUvcHJvamVjdHMvYmFyKGlkID0gMUBiYXIpCisgICAgIC0gL2hvbWUvdXNlcm5hbWUvcHJv amVjdHMvZm9vCisgICAgIC0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyCiAgICAgZmlsZVN5 c3RlbVBhdGhGb3JQcmVmaXg6CiAgICAgICAgIC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbyA9 PiAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9mb28KICAgICAgICAgL2hvbWUvdXNlcm5hbWUvcHJv amVjdHMvYmFyID0+IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2JhcgpAQCAtMjYsOSArMjYsOSBA QCBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuCiBBZGRpbmcgZmlsZSBzeXN0ZW0gL3d3dy9z aXRlMQogVGVzdGluZyBmaWxlIHN5c3RlbSBtYXBwaW5nLgogICAgIGZpbGUgc3lzdGVtIHBhdGhz OgotICAgICAtIC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbyhpZCA9IDBAZm9vKQotICAgICAt IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2JhcihpZCA9IDFAYmFyKQotICAgICAtIC93d3cvc2l0 ZTEoaWQgPSAyQHNpdGUxKQorICAgICAtIC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbworICAg ICAtIC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2JhcgorICAgICAtIC93d3cvc2l0ZTEKICAgICBm aWxlU3lzdGVtUGF0aEZvclByZWZpeDoKICAgICAgICAgL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMv Zm9vID0+IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbwogICAgICAgICAvaG9tZS91c2VybmFt ZS9wcm9qZWN0cy9iYXIgPT4gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyCkBAIC00MCw5ICs0 MCw5IEBAIFRlc3RpbmcgZmlsZSBzeXN0ZW0gbWFwcGluZy4KIENyZWF0aW5nIGFub3RoZXIgZmls ZSBzeXN0ZW0gbWFwcGluZy4KIFRlc3RpbmcgZmlsZSBzeXN0ZW0gbWFwcGluZy4KICAgICBmaWxl IHN5c3RlbSBwYXRoczoKLSAgICAgLSAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9mb28oaWQgPSAw QGZvbykKLSAgICAgLSAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9iYXIoaWQgPSAxQGJhcikKLSAg ICAgLSAvd3d3L3NpdGUxKGlkID0gMkBzaXRlMSkKKyAgICAgLSAvaG9tZS91c2VybmFtZS9wcm9q ZWN0cy9mb28KKyAgICAgLSAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9iYXIKKyAgICAgLSAvd3d3 L3NpdGUxCiAgICAgZmlsZVN5c3RlbVBhdGhGb3JQcmVmaXg6CiAgICAgICAgIC9ob21lL3VzZXJu YW1lL3Byb2plY3RzL2ZvbyA9PiAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9mb28KICAgICAgICAg L2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyID0+IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2Jh cgpAQCAtNTQsOCArNTQsOCBAQCBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuCiBSZW1vdmlu ZyBmaWxlIHN5c3RlbSAvd3d3L3NpdGUxCiBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuCiAg ICAgZmlsZSBzeXN0ZW0gcGF0aHM6Ci0gICAgIC0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9v KGlkID0gMEBmb28pCi0gICAgIC0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyKGlkID0gMUBi YXIpCisgICAgIC0gL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvZm9vCisgICAgIC0gL2hvbWUvdXNl cm5hbWUvcHJvamVjdHMvYmFyCiAgICAgZmlsZVN5c3RlbVBhdGhGb3JQcmVmaXg6CiAgICAgICAg IC9ob21lL3VzZXJuYW1lL3Byb2plY3RzL2ZvbyA9PiAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9m b28KICAgICAgICAgL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyID0+IC9ob21lL3VzZXJuYW1l L3Byb2plY3RzL2JhcgpAQCAtNjUsNyArNjUsNyBAQCBUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBp bmcuCiBSZW1vdmluZyBmaWxlIHN5c3RlbSAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9mb28KIFRl c3RpbmcgZmlsZSBzeXN0ZW0gbWFwcGluZy4KICAgICBmaWxlIHN5c3RlbSBwYXRoczoKLSAgICAg LSAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9iYXIoaWQgPSAxQGJhcikKKyAgICAgLSAvaG9tZS91 c2VybmFtZS9wcm9qZWN0cy9iYXIKICAgICBmaWxlU3lzdGVtUGF0aEZvclByZWZpeDoKICAgICAg ICAgL2hvbWUvdXNlcm5hbWUvcHJvamVjdHMvYmFyID0+IC9ob21lL3VzZXJuYW1lL3Byb2plY3Rz L2JhcgogICAgICAgICAvaG9tZS91c2VybmFtZS9wcm9qZWN0cy9iYXIgPT4gL2hvbWUvdXNlcm5h bWUvcHJvamVjdHMvYmFyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZmlsZS1z eXN0ZW0tbWFwcGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2ZpbGUtc3lzdGVtLW1h cHBpbmcuaHRtbAppbmRleCA4MDkyYzgzYjRhOWE1Mjg2MTYwMmE3OTc3ZjNhNjdjZTlhYzVkMzQ5 Li5jY2IxYWU5YzJiYzk0NDdmNTg0ZWFhNGUxMjE5MDI5OWY1MjE1OTQyIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZmlsZS1zeXN0ZW0tbWFwcGluZy5odG1sCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9maWxlLXN5c3RlbS1tYXBwaW5nLmh0bWwKQEAgLTI3LDEwICsyNyw4 IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB2YXIgZmlsZVN5c3RlbVBhdGhzID0gZmlsZVN5 c3RlbU1hcHBpbmcuZmlsZVN5c3RlbVBhdGhzKCk7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJUZXN0aW5nIGZpbGUgc3lzdGVtIG1hcHBpbmcuIik7CiAgICAgICAgIEluc3BlY3Rv clRlc3QuYWRkUmVzdWx0KCIgICAgZmlsZSBzeXN0ZW0gcGF0aHM6Iik7Ci0gICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgZmlsZVN5c3RlbVBhdGhzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAg ICB2YXIgaWQgPSBmaWxlU3lzdGVtTWFwcGluZy5maWxlU3lzdGVtSWQoZmlsZVN5c3RlbVBhdGhz W2ldKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgICAgIC0gIiArIGZp bGVTeXN0ZW1QYXRoc1tpXSArICIoaWQgPSAiICsgaWQgKyAiKSIpOwotICAgICAgICB9CisgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZmlsZVN5c3RlbVBhdGhzLmxlbmd0aDsgKytpKQorICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICAgLSAiICsgZmlsZVN5c3RlbVBh dGhzW2ldKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICBmaWxlU3lzdGVt UGF0aEZvclByZWZpeDoiKTsKICAgICAgICAgLy8gQ2FsbCBmaWxlU3lzdGVtUGF0aEZvclByZWZp eCB0d2ljZSBmb3IgZWFjaCBwYXRoIHByZWZpeCB0byBjaGVjayBjYWNoaW5nLgogICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IDI7ICsraSkgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2ZpbGUtc3lzdGVtLXByb2plY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2ZpbGUtc3lzdGVtLXByb2plY3QtZXhwZWN0ZWQudHh0CmluZGV4IDNjOGI5MTQxMjQy YjhkMTg3MWI5OGY5ZWVjYTQ3MDljZWI5MGY4NzkuLjE0MzcwMzU2NmZjZTlmM2QzNjUyMjlhNjI4 OTFjNjYxYTBlNzhlMTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9maWxlLXN5 c3RlbS1wcm9qZWN0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZmls ZS1zeXN0ZW0tcHJvamVjdC1leHBlY3RlZC50eHQKQEAgLTI0LDExICsyNCwxMSBAQCBNaW1lIHR5 cGU6IHRleHQvamF2YXNjcmlwdAogVUlTb3VyY2VDb2RlIGNvbnRlbnQ6IDxiYXogY29udGVudD4K IAogVUlTb3VyY2VDb2RlIHVyaSB0byB1cmwgbWFwcGluZ3M6Ci0gICAgMEB3d3cvbG9jYWxob3N0 L2Zvby5qcyAtPiBodHRwOi8vbG9jYWxob3N0L2Zvby5qcwotICAgIDFAYmFyL2Jhei5qcyAtPiBo dHRwOi8vd3d3LmV4YW1wbGUuY29tL2Jhei5qcworICAgIGZpbGVzeXN0ZW06L3Zhci93d3cvbG9j YWxob3N0L2Zvby5qcyAtPiBodHRwOi8vbG9jYWxob3N0L2Zvby5qcworICAgIGZpbGVzeXN0ZW06 L2Zvby9iYXIvYmF6LmpzIC0+IGh0dHA6Ly93d3cuZXhhbXBsZS5jb20vYmF6LmpzCiBVSVNvdXJj ZUNvZGUgdXJsIHRvIHVyaSBtYXBwaW5nczoKLSAgICBodHRwOi8vbG9jYWxob3N0L2Zvby5qcyAt PiAwQHd3dy9sb2NhbGhvc3QvZm9vLmpzCi0gICAgaHR0cDovL3d3dy5leGFtcGxlLmNvbS9iYXou anMgLT4gMUBiYXIvYmF6LmpzCisgICAgaHR0cDovL2xvY2FsaG9zdC9mb28uanMgLT4gZmlsZXN5 c3RlbTovdmFyL3d3dy9sb2NhbGhvc3QvZm9vLmpzCisgICAgaHR0cDovL3d3dy5leGFtcGxlLmNv bS9iYXouanMgLT4gZmlsZXN5c3RlbTovZm9vL2Jhci9iYXouanMKIFJlbW92aW5nIHNlY29uZCBm aWxlIHN5c3RlbS4KICAgICBudW1iZXIgb2YgdWlTb3VyY2VDb2RlcyBpbiB3b3Jrc3BhY2UgYWZ0 ZXIgcmVtb3Zpbmcgc2Vjb25kIGZpbGUgc3lzdGVtOiAxCiBSZW1vdmluZyBmaXJzdCBmaWxlIHN5 c3RlbS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3Jrc3BhY2UtbWFwcGlu Zy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmct ZXhwZWN0ZWQudHh0CmluZGV4IDk2OTFhZDZhOGUzNDhjOTNiZDA1ODZlMzZiMWNhMDk4ZGNmYjQx MDEuLjViMTRjMzQ5NDZmNzFkNzQ4NjNhOGZjOGJmZGNiNjJmZTdjOTU4Y2UgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci93b3Jrc3BhY2UtbWFwcGluZy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtzcGFjZS1tYXBwaW5nLWV4cGVjdGVkLnR4dApA QCAtNiw3ICs2LDcgQEAgVGVzdHMgd29ya3NwYWNlIG1hcHBpbmdzCiAgICAgdXJsIGh0dHBzOi8v bG9jYWxob3N0L2luZGV4Lmh0bWwgaXMgbm90IG1hcHBlZC4KIAogICAgIHVybCBodHRwOi8vd3d3 LmV4YW1wbGUuY29tL2luZGV4Lmh0bWwgaXMgbWFwcGVkIHRvIGh0dHA6Ly93d3cuZXhhbXBsZS5j b20vaW5kZXguaHRtbAotICAgIHVybCBodHRwOi8vbG9jYWxob3N0L2luZGV4Lmh0bWwgaXMgbWFw cGVkIHRvIDBAd3d3L2xvY2FsaG9zdC9pbmRleC5odG1sCisgICAgdXJsIGh0dHA6Ly9sb2NhbGhv c3QvaW5kZXguaHRtbCBpcyBtYXBwZWQgdG8gZmlsZXN5c3RlbTovdmFyL3d3dy9sb2NhbGhvc3Qv aW5kZXguaHRtbAogICAgIHVybCBodHRwOi8vbG9jYWxob3N0L2Zvby9pbmRleC5odG1sIGlzIG1h cHBlZCB0byBudWxsCiAgICAgdXJsIGh0dHBzOi8vbG9jYWxob3N0L2luZGV4Lmh0bWwgaXMgbWFw cGVkIHRvIGh0dHBzOi8vbG9jYWxob3N0L2luZGV4Lmh0bWwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3dvcmtzcGFjZS1tYXBwaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmcuaHRtbAppbmRleCAzNDgzNzg5M2IyOWYxYzhkMWFjYmQy YmMwMTM3MTA0Njc1MDg2MGMxLi43ZTZmOTgxNTU5MDY2ZDNiYTk4MTkzZDRiMWRkZDY5Nzc3MzMy OTE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmcu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya3NwYWNlLW1hcHBpbmcuaHRtbApA QCAtNDUsNyArNDUsOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBmaWxlTWFwcGluZy5zZXRNYXBw aW5nRW50cmllcyhtYXBwaW5nRW50cmllcyk7CiAKICAgICB2YXIgZmlsZVN5c3RlbU1hcHBpbmcg PSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1NYXBwaW5nSW1wbCgpOwotICAgIHZhciBwcm9q ZWN0SWQgPSBmaWxlU3lzdGVtTWFwcGluZy5hZGRGaWxlU3lzdGVtTWFwcGluZygiL3Zhci93d3ci KTsKKyAgICB2YXIgZmlsZVN5c3RlbVBhdGggPSAiL3Zhci93d3ciOworICAgIHZhciBwcm9qZWN0 SWQgPSBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm9qZWN0SWQoZmls ZVN5c3RlbVBhdGgpOworICAgIGZpbGVTeXN0ZW1NYXBwaW5nLmFkZEZpbGVTeXN0ZW1NYXBwaW5n KCIvdmFyL3d3dyIpOwogCiAgICAgdmFyIHdvcmtzcGFjZSA9IG5ldyBXZWJJbnNwZWN0b3IuV29y a3NwYWNlKGZpbGVNYXBwaW5nLCBmaWxlU3lzdGVtTWFwcGluZyk7CiAK