34926 2010-02-14 05:21:17 -0800 Web Inspector: XPathResult objects are not expanded in console. 2010-02-15 02:21:05 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 190310 0 pfeldman 2010-02-14 05:21:17 -0800 You can see "Error dispatching: getProperties" in console upon value "expand" attempt instead. I'd like to commit couple of drive-by fixes with this: 1) Use Object.getOwnPropertyNames in getProperties (as already used in completion) 2) Artificially append __proto__ property in case getting only own properties in order to allow further values browsing. 190311 1 48719 pfeldman 2010-02-14 05:26:55 -0800 Created attachment 48719 [PATCH] Proposed fix. 190408 2 pfeldman 2010-02-15 02:21:05 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/console-dir-expected.txt M LayoutTests/inspector/console-dir.html M WebCore/ChangeLog M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/ObjectPropertiesSection.js M WebCore/inspector/front-end/Section.js M WebCore/inspector/front-end/inspector.css Committed r54769 48719 2010-02-14 05:26:55 -0800 2010-02-14 12:34:19 -0800 [PATCH] Proposed fix. console_dir text/plain 12466 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNTc5NWI5Li45NmYzMmU0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDIt MTQgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogWFBhdGhS ZXN1bHQgb2JqZWN0cyBhcmUgbm90IGV4cGFuZGVkIGluIGNvbnNvbGUuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0OTI2CisKKyAgICAgICAgKiBp bnNwZWN0b3IvY29uc29sZS1kaXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9j b25zb2xlLWRpci5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlLXRlc3RzLmpzOgor CiAyMDEwLTAyLTEzICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW1F0XSBTa2lwIG5ldyB0ZXN0IHRoYXQgZmFpbHMuIFNlZSBodHRwczovL3dlYmtpdC5v cmcvYi8zNDkxOC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWRp ci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS1kaXItZXhwZWN0 ZWQudHh0CmluZGV4IDA3NzliYTUuLjVlOTMxMDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9jb25zb2xlLWRpci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2NvbnNvbGUtZGlyLWV4cGVjdGVkLnR4dApAQCAtMSw5ICsxLDI2IEBACi1DT05TT0xFIE1F U1NBR0U6IGxpbmUgOTogW29iamVjdCBIVE1MRG9jdW1lbnRdCi1DT05TT0xFIE1FU1NBR0U6IGxp bmUgMTA6IHRlc3QxLHRlc3QyCi1DT05TT0xFIE1FU1NBR0U6IGxpbmUgMTE6IFtvYmplY3QgTm9k ZUxpc3RdCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogdGVzdDEsdGVzdDIKK0NPTlNPTEUgTUVT U0FHRTogbGluZSAxMDogW29iamVjdCBOb2RlTGlzdF0KK0NPTlNPTEUgTUVTU0FHRTogbGluZSAx MTogW29iamVjdCBYUGF0aFJlc3VsdF0KIFRlc3RzIHRoYXQgY29uc29sZSBsb2dnaW5nIGR1bXBz IHByb3BlciBtZXNzYWdlcy4KIAotY29uc29sZS1kaXIuaHRtbDo5SFRNTERvY3VtZW50Ci1jb25z b2xlLWRpci5odG1sOjEwQXJyYXkKLWNvbnNvbGUtZGlyLmh0bWw6MTFOb2RlTGlzdAorQXJyYXkK Kz4+PiAwID0gInRlc3QxIgorPj4+IDEgPSAidGVzdDIiCis+Pj4gbGVuZ3RoID0gMgorPj4+IF9f cHJvdG9fXyA9IEFycmF5CitOb2RlTGlzdAorPj4+IDAgPSBIVE1MSHRtbEVsZW1lbnQKKz4+PiBj b25zdHJ1Y3RvciA9IE5vZGVMaXN0Q29uc3RydWN0b3IKKz4+PiBsZW5ndGggPSAxCis+Pj4gX19w cm90b19fID0gTm9kZUxpc3RQcm90b3R5cGUKK1hQYXRoUmVzdWx0Cis+Pj4gYm9vbGVhblZhbHVl ID0gRXJyb3I6IFRZUEVfRVJSOiBET00gWFBhdGggRXhjZXB0aW9uIDUyCis+Pj4gY29uc3RydWN0 b3IgPSBYUGF0aFJlc3VsdENvbnN0cnVjdG9yCis+Pj4gaW52YWxpZEl0ZXJhdG9yU3RhdGUgPSBm YWxzZQorPj4+IG51bWJlclZhbHVlID0gRXJyb3I6IFRZUEVfRVJSOiBET00gWFBhdGggRXhjZXB0 aW9uIDUyCis+Pj4gcmVzdWx0VHlwZSA9IDQKKz4+PiBzaW5nbGVOb2RlVmFsdWUgPSBFcnJvcjog VFlQRV9FUlI6IERPTSBYUGF0aCBFeGNlcHRpb24gNTIKKz4+PiBzbmFwc2hvdExlbmd0aCA9IEVy cm9yOiBUWVBFX0VSUjogRE9NIFhQYXRoIEV4Y2VwdGlvbiA1MgorPj4+IHN0cmluZ1ZhbHVlID0g RXJyb3I6IFRZUEVfRVJSOiBET00gWFBhdGggRXhjZXB0aW9uIDUyCis+Pj4gX19wcm90b19fID0g WFBhdGhSZXN1bHRQcm90b3R5cGUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2NvbnNvbGUtZGlyLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS1kaXIuaHRt bAppbmRleCBlZGQ4ZDllLi5mMDE3N2FiIDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY29uc29sZS1kaXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS1k aXIuaHRtbApAQCAtNiwxMSArNiw1NiBAQAogCiBmdW5jdGlvbiBkb2l0KCkKIHsKLSAgICBjb25z b2xlLmRpcihkb2N1bWVudCk7CiAgICAgY29uc29sZS5kaXIoWyJ0ZXN0MSIsICJ0ZXN0MiJdKTsK ICAgICBjb25zb2xlLmRpcihkb2N1bWVudC5jaGlsZE5vZGVzKTsKKyAgICBjb25zb2xlLmRpcihk b2N1bWVudC5ldmFsdWF0ZSgiLy9oZWFkIiwgZG9jdW1lbnQsIG51bGwsIFhQYXRoUmVzdWx0LkFO WV9UWVBFLCBudWxsKSk7CiAKLSAgICBkdW1wQ29uc29sZU1lc3NhZ2VzKCk7CisgICAgZXhwYW5k QW5kRHVtcENvbnNvbGVNZXNzYWdlcygpOworfQorCitmdW5jdGlvbiBleHBhbmRBbmREdW1wQ29u c29sZU1lc3NhZ2VzKG5vTm90aWZ5RG9uZSkgeworICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHJlc3Vs dCkKKyAgICB7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzdWx0Lmxlbmd0aDsgKytp KSB7CisgICAgICAgICAgICBvdXRwdXQocmVzdWx0W2ldLnRpdGxlKTsKKyAgICAgICAgICAgIHZh ciBwcm9wZXJ0aWVzID0gcmVzdWx0W2ldLnByb3BlcnRpZXM7CisgICAgICAgICAgICBmb3IgKHZh ciBqID0gMDsgcHJvcGVydGllcyAmJiBqIDwgcHJvcGVydGllcy5sZW5ndGg7ICsraikKKyAgICAg ICAgICAgICAgICBvdXRwdXQoIj4+PiAiICsgcHJvcGVydGllc1tqXS5uYW1lICsgIiA9ICIgKyBw cm9wZXJ0aWVzW2pdLnZhbHVlLmRlc2NyaXB0aW9uKTsKKyAgICAgICAgfQorICAgICAgICBpZiAo IW5vTm90aWZ5RG9uZSkKKyAgICAgICAgICAgIG5vdGlmeURvbmUoKTsKKyAgICB9CisgICAgZXZh bHVhdGVJbldlYkluc3BlY3RvcigiZnJvbnRlbmRfZXhwYW5kQW5kRHVtcENvbnNvbGVNZXNzYWdl cyIsIGNhbGxiYWNrKTsKK30KKworZnVuY3Rpb24gZnJvbnRlbmRfZXhwYW5kQW5kRHVtcENvbnNv bGVNZXNzYWdlcyh0ZXN0Q29udHJvbGxlcikKK3sKKyAgICAvLyBOZWVkIHRlc3QgdG8gYmUgYXN5 bmMgdG8gZXhwYW5kIGNvbnNvbGUgb2JqZWN0cy4KKyAgICB0ZXN0Q29udHJvbGxlci53YWl0VW50 aWxEb25lKCk7CisgICAgdmFyIG1lc3NhZ2VzID0gV2ViSW5zcGVjdG9yLmNvbnNvbGUubWVzc2Fn ZXM7CisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtZXNzYWdlcy5sZW5ndGg7ICsraSkgeworICAg ICAgICB2YXIgZWxlbWVudCA9IG1lc3NhZ2VzW2ldLnRvTWVzc2FnZUVsZW1lbnQoKTsKKyAgICAg ICAgdmFyIG5vZGUgPSBlbGVtZW50LnRyYXZlcnNlTmV4dE5vZGUoZWxlbWVudCk7CisgICAgICAg IHdoaWxlIChub2RlKSB7CisgICAgICAgICAgICBpZiAobm9kZS5zZWN0aW9uRm9yVGVzdCkgewor ICAgICAgICAgICAgICAgIG1lc3NhZ2VzW2ldLnNlY3Rpb24gPSBub2RlLnNlY3Rpb25Gb3JUZXN0 OworICAgICAgICAgICAgICAgIG5vZGUuc2VjdGlvbkZvclRlc3QuZXhwYW5kZWQgPSB0cnVlOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgbm9kZSA9 IG5vZGUudHJhdmVyc2VOZXh0Tm9kZShlbGVtZW50KTsKKyAgICAgICAgfQorICAgIH0KKworICAg IHRlc3RDb250cm9sbGVyLnJ1bkFmdGVyUGVuZGluZ0Rpc3BhdGNoZXMoZnVuY3Rpb24oKSB7Cisg ICAgICAgIHZhciBtZXNzYWdlcyA9IFdlYkluc3BlY3Rvci5jb25zb2xlLm1lc3NhZ2VzOworICAg ICAgICB2YXIgcmVzdWx0ID0gW107CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVzc2Fn ZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBzZWN0aW9uID0gbWVzc2FnZXNbaV0u c2VjdGlvbjsKKyAgICAgICAgICAgIGlmIChzZWN0aW9uKQorICAgICAgICAgICAgICAgIHJlc3Vs dC5wdXNoKHsgdGl0bGU6IHNlY3Rpb24udGl0bGVFbGVtZW50LnRleHRDb250ZW50LCBwcm9wZXJ0 aWVzOiBzZWN0aW9uLnByb3BlcnRpZXNGb3JUZXN0fSk7CisgICAgICAgIH0KKyAgICAgICAgdGVz dENvbnRyb2xsZXIubm90aWZ5RG9uZShyZXN1bHQpOworICAgIH0pOwogfQogCiA8L3NjcmlwdD4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2JkODE4Ni4uNWFhZjZlNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wMi0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBYUGF0aFJlc3VsdCBvYmplY3RzIGFy ZSBub3QgZXhwYW5kZWQgaW4gY29uc29sZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ5MjYKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChpbmplY3RlZFNjcmlwdENvbnN0cnVjdG9y KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9u LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3Rv dHlwZS51cGRhdGVQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5Db21wYXJlUHJvcGVydGllcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu T2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Vj dGlvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorCiAy MDEwLTAyLTEzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwppbmRleCA5NTg2N2M0Li41YTllNTI0IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCkBAIC00ODcsMjMg KzQ4NywzMCBAQCBJbmplY3RlZFNjcmlwdC5nZXRQcm9wZXJ0aWVzID0gZnVuY3Rpb24ob2JqZWN0 UHJveHksIGlnbm9yZUhhc093blByb3BlcnR5LCBhYmJyZQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICB2YXIgcHJvcGVydGllcyA9IFtdOworICAgIHZhciBwcm9wZXJ0eU5hbWVzID0gaWdu b3JlSGFzT3duUHJvcGVydHkgPyBJbmplY3RlZFNjcmlwdC5fZ2V0UHJvcGVydHlOYW1lcyhvYmpl Y3QpIDogT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMob2JqZWN0KTsKKyAgICBpZiAoIWlnbm9y ZUhhc093blByb3BlcnR5ICYmIG9iamVjdC5fX3Byb3RvX18pCisgICAgICAgIHByb3BlcnR5TmFt ZXMucHVzaCgiX19wcm90b19fIik7CiAKICAgICAvLyBHbyBvdmVyIHByb3BlcnRpZXMsIHByZXBh cmUgcmVzdWx0cy4KLSAgICBmb3IgKHZhciBwcm9wZXJ0eU5hbWUgaW4gb2JqZWN0KSB7Ci0gICAg ICAgIGlmICghaWdub3JlSGFzT3duUHJvcGVydHkgJiYgImhhc093blByb3BlcnR5IiBpbiBvYmpl Y3QgJiYgIW9iamVjdC5oYXNPd25Qcm9wZXJ0eShwcm9wZXJ0eU5hbWUpKQotICAgICAgICAgICAg Y29udGludWU7CisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm9wZXJ0eU5hbWVzLmxlbmd0aDsg KytpKSB7CisgICAgICAgIHZhciBwcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eU5hbWVzW2ldOwogCiAg ICAgICAgIHZhciBwcm9wZXJ0eSA9IHt9OwogICAgICAgICBwcm9wZXJ0eS5uYW1lID0gcHJvcGVy dHlOYW1lOwogICAgICAgICBwcm9wZXJ0eS5wYXJlbnRPYmplY3RQcm94eSA9IG9iamVjdFByb3h5 OwogICAgICAgICB2YXIgaXNHZXR0ZXIgPSBvYmplY3RbIl9fbG9va3VwR2V0dGVyX18iXSAmJiBv YmplY3QuX19sb29rdXBHZXR0ZXJfXyhwcm9wZXJ0eU5hbWUpOwogICAgICAgICBpZiAoIXByb3Bl cnR5LmlzR2V0dGVyKSB7Ci0gICAgICAgICAgICB2YXIgY2hpbGRPYmplY3QgPSBvYmplY3RbcHJv cGVydHlOYW1lXTsKLSAgICAgICAgICAgIHZhciBjaGlsZE9iamVjdFByb3h5ID0gbmV3IEluamVj dGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0KGNoaWxkT2JqZWN0LCBvYmplY3RQcm94eS5vYmpl Y3RJZCwgYWJicmV2aWF0ZSk7Ci0gICAgICAgICAgICBjaGlsZE9iamVjdFByb3h5LnBhdGggPSBv YmplY3RQcm94eS5wYXRoID8gb2JqZWN0UHJveHkucGF0aC5zbGljZSgpIDogW107Ci0gICAgICAg ICAgICBjaGlsZE9iamVjdFByb3h5LnBhdGgucHVzaChwcm9wZXJ0eU5hbWUpOwotICAgICAgICAg ICAgY2hpbGRPYmplY3RQcm94eS5wcm90b0RlcHRoID0gb2JqZWN0UHJveHkucHJvdG9EZXB0aCB8 fCAwOwotICAgICAgICAgICAgcHJvcGVydHkudmFsdWUgPSBjaGlsZE9iamVjdFByb3h5OworICAg ICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICB2YXIgY2hpbGRPYmplY3QgPSBvYmplY3Rb cHJvcGVydHlOYW1lXTsKKyAgICAgICAgICAgICAgICB2YXIgY2hpbGRPYmplY3RQcm94eSA9IG5l dyBJbmplY3RlZFNjcmlwdC5jcmVhdGVQcm94eU9iamVjdChjaGlsZE9iamVjdCwgb2JqZWN0UHJv eHkub2JqZWN0SWQsIGFiYnJldmlhdGUpOworICAgICAgICAgICAgICAgIGNoaWxkT2JqZWN0UHJv eHkucGF0aCA9IG9iamVjdFByb3h5LnBhdGggPyBvYmplY3RQcm94eS5wYXRoLnNsaWNlKCkgOiBb XTsKKyAgICAgICAgICAgICAgICBjaGlsZE9iamVjdFByb3h5LnBhdGgucHVzaChwcm9wZXJ0eU5h bWUpOworICAgICAgICAgICAgICAgIGNoaWxkT2JqZWN0UHJveHkucHJvdG9EZXB0aCA9IG9iamVj dFByb3h5LnByb3RvRGVwdGggfHwgMDsKKyAgICAgICAgICAgICAgICBwcm9wZXJ0eS52YWx1ZSA9 IGNoaWxkT2JqZWN0UHJveHk7CisgICAgICAgICAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgICAg ICAgICBwcm9wZXJ0eS52YWx1ZSA9IHsgZGVzY3JpcHRpb246IGUudG9TdHJpbmcoKSB9OworICAg ICAgICAgICAgICAgIHByb3BlcnR5LmlzRXJyb3IgPSB0cnVlOworICAgICAgICAgICAgfQogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gRklYTUU6IHRoaXMgc2hvdWxkIHNob3cgc29t ZXRoaW5nIGxpa2UgImdldHRlciIgKGJ1ZyAxNjczNCkuCiAgICAgICAgICAgICBwcm9wZXJ0eS52 YWx1ZSA9IHsgZGVzY3JpcHRpb246ICJcdTIwMTQiIH07IC8vIGVtIGRhc2gKQEAgLTU3MSwyNCAr NTc4LDI1IEBAIEluamVjdGVkU2NyaXB0LnNldE91dGVySFRNTCA9IGZ1bmN0aW9uKG5vZGVJZCwg dmFsdWUsIGV4cGFuZGVkKQogICAgIHJldHVybiBJbmplY3RlZFNjcmlwdEhvc3QucHVzaE5vZGVQ YXRoVG9Gcm9udGVuZChuZXdOb2RlLCBleHBhbmRlZCwgZmFsc2UpOwogfQogCi1JbmplY3RlZFNj cmlwdC5fZ2V0UHJvcGVydHlOYW1lcyA9IGZ1bmN0aW9uKG9iamVjdCwgcmVzdWx0U2V0KQorSW5q ZWN0ZWRTY3JpcHQuX3BvcHVsYXRlUHJvcGVydHlOYW1lcyA9IGZ1bmN0aW9uKG9iamVjdCwgcmVz dWx0U2V0KQogewotICAgIGlmIChPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcykgewotICAgICAg ICBmb3IgKHZhciBvID0gb2JqZWN0OyBvOyBvID0gby5fX3Byb3RvX18pIHsKLSAgICAgICAgICAg IHRyeSB7Ci0gICAgICAgICAgICAgICAgdmFyIG5hbWVzID0gT2JqZWN0LmdldE93blByb3BlcnR5 TmFtZXMobyk7Ci0gICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBuYW1lcy5sZW5n dGg7ICsraSkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0U2V0W25hbWVzW2ldXSA9IHRydWU7 Ci0gICAgICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgICAgICB9CisgICAgZm9yICh2YXIg byA9IG9iamVjdDsgbzsgbyA9IG8uX19wcm90b19fKSB7CisgICAgICAgIHRyeSB7CisgICAgICAg ICAgICB2YXIgbmFtZXMgPSBPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhvKTsKKyAgICAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbmFtZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAg ICAgcmVzdWx0U2V0W25hbWVzW2ldXSA9IHRydWU7CisgICAgICAgIH0gY2F0Y2ggKGUpIHsKICAg ICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIENocm9taXVtIGRvZXNuJ3Qgc3VwcG9y dCBnZXRPd25Qcm9wZXJ0eU5hbWVzIHlldC4KLSAgICAgICAgZm9yICh2YXIgbmFtZSBpbiBvYmpl Y3QpCi0gICAgICAgICAgICByZXN1bHRTZXRbbmFtZV0gPSB0cnVlOwogICAgIH0KIH0KIAorSW5q ZWN0ZWRTY3JpcHQuX2dldFByb3BlcnR5TmFtZXMgPSBmdW5jdGlvbihvYmplY3QsIHJlc3VsdFNl dCkKK3sKKyAgICB2YXIgcHJvcGVydHlOYW1lU2V0ID0ge307CisgICAgSW5qZWN0ZWRTY3JpcHQu X3BvcHVsYXRlUHJvcGVydHlOYW1lcyhvYmplY3QsIHByb3BlcnR5TmFtZVNldCk7CisgICAgcmV0 dXJuIE9iamVjdC5rZXlzKHByb3BlcnR5TmFtZVNldCk7Cit9CisKIEluamVjdGVkU2NyaXB0Lmdl dENvbXBsZXRpb25zID0gZnVuY3Rpb24oZXhwcmVzc2lvbiwgaW5jbHVkZUluc3BlY3RvckNvbW1h bmRMaW5lQVBJLCBjYWxsRnJhbWVJZCkKIHsKICAgICB2YXIgcHJvcHMgPSB7fTsKQEAgLTYwNSw3 ICs2MTMsNyBAQCBJbmplY3RlZFNjcmlwdC5nZXRDb21wbGV0aW9ucyA9IGZ1bmN0aW9uKGV4cHJl c3Npb24sIGluY2x1ZGVJbnNwZWN0b3JDb21tYW5kTGluZQogICAgICAgICAgICAgICAgIC8vIEV2 YWx1YXRlIGludG8gcHJvcGVydGllcyBpbiBzY29wZSBvZiB0aGUgc2VsZWN0ZWQgY2FsbCBmcmFt ZS4KICAgICAgICAgICAgICAgICB2YXIgc2NvcGVDaGFpbiA9IGNhbGxGcmFtZS5zY29wZUNoYWlu OwogICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVDaGFpbi5sZW5ndGg7 ICsraSkKLSAgICAgICAgICAgICAgICAgICAgSW5qZWN0ZWRTY3JpcHQuX2dldFByb3BlcnR5TmFt ZXMoc2NvcGVDaGFpbltpXSwgcHJvcHMpOworICAgICAgICAgICAgICAgICAgICBJbmplY3RlZFNj cmlwdC5fcG9wdWxhdGVQcm9wZXJ0eU5hbWVzKHNjb3BlQ2hhaW5baV0sIHByb3BzKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmICghZXhwcmVzc2lvbikK QEAgLTYxMyw3ICs2MjEsNyBAQCBJbmplY3RlZFNjcmlwdC5nZXRDb21wbGV0aW9ucyA9IGZ1bmN0 aW9uKGV4cHJlc3Npb24sIGluY2x1ZGVJbnNwZWN0b3JDb21tYW5kTGluZQogICAgICAgICAgICAg ZXhwcmVzc2lvblJlc3VsdCA9IEluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZU9uKEluamVjdGVkU2Ny aXB0Ll93aW5kb3coKS5ldmFsLCBJbmplY3RlZFNjcmlwdC5fd2luZG93KCksIGV4cHJlc3Npb24p OwogICAgICAgICB9CiAgICAgICAgIGlmICh0eXBlb2YgZXhwcmVzc2lvblJlc3VsdCA9PSAib2Jq ZWN0IikKLSAgICAgICAgICAgIEluamVjdGVkU2NyaXB0Ll9nZXRQcm9wZXJ0eU5hbWVzKGV4cHJl c3Npb25SZXN1bHQsIHByb3BzKTsKKyAgICAgICAgICAgIEluamVjdGVkU2NyaXB0Ll9wb3B1bGF0 ZVByb3BlcnR5TmFtZXMoZXhwcmVzc2lvblJlc3VsdCwgcHJvcHMpOwogICAgICAgICBpZiAoaW5j bHVkZUluc3BlY3RvckNvbW1hbmRMaW5lQVBJKQogICAgICAgICAgICAgZm9yICh2YXIgcHJvcCBp biBJbmplY3RlZFNjcmlwdC5fd2luZG93KCkuY29uc29sZS5faW5zcGVjdG9yQ29tbWFuZExpbmVB UEkpCiAgICAgICAgICAgICAgICAgaWYgKHByb3AuY2hhckF0KDApICE9PSAnXycpCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24u anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24u anMKaW5kZXggNmQ3MTA5MC4uZjA2YTE0ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtNzcsNiArNzcsNyBA QCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdmFyIGluZm9FbGVtZW50ID0gbmV3IFRyZWVFbGVtZW50KHRpdGxlLCBudWxsLCBm YWxzZSk7CiAgICAgICAgICAgICB0aGlzLnByb3BlcnRpZXNUcmVlT3V0bGluZS5hcHBlbmRDaGls ZChpbmZvRWxlbWVudCk7CiAgICAgICAgIH0KKyAgICAgICAgdGhpcy5wcm9wZXJ0aWVzRm9yVGVz dCA9IHByb3BlcnRpZXM7CiAgICAgfQogfQogCkBAIC04Niw2ICs4NywxMCBAQCBXZWJJbnNwZWN0 b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uQ29tcGFyZVByb3BlcnRpZXMgPSBmdW5jdGlvbihw cm9wZXJ0eUEsIHBybwogewogICAgIHZhciBhID0gcHJvcGVydHlBLm5hbWU7CiAgICAgdmFyIGIg PSBwcm9wZXJ0eUIubmFtZTsKKyAgICBpZiAoYSA9PT0gIl9fcHJvdG9fXyIpCisgICAgICAgIHJl dHVybiAxOworICAgIGlmIChiID09PSAiX19wcm90b19fIikKKyAgICAgICAgcmV0dXJuIC0xOwog CiAgICAgLy8gaWYgdXNlZCBlbHNld2hlcmUgbWFrZSBzdXJlIHRvCiAgICAgLy8gIC0gY29udmVy dCBhIGFuZCBiIHRvIHN0cmluZ3MgKG5vdCBuZWVkZWQgaGVyZSwgcHJvcGVydGllcyBhcmUgYWxs IHN0cmluZ3MpCkBAIC0xNzQsNyArMTc5LDkgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5 VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC5jbGFz c05hbWUgPSAidmFsdWUiOwogICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC50ZXh0Q29udGVudCA9 IHRoaXMucHJvcGVydHkudmFsdWUuZGVzY3JpcHRpb247CiAgICAgICAgIGlmICh0aGlzLnByb3Bl cnR5LmlzR2V0dGVyKQotICAgICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC5hZGRTdHlsZUNsYXNz KCJkaW1tZWQiKTsKKyAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ImRpbW1lZCIpOworICAgICAgICBpZiAodGhpcy5wcm9wZXJ0eS5pc0Vycm9yKQorICAgICAgICAg ICAgdGhpcy52YWx1ZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZXJyb3IiKTsKIAogICAgICAgICB0 aGlzLmxpc3RJdGVtRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TZWN0aW9uLmpzCmluZGV4IDM5NGY4NmQuLjc3MTAxOTIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9uLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZWN0aW9uLmpzCkBAIC0zMSw2ICszMSw3IEBAIFdlYkluc3BlY3Rvci5T ZWN0aW9uID0gZnVuY3Rpb24odGl0bGUsIHN1YnRpdGxlKQogewogICAgIHRoaXMuZWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05h bWUgPSAic2VjdGlvbiI7CisgICAgdGhpcy5lbGVtZW50LnNlY3Rpb25Gb3JUZXN0ID0gdGhpczsK IAogICAgIHRoaXMuaGVhZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuaGVhZGVyRWxlbWVudC5jbGFzc05hbWUgPSAiaGVhZGVyIjsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggNTNmMWU0Yi4uZGM0OWQ2ZiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTE1NzcsNiAr MTU3NywxMCBAQCBsaS5lZGl0aW5nIC5zd2F0Y2gsIGxpLmVkaXRpbmcgLmVuYWJsZWQtYnV0dG9u LCAgbGkuZWRpdGluZy1zdWItcGFydCAuZGVsZXRlLWJ1dAogICAgIGNvbG9yOiByZ2IoMTAwLCAx MDAsIDEwMCk7CiB9CiAKKy5zZWN0aW9uIC5wcm9wZXJ0aWVzIC52YWx1ZS5lcnJvciB7CisgICAg Y29sb3I6IHJlZDsKK30KKwogLnNlY3Rpb24gLnByb3BlcnRpZXMgLm51bWJlciwgLmV2ZW50LXBy b3BlcnRpZXMgLm51bWJlciB7CiAgICAgY29sb3I6IGJsdWU7CiB9Cg==