16734 2008-01-04 13:00:29 -0800 Web Inspector: Better represent custom getters in the properties pane 2011-07-26 08:32:52 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Minor --- 16011 1 timothy pfeldman ossy pfeldman yurys oldest_to_newest 66217 0 timothy 2008-01-04 13:00:29 -0800 The fix for bug 16011 shows getters as a &mdash;. We should add a new localized string like "getter" or "getter and setter" when we can. 68662 1 aroben 2008-01-29 11:11:59 -0800 <rdar://problem/5712908> 442203 2 101992 pfeldman 2011-07-26 06:02:48 -0700 Created attachment 101992 Patch 442238 3 101992 yurys 2011-07-26 07:31:08 -0700 Comment on attachment 101992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101992&action=review Please revert unnecessary changes, otherwise looks good. > Source/WebCore/inspector/InjectedScriptSource.js:203 > + property.name = propertyName + ""; Why is this concatenation needed? > Source/WebCore/inspector/InjectedScriptSource.js:-196 > - property.value = this._wrapObject(value, objectGroupName); What was the reason for changing this block? It should work without the change and it was clear that exception could only be thrown in object[propertyName] 442248 4 pfeldman 2011-07-26 07:44:29 -0700 Committed r91754: <http://trac.webkit.org/changeset/91754> 442281 5 ossy 2011-07-26 08:32:52 -0700 the new test fails on Qt bot: http://build.webkit.org/results/Qt%20Linux%20Release/r91754%20%2835775%29/inspector/runtime/runtime-getProperties-pretty-diff.html Could you check it, please? 101992 2011-07-26 06:02:48 -0700 2011-07-26 07:31:07 -0700 Patch bug-16734-20110726170245.patch text/plain 10111 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTE3NTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNjNhNTA4NGZlOWU1NGQ2NTU4MGFh MzBhZGExNjkwZDllNmM3MjkxLi4zOTk1MzM1MzI4NTRiYTkyODM0OWJmM2JhMDRjZmMzMDg5MGM4 ZjIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDctMjYgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEJldHRlciByZXBy ZXNlbnQgY3VzdG9tIGdldHRlcnMgaW4gdGhlIHByb3BlcnRpZXMgcGFuZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MzQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9ydW50aW1lL3J1 bnRpbWUtZ2V0UHJvcGVydGllcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3Bl Y3Rvci9ydW50aW1lL3J1bnRpbWUtZ2V0UHJvcGVydGllcy5odG1sOiBBZGRlZC4KKworMjAxMS0w Ny0yNiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogSW1wbGVtZW50IHNldFByb3BlcnR5VmFsdWUgdXNpbmcgZXZhbHVhdGUgYW5k IGNhbGxGdW5jdGlvbk9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NTExMgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGlt ZS9ydW50aW1lLWdldFByb3BlcnRpZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3J1bnRpbWUvcnVudGltZS1nZXRQcm9wZXJ0aWVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4yY2VlMmNjYjBjNzYwNzdhODg5MzgxYTU4N2Q2MWQyOTBmMmI1Y2YwCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvcnVudGltZS1nZXRQcm9wZXJ0aWVz LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMwIEBACitUZXN0cyBSZW1vdGVPYmplY3QuZ2V0UHJv cGVydGllcy4KKworCitSdW5uaW5nOiB0ZXN0U2V0VXAKKworUnVubmluZzogdGVzdEdldHRlckFu ZFNldHRlcgoreworICAgIG5hbWUgOiAiZ2V0IGZvbyIKKyAgICB2YWx1ZSA6IHsKKyAgICAgICAg dHlwZSA6ICJmdW5jdGlvbiIKKyAgICAgICAgZGVzY3JpcHRpb24gOiAiZnVuY3Rpb24gZm9vKCkg eyByZXR1cm4gMTsgfSIKKyAgICB9Cit9Cit7CisgICAgbmFtZSA6ICJzZXQgZm9vIgorICAgIHZh bHVlIDogeworICAgICAgICB0eXBlIDogImZ1bmN0aW9uIgorICAgICAgICBkZXNjcmlwdGlvbiA6 ICJmdW5jdGlvbiBmb28odmFsdWUpIHsgfSIKKyAgICB9Cit9CisKK1J1bm5pbmc6IHRlc3RHZXR0 ZXJPbmx5Cit7CisgICAgbmFtZSA6ICJnZXQgZm9vIgorICAgIHZhbHVlIDogeworICAgICAgICB0 eXBlIDogImZ1bmN0aW9uIgorICAgICAgICBkZXNjcmlwdGlvbiA6ICJmdW5jdGlvbiBmb28oKSB7 IHJldHVybiAxOyB9IgorICAgIH0KK30KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3J1bnRpbWUvcnVudGltZS1nZXRQcm9wZXJ0aWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvcnVudGltZS9ydW50aW1lLWdldFByb3BlcnRpZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMWJm YTI4Y2Q2ZThkNmZlNzcwMTVkOWE3YTQyNzY1NWUyMDk5M2RmCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvcnVudGltZS1nZXRQcm9wZXJ0aWVzLmh0bWwK QEAgLTAsMCArMSw4NyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRw L3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0Pgor Cit2YXIgb2JqZWN0MSA9IHsgZ2V0IGZvbygpIHsgcmV0dXJuIDE7IH0sIHNldCBmb28odmFsdWUp IHsgfSB9OwordmFyIG9iamVjdDIgPSB7IGdldCBmb28oKSB7IHJldHVybiAxOyB9IH07CisKK2Z1 bmN0aW9uIHRlc3QoKQoreworICAgIHZhciBvYmoxLCBvYmoyOworCisgICAgSW5zcGVjdG9yVGVz dC5ydW5UZXN0U3VpdGUoWworICAgICAgICBmdW5jdGlvbiB0ZXN0U2V0VXAobmV4dCkKKyAgICAg ICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgiZHVtcE9iamVj dHMoJ0luaXRpYWwnKSIsIHN0ZXAwKTsKKworICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDAoKQor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZSgib2Jq ZWN0MSIsIHN0ZXAxKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gc3Rl cDEoZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIG9iajEgPSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHJlc3VsdCk7 CisgICAgICAgICAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlKCJvYmplY3QyIiwgc3RlcDIp OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBzdGVwMihlcnJvciwgcmVz dWx0LCB3YXNUaHJvd24pCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgb2JqMiA9IFdl Ykluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVzdWx0KTsKKyAgICAgICAgICAg ICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rp b24gdGVzdEdldHRlckFuZFNldHRlcihuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICBvYmox LmdldE93blByb3BlcnRpZXMoc3RlcDEpOworCisgICAgICAgICAgICBmdW5jdGlvbiBzdGVwMShw cm9wZXJ0aWVzKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgcHJvcGVydGllcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICAgICAgZHVtcFBy b3BlcnR5KHByb3BlcnRpZXNbaV0pOworCisgICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAg ICAgICAgfQorICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RHZXR0ZXJPbmx5KG5l eHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIG9iajIuZ2V0T3duUHJvcGVydGllcyhzdGVwMSk7 CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAxKHByb3BlcnRpZXMpCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsg KytpKQorICAgICAgICAgICAgICAgICAgICBkdW1wUHJvcGVydHkocHJvcGVydGllc1tpXSk7CisK KyAgICAgICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICBd KTsKKworICAgIGZ1bmN0aW9uIGR1bXBQcm9wZXJ0eShwcm9wZXJ0eSkKKyAgICB7CisgICAgICAg IGlmIChwcm9wZXJ0eS5uYW1lID09PSAiX19wcm90b19fIikKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICB2YXIgcHJvcGVydHlPYmogPSB7fTsKKyAgICAgICAgcHJvcGVydHlPYmoubmFt ZSA9IHByb3BlcnR5Lm5hbWU7CisgICAgICAgIHByb3BlcnR5T2JqLnZhbHVlID0ge307CisgICAg ICAgIHByb3BlcnR5T2JqLnZhbHVlLnR5cGUgPSBwcm9wZXJ0eS52YWx1ZS50eXBlOworICAgICAg ICBwcm9wZXJ0eU9iai52YWx1ZS5kZXNjcmlwdGlvbiA9IHByb3BlcnR5LnZhbHVlLmRlc2NyaXB0 aW9uOworCisgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcChwcm9wZXJ0eU9iaik7CisgICAgfQor fQorCis8L3NjcmlwdD4KKzwvaGVhZD4KKworPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+ CitUZXN0cyBSZW1vdGVPYmplY3QuZ2V0UHJvcGVydGllcy4KKzwvcD4KKworPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvcnVudGltZS1z ZXRQcm9wZXJ0eVZhbHVlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50 aW1lLXNldFByb3BlcnR5VmFsdWUuaHRtbAppbmRleCBiMDI3ZGRkMTI4MDg4MzViZmE1ODFmZjY4 YWQxNTk4OWIwZDQ4MjRiLi4wZTQ0OTc1Y2NiNjcxN2U0ODBlODY3NDNiODNkNWZlYTkyZWVhMzMy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50aW1lLXNldFBy b3BlcnR5VmFsdWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50 aW1lLXNldFByb3BlcnR5VmFsdWUuaHRtbApAQCAtMzEsNyArMzEsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAxKGVycm9yLCByZXN1bHQsIHdhc1Rocm93bikK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBvYmoxID0gV2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpOwotICAgICAgICAgICAgICAgIFJ1bnRpbWVBZ2Vu dC5ldmFsdWF0ZSgib2JqZWN0MSIsIHN0ZXAyKTsKKyAgICAgICAgICAgICAgICBSdW50aW1lQWdl bnQuZXZhbHVhdGUoIm9iamVjdDIiLCBzdGVwMik7CiAgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIGZ1bmN0aW9uIHN0ZXAyKGVycm9yLCByZXN1bHQsIHdhc1Rocm93bikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCBkNjU1YjE2MTFjZDMwNTBiZjExZWEzZjIxM2NhZGM2ZDRhNDFkM2YyLi4zNzA3Y2MxN2Q1ZjZj OTliMTg3ZmUxNDQwZmRlMmQ5MWM0YTRjZDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAK IDIwMTEtMDctMjYgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEJldHRlciByZXByZXNlbnQgY3VzdG9tIGdldHRlcnMgaW4gdGhl IHByb3BlcnRpZXMgcGFuZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY3MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUZXN0OiBpbnNwZWN0b3IvcnVudGltZS9ydW50aW1lLWdldFByb3BlcnRpZXMuaHRt bAorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzOgorICAgICAg ICAoLik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlKToK KworMjAxMS0wNy0yNiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogSW1wbGVtZW50IHNldFByb3BlcnR5VmFsdWUgdXNpbmcgZXZh bHVhdGUgYW5kIGNhbGxGdW5jdGlvbk9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NTExMgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKaW5kZXggYzI0ZThmOGY3MTkzNjMwMTFlYTdiZTQ3MmNh N2ZlNGUxMWM0MGJmMS4uNzk2NjFmMGNkYjNlZTQ5ZWVhYjE1Y2Y3OTIxODFiYzM1NjYwMGRiOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNl LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5q cwpAQCAtMTgzLDIzICsxODMsMzIgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnR5TmFtZXMubGVuZ3RoOyArK2kpIHsKICAg ICAgICAgICAgIHZhciBwcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eU5hbWVzW2ldOwogCi0gICAgICAg ICAgICB2YXIgcHJvcGVydHkgPSB7fTsKLSAgICAgICAgICAgIHByb3BlcnR5Lm5hbWUgPSBwcm9w ZXJ0eU5hbWUgKyAiIjsKLSAgICAgICAgICAgIHZhciBpc0dldHRlciA9IG9iamVjdFsiX19sb29r dXBHZXR0ZXJfXyJdICYmIG9iamVjdC5fX2xvb2t1cEdldHRlcl9fKHByb3BlcnR5TmFtZSk7Ci0g ICAgICAgICAgICBpZiAoIWlzR2V0dGVyKSB7CisgICAgICAgICAgICB2YXIgZ2V0dGVyID0gb2Jq ZWN0WyJfX2xvb2t1cEdldHRlcl9fIl0gJiYgb2JqZWN0Ll9fbG9va3VwR2V0dGVyX18ocHJvcGVy dHlOYW1lKTsKKyAgICAgICAgICAgIHZhciBzZXR0ZXIgPSBvYmplY3RbIl9fbG9va3VwU2V0dGVy X18iXSAmJiBvYmplY3QuX19sb29rdXBTZXR0ZXJfXyhwcm9wZXJ0eU5hbWUpOworICAgICAgICAg ICAgaWYgKGdldHRlciB8fCBzZXR0ZXIpIHsKKyAgICAgICAgICAgICAgICBpZiAoZ2V0dGVyKSB7 CisgICAgICAgICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHt9OworICAgICAgICAgICAgICAg ICAgICBwcm9wZXJ0eS5uYW1lID0gImdldCAiICsgcHJvcGVydHlOYW1lOworICAgICAgICAgICAg ICAgICAgICBwcm9wZXJ0eS52YWx1ZSA9IHRoaXMuX3dyYXBPYmplY3QoZ2V0dGVyLCBvYmplY3RH cm91cE5hbWUpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzLnB1c2gocHJvcGVydHkp OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAoc2V0dGVyKSB7CisgICAg ICAgICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHt9OworICAgICAgICAgICAgICAgICAgICBw cm9wZXJ0eS5uYW1lID0gInNldCAiICsgcHJvcGVydHlOYW1lOworICAgICAgICAgICAgICAgICAg ICBwcm9wZXJ0eS52YWx1ZSA9IHRoaXMuX3dyYXBPYmplY3Qoc2V0dGVyLCBvYmplY3RHcm91cE5h bWUpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzLnB1c2gocHJvcGVydHkpOworICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgdmFy IHByb3BlcnR5ID0ge307CisgICAgICAgICAgICAgICAgcHJvcGVydHkubmFtZSA9IHByb3BlcnR5 TmFtZSArICIiOwogICAgICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgICAgIHZh ciB2YWx1ZSA9IG9iamVjdFtwcm9wZXJ0eU5hbWVdOworICAgICAgICAgICAgICAgICAgICBwcm9w ZXJ0eS52YWx1ZSA9IHRoaXMuX3dyYXBPYmplY3Qob2JqZWN0W3Byb3BlcnR5TmFtZV0sIG9iamVj dEdyb3VwTmFtZSk7CiAgICAgICAgICAgICAgICAgfSBjYXRjaChlKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHZhciB2YWx1ZSA9IGU7CisgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVl ID0gdGhpcy5fd3JhcE9iamVjdChlLCBvYmplY3RHcm91cE5hbWUpOwogICAgICAgICAgICAgICAg ICAgICBwcm9wZXJ0eS53YXNUaHJvd24gPSB0cnVlOwogICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICBwcm9wZXJ0eS52YWx1ZSA9IHRoaXMuX3dyYXBPYmplY3QodmFsdWUsIG9iamVj dEdyb3VwTmFtZSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIC8vIEZJ WE1FOiB0aGlzIHNob3VsZCBzaG93IHNvbWV0aGluZyBsaWtlICJnZXR0ZXIiIChidWcgMTY3MzQp LgotICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlID0gbmV3IEluamVjdGVkU2NyaXB0LlJl bW90ZU9iamVjdCgiXHUyMDE0Iik7IC8vIGVtIGRhc2gKLSAgICAgICAgICAgICAgICBwcm9wZXJ0 eS5pc0dldHRlciA9IHRydWU7CisgICAgICAgICAgICAgICAgcHJvcGVydGllcy5wdXNoKHByb3Bl cnR5KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHByb3BlcnRpZXMucHVzaChwcm9wZXJ0 eSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHByb3BlcnRpZXM7CiAgICAgfSwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBhYmMxYTJlOTllYmFlMWYzMTE1 NGQyM2NjNDVjMTQzZmRmMjFhMWYzLi4wOWFlNGFiMzg2YzRmYWY1MTA5Njc2MThkMjM1MmQ1OWU4 NmNkYzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0yNDIs OCArMjQyLDcgQEAKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9u IjogIlByb3BlcnR5IG5hbWUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZh bHVlIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIlByb3BlcnR5IHZh bHVlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ3YXNUaHJvd24iLCAidHlw ZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYg ZXhjZXB0aW9uIHdhcyB0aHJvd24gb24gYXR0ZW1wdCB0byBnZXQgdGhlIHByb3BlcnR5IHZhbHVl LCBpbiB0aGF0IGNhc2UgdGhlIHZhbHVlIHByb3Blcnkgd2lsbCBjb250YWluIHRocm93biB2YWx1 ZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaXNHZXR0ZXIiLCAidHlwZSI6 ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgdGhp cyBwcm9wZXJ0eSBpcyBnZXR0ZXIuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi d2FzVGhyb3duIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlw dGlvbiI6ICJUcnVlIGlmIGV4Y2VwdGlvbiB3YXMgdGhyb3duIG9uIGF0dGVtcHQgdG8gZ2V0IHRo ZSBwcm9wZXJ0eSB2YWx1ZSwgaW4gdGhhdCBjYXNlIHRoZSB2YWx1ZSBwcm9wZXJ5IHdpbGwgY29u dGFpbiB0aHJvd24gdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCmluZGV4IDRmZDdjZDFlNTU4 YzdlZDY0MDdjMzI2OGYyYTYwNWY2NmM5MTNjOWMuLmEyMTgxYTBiMTgyZTEwNDAyNjMxNGZmODM1 YmQzY2RiYjg5M2E5ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtMTk4LDggKzE5 OCw2IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC50ZXh0Q29u dGVudCA9IGRlc2NyaXB0aW9uOwogCi0gICAgICAgIGlmICh0aGlzLnByb3BlcnR5LmlzR2V0dGVy KQotICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZGltbWVkIik7 CiAgICAgICAgIGlmICh0aGlzLnByb3BlcnR5Lndhc1Rocm93bikKICAgICAgICAgICAgIHRoaXMu dmFsdWVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImVycm9yIik7CiAgICAgICAgIGlmICh0aGlzLnBy b3BlcnR5LnZhbHVlLnN1YnR5cGUpCg==