85486 2012-05-03 06:01:53 -0700 Web Inspector: make Script a ContentProvider. 2012-05-03 09:25:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 615210 0 pfeldman 2012-05-03 06:01:53 -0700 This allows us to get rid of the corresponding content provider wrapper. 615325 1 140030 pfeldman 2012-05-03 09:10:46 -0700 Created attachment 140030 Patch 615336 2 pfeldman 2012-05-03 09:25:16 -0700 Committed r115979: <http://trac.webkit.org/changeset/115979> 140030 2012-05-03 09:10:46 -0700 2012-05-03 09:22:12 -0700 Patch bug-85486-20120503201044.patch text/plain 19101 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhlN2Q2YzBjNDkwZDJh NjU5YzU2ZDMyNTc2MDMyNzhkMTE1Mjg5OS4uY2NhNjQ0YTNhNGU3ZTdkMTQ1ZjE1NTNiNjRjNTA0 N2M1MjI4YTYzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTAzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2UgU2NyaXB0IGEgQ29udGVudFByb3ZpZGVyLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODU0ODYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBnZXQgcmlkIG9mIHRo ZSBjb3JyZXNwb25kaW5nIGNvbnRlbnQgcHJvdmlkZXIgd3JhcHBlci4KKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVycy5qczoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3 U291cmNlQ29kZS5wcm90b3R5cGUuX2NyZWF0ZUNvbnRlbnRQcm92aWRlcik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Ny aXB0LnByb3RvdHlwZS5jb250ZW50VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHQu cHJvdG90eXBlLnJlcXVlc3RDb250ZW50LmRpZEdldFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2NyZWF0ZVVJU291cmNlQ29kZUZv clNjcmlwdCk6CisKIDIwMTItMDUtMDMgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbXBpbGUgdGltZSBhbWJpZ3VpdHkg aGFwcGVucyB3aGVuIEkgdHJ5IHRvIGFzc2lnbiBhIFR5cGVCdWlsZGVyIG9iamVjdCB0byBhbiBv dXQgYXJndW1lbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbnRlbnRQcm92aWRlcnMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbnRlbnRQcm92aWRlcnMuanMKaW5kZXggNmYwNzRhOGUxMzc2ZmJjMWIyODQ5OGM1MTBi MmZjYmVlNTAxYTZhYy4uZTVmZmJlNWExZGZmM2U0ODVkZmQ1MjlkZmJmZmFhZmY4ZTcxNTdjNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJv dmlkZXJzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVu dFByb3ZpZGVycy5qcwpAQCAtMzEsNTIgKzMxLDYgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAg KiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlcn0KLSAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlNjcmlwdH0gc2NyaXB0Ci0gKi8KLVdlYkluc3BlY3Rvci5TY3JpcHRDb250 ZW50UHJvdmlkZXIgPSBmdW5jdGlvbihzY3JpcHQpCi17Ci0gICAgdGhpcy5fbWltZVR5cGUgPSAi dGV4dC9qYXZhc2NyaXB0IjsKLSAgICB0aGlzLl9zY3JpcHQgPSBzY3JpcHQ7Ci19Ci0KLVdlYklu c3BlY3Rvci5TY3JpcHRDb250ZW50UHJvdmlkZXIucHJvdG90eXBlID0gewotICAgIC8qKgotICAg ICAqIEByZXR1cm4gez9zdHJpbmd9Ci0gICAgICovCi0gICAgY29udGVudFVSTDogZnVuY3Rpb24o KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NjcmlwdC5zb3VyY2VVUkw7Ci0gICAgfSwK LQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmlu Zyl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxi YWNrKQotICAgIHsKLSAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdFNvdXJjZShzb3VyY2UpCi0g ICAgICAgIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKHNvdXJjZSwgZmFsc2UsIHRoaXMuX21pbWVU eXBlKTsKLSAgICAgICAgfQotICAgICAgICB0aGlzLl9zY3JpcHQucmVxdWVzdFNvdXJjZShkaWRS ZXF1ZXN0U291cmNlLmJpbmQodGhpcykpOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFy YW0ge3N0cmluZ30gcXVlcnkKLSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGNhc2VTZW5zaXRpdmUK LSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzUmVnZXgKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9u KEFycmF5LjxXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyLlNlYXJjaE1hdGNoPil9IGNhbGxi YWNrCi0gICAgICovCi0gICAgc2VhcmNoSW5Db250ZW50OiBmdW5jdGlvbihxdWVyeSwgY2FzZVNl bnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spCi0gICAgewotICAgICAgICB0aGlzLl9zY3JpcHQu c2VhcmNoSW5Db250ZW50KHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjayk7 Ci0gICAgfQotfQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0Q29udGVudFByb3ZpZGVyLnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsKLQot LyoqCi0gKiBAY29uc3RydWN0b3IKLSAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGVu dFByb3ZpZGVyfQogICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlNjcmlwdD59IHNjcmlw dHMKICAqLwogV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIg PSBmdW5jdGlvbihzY3JpcHRzKQpAQCAtMTMzLDE0ICs4NywxNCBAQCBXZWJJbnNwZWN0b3IuQ29u Y2F0ZW5hdGVkU2NyaXB0c0NvbnRlbnRQcm92aWRlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICB2YXIgc2NyaXB0cyA9IHRoaXMuX3NvcnRlZFNjcmlwdHMoKTsKICAgICAgICAgdmFyIHNv dXJjZXMgPSBbXTsKLSAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdFNvdXJjZShzb3VyY2UpCisg ICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RTb3VyY2UoY29udGVudCwgY29udGVudEVuY29kZWQs IG1pbWVUeXBlKQogICAgICAgICB7Ci0gICAgICAgICAgICBzb3VyY2VzLnB1c2goc291cmNlKTsK KyAgICAgICAgICAgIHNvdXJjZXMucHVzaChjb250ZW50KTsKICAgICAgICAgICAgIGlmIChzb3Vy Y2VzLmxlbmd0aCA9PSBzY3JpcHRzLmxlbmd0aCkKICAgICAgICAgICAgICAgICBjYWxsYmFjayh0 aGlzLl9jb25jYXRlbmF0ZVNjcmlwdHNDb250ZW50KHNjcmlwdHMsIHNvdXJjZXMpLCBmYWxzZSwg dGhpcy5fbWltZVR5cGUpOwogICAgICAgICB9CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg c2NyaXB0cy5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHNjcmlwdHNbaV0ucmVxdWVzdFNvdXJj ZShkaWRSZXF1ZXN0U291cmNlLmJpbmQodGhpcykpOworICAgICAgICAgICAgc2NyaXB0c1tpXS5y ZXF1ZXN0Q29udGVudChkaWRSZXF1ZXN0U291cmNlLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAg ICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3 U291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3U291 cmNlQ29kZS5qcwppbmRleCA2M2Y3YzkxYzQ2OTdiN2ZiNTIzOTJmMTUxNTY5ZDkzY2Q5ODFhODIx Li41Y2NhOGYxMDE3MDhlNjQzNWU1MGQ5ZThhOTMwN2NhN2ZjN2M0OWIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpzCkBAIC0x NjcsNyArMTY3LDcgQEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlID0gewog ICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fcmVz b3VyY2U7CiAgICAgICAgIGlmICh0aGlzLl9zY3JpcHRzLmxlbmd0aCA9PT0gMSAmJiAhdGhpcy5f c2NyaXB0c1swXS5saW5lT2Zmc2V0ICYmICF0aGlzLl9zY3JpcHRzWzBdLmNvbHVtbk9mZnNldCkK LSAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRQcm92aWRl cih0aGlzLl9zY3JpcHRzWzBdKTsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9zY3JpcHRzWzBd OwogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3JpcHRzQ29u dGVudFByb3ZpZGVyKHRoaXMuX3NjcmlwdHMpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKaW5kZXggYzM4MzU2ZTJlYjhlM2RhZjA1ZWU4 M2Q3OTM4MjFhM2FmZmI5ODc4MC4uMWY5NmM0MmI5MDA3NThiMjA4ZDYzZWRlMDY2NTA3YzM5ZGVk ZWE1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMK QEAgLTI1LDYgKzI1LDcgQEAKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKKyAqIEBpbXBsZW1lbnRz IHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfQogICogQHBhcmFtIHtzdHJpbmd9IHNjcmlw dElkCiAgKiBAcGFyYW0ge3N0cmluZ30gc291cmNlVVJMCiAgKiBAcGFyYW0ge251bWJlcn0gc3Rh cnRMaW5lCkBAIC00OSwxMiArNTAsMjAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdCA9IGZ1bmN0aW9u KHNjcmlwdElkLCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZEwKIAogV2Vi SW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtm dW5jdGlvbihzdHJpbmcpfSBjYWxsYmFjaworICAgICAqIEByZXR1cm4gez9zdHJpbmd9CiAgICAg ICovCi0gICAgcmVxdWVzdFNvdXJjZTogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgY29udGVudFVS TDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuc291cmNlVVJMOworICAg IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcsYm9vbGVhbixz dHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihj YWxsYmFjaykKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zb3VyY2UpIHsKLSAgICAgICAgICAg IGNhbGxiYWNrKHRoaXMuX3NvdXJjZSk7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9zb3Vy Y2UsIGZhbHNlLCAidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIApAQCAtNjYsMTMgKzc1LDEzIEBAIFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBl ID0gewogICAgICAgICBmdW5jdGlvbiBkaWRHZXRTY3JpcHRTb3VyY2UoZXJyb3IsIHNvdXJjZSkK ICAgICAgICAgewogICAgICAgICAgICAgdGhpcy5fc291cmNlID0gZXJyb3IgPyAiIiA6IHNvdXJj ZTsKLSAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX3NvdXJjZSk7CisgICAgICAgICAgICBjYWxs YmFjayh0aGlzLl9zb3VyY2UsIGZhbHNlLCAidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKHRoaXMuc2NyaXB0SWQpIHsKICAgICAgICAgICAgIC8vIFNjcmlwdCBmYWls ZWQgdG8gcGFyc2UuCiAgICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmdldFNjcmlwdFNvdXJjZSh0 aGlzLnNjcmlwdElkLCBkaWRHZXRTY3JpcHRTb3VyY2UuYmluZCh0aGlzKSk7CiAgICAgICAgIH0g ZWxzZQotICAgICAgICAgICAgY2FsbGJhY2soIiIpOworICAgICAgICAgICAgY2FsbGJhY2soIiIs IGZhbHNlLCAidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzCmluZGV4 IGNjMDk4NTdmNzk1ODYzNDhjNTk5NTUwYTUzMDRkNjQyZjFkYTE3N2MuLjQwNTFkNTM0N2JhMjE1 MDRmMGMwMDI5NGY3N2EzODI5NjU2NzNiYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU25pcHBldHNNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMKQEAgLTQxNiw3ICs0MTYsNyBAQCBX ZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBfY3JlYXRlVUlTb3VyY2VDb2RlRm9yU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAg ewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 U291cmNlKHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VVUkwsIG5ldyBXZWJJbnNwZWN0 b3IuU2NyaXB0Q29udGVudFByb3ZpZGVyKHNjcmlwdCkpOworICAgICAgICB2YXIgdWlTb3VyY2VD b2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHNjcmlwdC5zb3VyY2VVUkws IHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdCk7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc1NuaXBw ZXRFdmFsdWF0aW9uID0gdHJ1ZTsKICAgICAgICAgdmFyIG9sZFVJU291cmNlQ29kZSA9IHRoaXMu X3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF07CiAgICAgICAgIHRoaXMu X3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSB1aVNvdXJjZUNvZGU7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10 ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5q cwppbmRleCA5NDJjNzk5ODVmYzc5NjY3MmYwNmMwM2JjODZiMmJmMWVkZmZjMmJiLi44NWI4YWQz NzdjNzk0MjIyNzE2OWI0NzE3YjYxODhlZTA1OGRiOTEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCisrKyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKQEAgLTI5MCw3ICsyOTAsNyBA QCBJbnNwZWN0b3JUZXN0LmNyZWF0ZVNjcmlwdE1vY2sgPSBmdW5jdGlvbih1cmwsIHN0YXJ0TGlu ZSwgc3RhcnRDb2x1bW4sIGlzQ29udGVudAogICAgIHZhciBlbmRMaW5lID0gc3RhcnRMaW5lICsg bGluZUNvdW50IC0gMTsKICAgICB2YXIgZW5kQ29sdW1uID0gbGluZUNvdW50ID09PSAxID8gc3Rh cnRDb2x1bW4gKyBzb3VyY2UubGVuZ3RoIDogc291cmNlLmxlbmd0aCAtIHNvdXJjZS5saW5lRW5k aW5ncygpW2xpbmVDb3VudCAtIDJdOwogICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9y LlNjcmlwdChzY3JpcHRJZCwgdXJsLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBl bmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7Ci0gICAgc2NyaXB0LnJlcXVlc3RTb3VyY2UgPSBm dW5jdGlvbihjYWxsYmFjaykgeyBjYWxsYmFjayhzb3VyY2UpOyB9OworICAgIHNjcmlwdC5yZXF1 ZXN0Q29udGVudCA9IGZ1bmN0aW9uKGNhbGxiYWNrKSB7IGNhbGxiYWNrKHNvdXJjZSk7IH07CiAg ICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuX3NjcmlwdHNbc2NyaXB0SWRdID0gc2NyaXB0 OwogICAgIHJldHVybiBzY3JpcHQ7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL2NvbnRlbnQtcHJvdmlkZXJzLWV4cGVjdGVkLnR4dAppbmRleCA5 MDU2MWRmYjcyNGQ1YzY0MTkwY2QzZDc3ZTIzYzViZmUzYTQzOWEyLi44ZjY0YjI4NmZlMmQxNmI2 YTAyZjRhZGRiZGM0Nzk0MWRmMmMwYjRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy1leHBlY3RlZC50eHQKQEAg LTEsOCArMSw2IEBACiBUZXN0cyBDb250ZW50UHJvdmlkZXIgaW1wbGVtZW50YXRpb25zLgogCiAK LVJ1bm5pbmc6IHRlc3RTY3JpcHRDb250ZW50UHJvdmlkZXIKLQogUnVubmluZzogdGVzdENvbmNh dGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIKICAgPHNjcmlwdD5mdW5jdGlvbiBmb28oKSB7 IHJldHVybiAwOyB9PC9zY3JpcHQ+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxzY3JpcHQ+ZnVuY3Rpb24gYmFyKCkgeyByZXR1 cm4gMDsgfTwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL2NvbnRlbnQtcHJvdmlkZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvY29udGVudC1wcm92aWRlcnMuaHRtbAppbmRleCBlZWYzYTM3NjY3ZDZiNDBjZDI4YWFkNGQx OGZjYTc2YmQ1YWRlYmM4Li5lNTk4NjhiNDU1ZGJjY2QzMTMyZTlhZTVmMmRmY2IwNDNjYWUwMDMz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92 aWRlcnMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1w cm92aWRlcnMuaHRtbApAQCAtMTAsOSArMTAsOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICB7CiAg ICAgICAgIHJhbmdlID0gcmFuZ2UgfHwgWzAsIDAsIDEwMCwgMF07CiAgICAgICAgIHJldHVybiB7 Ci0gICAgICAgICAgICByZXF1ZXN0U291cmNlOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICAgICAg ICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKICAgICAgICAgICAgIHsKLSAg ICAgICAgICAgICAgICBjYWxsYmFjayhzb3VyY2UpOworICAgICAgICAgICAgICAgIGNhbGxiYWNr KHNvdXJjZSwgZmFsc2UsICJ0ZXh0L2phdmFzY3JpcHQiKTsKICAgICAgICAgICAgIH0sCiAgICAg ICAgICAgICBnZXQgbGluZU9mZnNldCgpIHsgcmV0dXJuIHJhbmdlWzBdOyB9LAogICAgICAgICAg ICAgZ2V0IGNvbHVtbk9mZnNldCgpIHsgcmV0dXJuIHJhbmdlWzFdOyB9LApAQCAtMjIsMjAgKzIy LDYgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgfQogCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0 U3VpdGUoWwotICAgICAgICBmdW5jdGlvbiB0ZXN0U2NyaXB0Q29udGVudFByb3ZpZGVyKG5leHQp Ci0gICAgICAgIHsKLSAgICAgICAgICAgIHZhciBtb2NrU2NyaXB0U291cmNlID0gImZ1bmN0aW9u IGZvbygpIHsgcmV0dXJuIDA7IH0iOwotICAgICAgICAgICAgdmFyIG1vY2tTY3JpcHQgPSBjcmVh dGVNb2NrU2NyaXB0KCJmb28uanMiLCBtb2NrU2NyaXB0U291cmNlKTsKLSAgICAgICAgICAgIHZh ciBjb250ZW50UHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRQcm92aWRl cihtb2NrU2NyaXB0KTsKLSAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KGNv bnRlbnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSkKLSAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9qYXZhc2NyaXB0IiwgbWlt ZVR5cGUpOwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKG1vY2tT Y3JpcHRTb3VyY2UsIGNvbnRlbnQpOwotICAgICAgICAgICAgICAgIG5leHQoKTsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGNvbnRlbnRQcm92aWRlci5yZXF1ZXN0Q29udGVudChkaWRSZXF1 ZXN0Q29udGVudCk7Ci0gICAgICAgIH0sCi0KICAgICAgICAgZnVuY3Rpb24gdGVzdENvbmNhdGVu YXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIobmV4dCkKICAgICAgICAgewogICAgICAgICAgICAg dmFyIHNjcmlwdHMgPSBbXTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci9yYXctc291cmNlLWNvZGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS1leHBlY3RlZC50eHQKaW5kZXggZmRhNjU1ZmE1MzA0 YTJjMTBiZWRlNzgxMDdiNDRhM2RiYzlkZDU3MS4uOWU0OTBhZGIzMGM5MGZhYmJjN2NiZGFmZjgy NDVkOTI2ZmQ4YTBiOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3Jhdy1zb3VyY2UtY29kZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS1leHBlY3RlZC50eHQKQEAgLTIsMTQgKzIsMzggQEAg VGVzdHMgUmF3U291cmNlQ29kZSBjbGFzcy4KIAogCiBSdW5uaW5nOiB0ZXN0U2NyaXB0V2l0aG91 dFJlc291cmNlCitVSVNvdXJjZUNvZGU6IGZvby5qcworVUlTb3VyY2VDb2RlIGlzIGNvbnRlbnQg c2NyaXB0OiB0cnVlCitNaW1lIHR5cGU6IHVuZGVmaW5lZAorU2NyaXB0IHNvdXJjZTogPHNjcmlw dCBzb3VyY2U+CiAKIFJ1bm5pbmc6IHRlc3RIVE1MV2l0aFBlbmRpbmdSZXNvdXJjZQorVUlTb3Vy Y2VDb2RlOiBpbmRleC5odG1sCitVSVNvdXJjZUNvZGUgaXMgY29udGVudCBzY3JpcHQ6IGZhbHNl CitNaW1lIHR5cGU6IHRleHQvaHRtbAorU2NyaXB0IHNvdXJjZTogPHJlc291cmNlIGNvbnRlbnQ+ CiAKIFJ1bm5pbmc6IHRlc3RIVE1MV2l0aEZpbmlzaGVkUmVzb3VyY2UKK1VJU291cmNlQ29kZTog aW5kZXguaHRtbAorVUlTb3VyY2VDb2RlIGlzIGNvbnRlbnQgc2NyaXB0OiBmYWxzZQorTWltZSB0 eXBlOiB0ZXh0L2h0bWwKK1NjcmlwdCBzb3VyY2U6IDxyZXNvdXJjZSBjb250ZW50PgogCiBSdW5u aW5nOiB0ZXN0Rm9yY2VVcGRhdGVTb3VyY2VNYXBwaW5nCitNaW1lIHR5cGU6IHRleHQvaHRtbAor U2NyaXB0IHNvdXJjZTogICA8c2NyaXB0PjxzY3JpcHQgc291cmNlIDE+PC9zY3JpcHQ+CitNaW1l IHR5cGU6IHRleHQvaHRtbAorU2NyaXB0IHNvdXJjZTogICA8c2NyaXB0PjxzY3JpcHQgc291cmNl IDE+PC9zY3JpcHQ+IDxzY3JpcHQ+PHNjcmlwdCBzb3VyY2UgMj48L3NjcmlwdD4KK01pbWUgdHlw ZTogdGV4dC9odG1sCitTY3JpcHQgc291cmNlOiA8cmVzb3VyY2UgY29udGVudD4KIAogUnVubmlu ZzogdGVzdEZvcm1hdHRpbmdXaXRoRmluaXNoZWRSZXNvdXJjZQorTWltZSB0eXBlOiB0ZXh0L2ph dmFzY3JpcHQKK1NjcmlwdCBzb3VyY2U6IDxyZXNvdXJjZSBjb250ZW50PgorTWltZSB0eXBlOiB0 ZXh0L2phdmFzY3JpcHQKK1NjcmlwdCBzb3VyY2U6IDxmb3JtYXR0ZWQ+IDxyZXNvdXJjZSBjb250 ZW50PgorTWltZSB0eXBlOiB0ZXh0L2phdmFzY3JpcHQKK1NjcmlwdCBzb3VyY2U6IDxyZXNvdXJj ZSBjb250ZW50PgogCiBSdW5uaW5nOiB0ZXN0Rm9ybWF0dGluZ1dpdGhQZW5kaW5nUmVzb3VyY2UK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Jhdy1zb3VyY2Ut Y29kZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29k ZS5odG1sCmluZGV4IGUzMzE5YjNiMDliYTNkNDU2MDUzZTRjODE0NjRlMjg5ZWQ2YWE1MGIuLjQ3 ODdjMGIwY2JkY2Q2YzlkNjNjNWEwYzk2YzAwYTBlYWYzNzE1NjcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwKQEAgLTk2LDE4 ICs5NiwxNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIHZhciBzY3JpcHQgPSBJbnNw ZWN0b3JUZXN0LmNyZWF0ZVNjcmlwdE1vY2soImZvby5qcyIsIDAsIDAsIHRydWUsICI8c2NyaXB0 IHNvdXJjZT4iKTsKICAgICAgICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gY3JlYXRlUmF3U291 cmNlQ29kZShzY3JpcHQsIG51bGwpOwogCi0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dFRydWUoISFyYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSgpKTsKICAgICAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGUgPSByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSgpOwotICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImZvby5qcyIsIHVpU291cmNlQ29kZS51cmwpOwot ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHModHJ1ZSwgdWlTb3VyY2VDb2Rl LmlzQ29udGVudFNjcmlwdCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgi VUlTb3VyY2VDb2RlOiAiICsgcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGUoKS5pZCk7CisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiVUlTb3VyY2VDb2RlIGlzIGNvbnRlbnQg c2NyaXB0OiAiICsgdWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCk7CiAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmNoZWNrVUlMb2NhdGlvbih1aVNvdXJjZUNvZGUsIDAsIDUsIHJhd1NvdXJj ZUNvZGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24oY3JlYXRlUmF3TG9jYXRpb24oMCwgNSkpKTsK ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY2hlY2tSYXdMb2NhdGlvbihzY3JpcHQsIDEwLCAw LCByYXdTb3VyY2VDb2RlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKHVpU291cmNlQ29kZSwgMTAs IDApKTsKICAgICAgICAgICAgIHVpU291cmNlQ29kZS5yZXF1ZXN0Q29udGVudChkaWRSZXF1ZXN0 Q29udGVudCk7CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KGNvbnRl bnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9qYXZhc2NyaXB0IiwgbWltZVR5 cGUpOwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCI8c2NyaXB0 IHNvdXJjZT4iLCBjb250ZW50KTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdCgiTWltZSB0eXBlOiAiICsgbWltZVR5cGUpOworICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuYWRkUmVzdWx0KCJTY3JpcHQgc291cmNlOiAiICsgY29udGVudCk7CiAgICAgICAgICAg ICAgICAgbmV4dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9LApAQCAtMTMwLDE1ICsxMjks MTUgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnRUcnVlKCFldmVudC5kYXRhLm9sZFVJU291cmNlQ29kZSk7CiAgICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5hc3NlcnRUcnVlKCEhcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGUoKSk7CiAg ICAgICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHJhd1NvdXJjZUNvZGUudWlTb3VyY2VD b2RlKCk7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImluZGV4 Lmh0bWwiLCB1aVNvdXJjZUNvZGUudXJsKTsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscyhmYWxzZSwgdWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCk7CisgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlVJU291cmNlQ29kZTogIiArIHVp U291cmNlQ29kZS51cmwpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCJVSVNvdXJjZUNvZGUgaXMgY29udGVudCBzY3JpcHQ6ICIgKyB1aVNvdXJjZUNvZGUuaXNDb250 ZW50U2NyaXB0KTsKICAgICAgICAgICAgICAgICB1aVNvdXJjZUNvZGUucmVxdWVzdENvbnRlbnQo ZGlkUmVxdWVzdENvbnRlbnQpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlv biBkaWRSZXF1ZXN0Q29udGVudChjb250ZW50LCBjb250ZW50RW5jb2RlZCwgbWltZVR5cGUpCiAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMo InRleHQvaHRtbCIsIG1pbWVUeXBlKTsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFz c2VydEVxdWFscygiPHJlc291cmNlIGNvbnRlbnQ+IiwgY29udGVudCk7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIk1pbWUgdHlwZTogIiArIG1pbWVUeXBlKTsKKyAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiU2NyaXB0IHNvdXJjZTogIiAr IGNvbnRlbnQpOwogCiAgICAgICAgICAgICAgICAgcmF3U291cmNlQ29kZS5hZGRTY3JpcHQoc2Ny aXB0Mik7CiAgICAgICAgICAgICAgICAgcmF3U291cmNlQ29kZS5mb3JjZVVwZGF0ZVNvdXJjZU1h cHBpbmcoKTsKQEAgLTE1NiwxNCArMTU1LDE0IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydFRydWUoISFyYXdTb3VyY2VDb2RlLnVpU291cmNlQ29k ZSgpKTsKICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSByYXdTb3VyY2VDb2RlLnVpU291 cmNlQ29kZSgpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImluZGV4 Lmh0bWwiLCB1aVNvdXJjZUNvZGUudXJsKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0RXF1YWxzKGZhbHNlLCB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0KTsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJVSVNvdXJjZUNvZGU6ICIgKyB1aVNvdXJjZUNv ZGUudXJsKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJVSVNvdXJjZUNv ZGUgaXMgY29udGVudCBzY3JpcHQ6ICIgKyB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0KTsK ICAgICAgICAgICAgIHVpU291cmNlQ29kZS5yZXF1ZXN0Q29udGVudChkaWRSZXF1ZXN0Q29udGVu dCk7CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KGNvbnRlbnQsIGNv bnRlbnRFbmNvZGVkLCBtaW1lVHlwZSkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9odG1sIiwgbWltZVR5cGUpOwotICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCI8cmVzb3VyY2UgY29udGVudD4i LCBjb250ZW50KTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTWlt ZSB0eXBlOiAiICsgbWltZVR5cGUpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJTY3JpcHQgc291cmNlOiAiICsgY29udGVudCk7CiAKICAgICAgICAgICAgICAgICBy YXdTb3VyY2VDb2RlLmFkZFNjcmlwdChzY3JpcHQyKTsKICAgICAgICAgICAgICAgICByYXdTb3Vy Y2VDb2RlLmZvcmNlVXBkYXRlU291cmNlTWFwcGluZygpOwpAQCAtMTk3LDggKzE5Niw4IEBAIGZ1 bmN0aW9uIHRlc3QoKQogCiAgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudE9u ZVNjcmlwdChjb250ZW50LCBjb250ZW50RW5jb2RlZCwgbWltZVR5cGUpCiAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoInRleHQvaHRtbCIs IG1pbWVUeXBlKTsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygi ICA8c2NyaXB0PjxzY3JpcHQgc291cmNlIDE+PC8iICsgInNjcmlwdD4iLCBjb250ZW50KTsKKyAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTWltZSB0eXBlOiAiICsgbWlt ZVR5cGUpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJTY3JpcHQg c291cmNlOiAiICsgY29udGVudCk7CiAKICAgICAgICAgICAgICAgICByYXdTb3VyY2VDb2RlLmZv cmNlVXBkYXRlU291cmNlTWFwcGluZygpOwogICAgICAgICAgICAgICAgIHJhd1NvdXJjZUNvZGUu YWRkU2NyaXB0KHNjcmlwdDIpOwpAQCAtMjE1LDggKzIxNCw4IEBAIGZ1bmN0aW9uIHRlc3QoKQog CiAgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudFR3b1NjcmlwdHMoY29udGVu dCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBlKQogICAgICAgICAgICAgewotICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJ0ZXh0L2h0bWwiLCBtaW1lVHlwZSk7Ci0g ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoIiAgPHNjcmlwdD48c2Ny aXB0IHNvdXJjZSAxPjwvIiArICJzY3JpcHQ+IDxzY3JpcHQ+PHNjcmlwdCBzb3VyY2UgMj48LyIg KyAic2NyaXB0PiIsIGNvbnRlbnQpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJNaW1lIHR5cGU6ICIgKyBtaW1lVHlwZSk7CisgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoIlNjcmlwdCBzb3VyY2U6ICIgKyBjb250ZW50KTsKIAogICAgICAg ICAgICAgICAgIHJhd1NvdXJjZUNvZGUuZm9yY2VVcGRhdGVTb3VyY2VNYXBwaW5nKCk7CiAgICAg ICAgICAgICAgICAgd2FpdEZvclVJU291cmNlQ29kZUNoYW5nZWRFdmVudChyYXdTb3VyY2VDb2Rl LCByZXF1ZXN0Q29udGVudFJlcXVlc3QpOwpAQCAtMjMyLDggKzIzMSw4IEBAIGZ1bmN0aW9uIHRl c3QoKQogCiAgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudFJlcXVlc3QoY29u dGVudCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBlKQogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJ0ZXh0L2h0bWwiLCBtaW1lVHlwZSk7 Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoIjxyZXNvdXJjZSBj b250ZW50PiIsIGNvbnRlbnQpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCJNaW1lIHR5cGU6ICIgKyBtaW1lVHlwZSk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIlNjcmlwdCBzb3VyY2U6ICIgKyBjb250ZW50KTsKIAogICAgICAgICAg ICAgICAgIHJhd1NvdXJjZUNvZGUuYWRkU2NyaXB0KHNjcmlwdDMpOwogICAgICAgICAgICAgICAg IHJhd1NvdXJjZUNvZGUuZm9yY2VVcGRhdGVTb3VyY2VNYXBwaW5nKCk7CkBAIC0yNTcsOCArMjU2 LDggQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RD b250ZW50KGNvbnRlbnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSkKICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygidGV4dC9qYXZhc2Ny aXB0IiwgbWltZVR5cGUpOwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1 YWxzKCI8cmVzb3VyY2UgY29udGVudD4iLCBjb250ZW50KTsKKyAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiTWltZSB0eXBlOiAiICsgbWltZVR5cGUpOworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJTY3JpcHQgc291cmNlOiAiICsgY29udGVu dCk7CiAKICAgICAgICAgICAgICAgICByYXdTb3VyY2VDb2RlLnNldEZvcm1hdHRlZCh0cnVlKTsK ICAgICAgICAgICAgICAgICB3YWl0Rm9yVUlTb3VyY2VDb2RlQ2hhbmdlZEV2ZW50KHJhd1NvdXJj ZUNvZGUsIHJlcXVlc3RGb3JtYXR0ZWRDb250ZW50KTsKQEAgLTI3Niw4ICsyNzUsOCBAQCBmdW5j dGlvbiB0ZXN0KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdEZvcm1hdHRlZENv bnRlbnQoY29udGVudCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBlKQogICAgICAgICAgICAgewot ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJ0ZXh0L2phdmFzY3Jp cHQiLCBtaW1lVHlwZSk7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVh bHMoIjxmb3JtYXR0ZWQ+IDxyZXNvdXJjZSBjb250ZW50PiIsIGNvbnRlbnQpOworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJNaW1lIHR5cGU6ICIgKyBtaW1lVHlwZSk7 CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlNjcmlwdCBzb3VyY2U6 ICIgKyBjb250ZW50KTsKIAogICAgICAgICAgICAgICAgIHdhaXRGb3JVSVNvdXJjZUNvZGVDaGFu Z2VkRXZlbnQocmF3U291cmNlQ29kZSwgcmVxdWVzdE5vdEZvcm1hdHRlZENvbnRlbnQpOwogICAg ICAgICAgICAgICAgIHJhd1NvdXJjZUNvZGUuc2V0Rm9ybWF0dGVkKGZhbHNlKTsKQEAgLTI5NCw4 ICsyOTMsOCBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlkUmVx dWVzdE5vdEZvcm1hdHRlZENvbnRlbnQoY29udGVudCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBl KQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1 YWxzKCJ0ZXh0L2phdmFzY3JpcHQiLCBtaW1lVHlwZSk7Ci0gICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hc3NlcnRFcXVhbHMoIjxyZXNvdXJjZSBjb250ZW50PiIsIGNvbnRlbnQpOworICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJNaW1lIHR5cGU6ICIgKyBtaW1l VHlwZSk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlNjcmlwdCBz b3VyY2U6ICIgKyBjb250ZW50KTsKIAogICAgICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAg ICAgIH0K