60811 2011-05-13 15:16:39 -0700 Web Inspector: [REGRESSION] Completion while on a breakpoint is not working. 2011-05-19 11:53:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 403907 0 pfeldman 2011-05-13 15:16:39 -0700 I thought we had a test for this one. Surprised it does not work. 405697 1 93910 pfeldman 2011-05-18 07:24:09 -0700 Created attachment 93910 Patch 405703 2 93910 apavlov 2011-05-18 07:28:14 -0700 Comment on attachment 93910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93910&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:378 > + selectedCallFrameVariables: function() Any reason for this not being a getter? 405713 3 93910 yurys 2011-05-18 07:45:01 -0700 Comment on attachment 93910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93910&action=review > LayoutTests/inspector/debugger/debugger-completions-on-call-frame.html:30 > + InspectorTest.addResult(golden[i]); Would be better to addResult("FAIL") in case of missing property. > Source/WebCore/inspector/InjectedScriptSource.js:484 > + for (var name in scopeChain[i]) This will be too slow for global scope. > Source/WebCore/inspector/InjectedScriptSource.js:497 > + for (var name in scopeVariableNames) I'd rather resurrect the command that allowed to quickly request all completions. 405731 4 93918 pfeldman 2011-05-18 08:28:18 -0700 Created attachment 93918 Patch 405738 5 93920 pfeldman 2011-05-18 08:33:54 -0700 Created attachment 93920 Patch 405761 6 93920 pfeldman 2011-05-18 08:53:09 -0700 Comment on attachment 93920 Patch Clearing flags on attachment: 93920 Committed r86768: <http://trac.webkit.org/changeset/86768> 405762 7 pfeldman 2011-05-18 08:53:18 -0700 All reviewed patches have been landed. Closing bug. 406558 8 ap 2011-05-19 11:53:18 -0700 <rdar://problem/9470349> 93910 2011-05-18 07:24:09 -0700 2011-05-18 08:28:09 -0700 Patch bug-60811-20110518182407.patch text/plain 8907 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODY3NTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0MzQ1MTExNjJhMTI5YTIwMWU5OTEy OTgxMTYwN2Q0ZjU1M2JjOTRlLi4wZTdlY2NkMzljODQ3NGEzNjYxMzhlZjQ2MGMwYzU1MDJiYzA4 MjEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBDb21wbGV0aW9uIHdoaWxl IG9uIGEgYnJlYWtwb2ludCBpcyBub3Qgd29ya2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwODExCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVi dWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1v bi1jYWxsLWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDExLTA1LTE4ICBZdXpvIEZ1amlzaGltYSAg PHl1em9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIENocm9taXVtIHRlc3QgZXhw ZWN0YXRpb24gY2hhbmdlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL2RlYnVnZ2VyLWNvbXBsZXRpb25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBsZXRpb25zLW9uLWNhbGwt ZnJhbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY3NDRiZTQ5Nzc5ODI4MTZiNWE0Nzk3MmU0 ZGI1ZGNhZDYyY2Y3YTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxMiBAQAorVGVzdCB0aGF0IGNvbXBsZXRpb25zIGluIHRoZSBjb250ZXh0IG9m IHRoZSBjYWxsIGZyYW1lIHdpbGwgcmVzdWx0IGluIG5hbWVzIG9mIGl0cyBzY29wZSB2YXJpYWJs ZXMuCisKK0RlYnVnZ2VyIHdhcyBlbmFibGVkLgorU2V0IHRpbWVyIGZvciB0ZXN0IGZ1bmN0aW9u LgorU2NyaXB0IGV4ZWN1dGlvbiBwYXVzZWQuCitmb28KK2JhcgordGhpcword2luZG93CitTY3Jp cHQgZXhlY3V0aW9uIHJlc3VtZWQuCitEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1v bi1jYWxsLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdn ZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFhMTg5MGVmZjYx MTk0MGNjMmUzZWYwNWMzYzQ4MTYzZWU5Nzk3ZGEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFt ZS5odG1sCkBAIC0wLDAgKzEsNDYgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4v Li4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNj cmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwv c2NyaXB0PgorPHNjcmlwdD4KKwordmFyIGEgPSAxOworZnVuY3Rpb24gdGVzdEZ1bmN0aW9uKCkK K3sKKyAgICB2YXIgZm9vID0gMjsKKyAgICB2YXIgYmFyID0gMzsKKyAgICBkZWJ1Z2dlcjsKK30K KwordmFyIHRlc3QgPSBmdW5jdGlvbigpCit7CisgICAgSW5zcGVjdG9yVGVzdC5zdGFydERlYnVn Z2VyVGVzdChzdGVwMSk7CisKKyAgICBmdW5jdGlvbiBzdGVwMSgpCisgICAgeworICAgICAgICBJ bnNwZWN0b3JUZXN0LnJ1blRlc3RGdW5jdGlvbkFuZFdhaXRVbnRpbFBhdXNlZChzdGVwMik7Cisg ICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDIoKQorICAgIHsKKyAgICAgICAgdmFyIHZhcmlhYmxl cyA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5zZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxl cygpOworICAgICAgICB2YXIgZ29sZGVuID0gWyAiZm9vIiwgImJhciIsICJ0aGlzIiwgIndpbmRv dyIgXTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBnb2xkZW4ubGVuZ3RoOyArK2kpIHsK KyAgICAgICAgICAgIGlmICh2YXJpYWJsZXMuaW5kZXhPZihnb2xkZW5baV0pICE9PSAtMSkKKyAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChnb2xkZW5baV0pOworICAgICAg ICB9CisgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVEZWJ1Z2dlclRlc3QoKTsKKyAgICB9 Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8 cD4KK1Rlc3QgdGhhdCBjb21wbGV0aW9ucyBpbiB0aGUgY29udGV4dCBvZiB0aGUgY2FsbCBmcmFt ZSB3aWxsIHJlc3VsdCBpbiBuYW1lcworb2YgaXRzIHNjb3BlIHZhcmlhYmxlcy4KKzwvcD4KKwor PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNiYzliZDdiMTU5NmMxNzkzOTk4MmY0ZWZh ZjUzNTYxZTU5Y2Y5OWIuLmYwYTA4ZWZhMDVlMTYwYmE5YjIyMmNlYTAyOGEzNzI4OThiYWZkZWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMS0wNS0xOCAgUGF2ZWwgRmVsZG1hbiAg PHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JFR1JFU1NJT05dIENvbXBsZXRpb24gd2hp bGUgb24gYSBicmVha3BvaW50IGlzIG5vdCB3b3JraW5nLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA4MTEKKworICAgICAgICBUZXN0OiBpbnNwZWN0 b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUuY29tcGxldGlvbnMuZWxzZS5ldmFsdWF0ZWQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUuZ2V0IHZh cmlhYmxlcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zZWxlY3RlZENh bGxGcmFtZVZhcmlhYmxlcyk6CisKKzIwMTEtMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSAiSWQiIHN1ZmZpeGVzIHVzZSBjb25zaXN0ZW50 IGNhc2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3Vy Y2UuanMKaW5kZXggZjg3NzkyZDRhN2QyZTI4NWRhNGM0MDAxMzQ3MjM5NGM0NmI4MGU1ZC4uNWM2 YWNlNWI2NjIzMjExNjJiN2YyNTI0MGU2YWExZTY4ZjRlMTAxNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtNDU1LDcgKzQ1NSw3 IEBAIEluamVjdGVkU2NyaXB0LkNhbGxGcmFtZVByb3h5ID0gZnVuY3Rpb24ob3JkaW5hbCwgY2Fs bEZyYW1lKQogICAgIHRoaXMuaWQgPSAie1wib3JkaW5hbFwiOiIgKyBvcmRpbmFsICsgIixcImlu amVjdGVkU2NyaXB0SWRcIjoiICsgaW5qZWN0ZWRTY3JpcHRJZCArICJ9IjsKICAgICB0aGlzLmZ1 bmN0aW9uTmFtZSA9IChjYWxsRnJhbWUudHlwZSA9PT0gImZ1bmN0aW9uIiA/IGNhbGxGcmFtZS5m dW5jdGlvbk5hbWUgOiAiIik7CiAgICAgdGhpcy5sb2NhdGlvbiA9IHsgc291cmNlSWQ6IFN0cmlu ZyhjYWxsRnJhbWUuc291cmNlSUQpLCBsaW5lTnVtYmVyOiBjYWxsRnJhbWUubGluZSwgY29sdW1u TnVtYmVyOiBjYWxsRnJhbWUuY29sdW1uIH07Ci0gICAgdGhpcy5zY29wZUNoYWluID0gdGhpcy5f d3JhcFNjb3BlQ2hhaW4oY2FsbEZyYW1lKTsKKyAgICB0aGlzLl93cmFwU2NvcGVDaGFpbihjYWxs RnJhbWUpOwogfQogCiBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eS5wcm90b3R5cGUgPSB7 CkBAIC00NzUsMTEgKzQ3NSwxNCBAQCBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHNjb3BlVHlwZU5hbWVzW0NBVENIX1NDT1BFXSA9ICJjYXRjaCI7 CiAKICAgICAgICAgdmFyIHNjb3BlQ2hhaW4gPSBjYWxsRnJhbWUuc2NvcGVDaGFpbjsKLSAgICAg ICAgdmFyIHNjb3BlQ2hhaW5Qcm94eSA9IFtdOworICAgICAgICB0aGlzLnNjb3BlQ2hhaW4gPSBb XTsKICAgICAgICAgdmFyIGZvdW5kTG9jYWxTY29wZSA9IGZhbHNlOworICAgICAgICB2YXIgc2Nv cGVWYXJpYWJsZU5hbWVzID0ge307CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVD aGFpbi5sZW5ndGg7IGkrKykgewogICAgICAgICAgICAgdmFyIHNjb3BlID0ge307CiAgICAgICAg ICAgICBzY29wZS5vYmplY3QgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChzY29wZUNoYWlu W2ldLCAiYmFja3RyYWNlIik7CisgICAgICAgICAgICBmb3IgKHZhciBuYW1lIGluIHNjb3BlQ2hh aW5baV0pCisgICAgICAgICAgICAgICAgc2NvcGVWYXJpYWJsZU5hbWVzW25hbWVdID0gdHJ1ZTsK IAogICAgICAgICAgICAgdmFyIHNjb3BlVHlwZSA9IGNhbGxGcmFtZS5zY29wZVR5cGUoaSk7CiAg ICAgICAgICAgICBzY29wZS50eXBlID0gc2NvcGVUeXBlTmFtZXNbc2NvcGVUeXBlXTsKQEAgLTQ4 Nyw5ICs0OTAsMTIgQEAgSW5qZWN0ZWRTY3JpcHQuQ2FsbEZyYW1lUHJveHkucHJvdG90eXBlID0g ewogICAgICAgICAgICAgaWYgKHNjb3BlVHlwZSA9PT0gTE9DQUxfU0NPUEUpCiAgICAgICAgICAg ICAgICAgc2NvcGUudGhpcyA9IGluamVjdGVkU2NyaXB0Ll93cmFwT2JqZWN0KGNhbGxGcmFtZS50 aGlzT2JqZWN0LCAiYmFja3RyYWNlIik7CiAKLSAgICAgICAgICAgIHNjb3BlQ2hhaW5Qcm94eS5w dXNoKHNjb3BlKTsKKyAgICAgICAgICAgIHRoaXMuc2NvcGVDaGFpbi5wdXNoKHNjb3BlKTsKICAg ICAgICAgfQotICAgICAgICByZXR1cm4gc2NvcGVDaGFpblByb3h5OworCisgICAgICAgIHRoaXMu dmFyaWFibGVzID0gWyJ0aGlzIl07CisgICAgICAgIGZvciAodmFyIG5hbWUgaW4gc2NvcGVWYXJp YWJsZU5hbWVzKQorICAgICAgICAgICAgdGhpcy52YXJpYWJsZXMucHVzaChuYW1lKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCmluZGV4IDVmZjkyNzk0YTNmMzE3MmMwZjlmNTljYjUzMmU4N2YxNzBjMTUyYjYuLjM2 OGU2NzQ5NDI4M2Q5ZjYwMWQ1MDMwMjI3NmE4Y2VjNDA5MWY2MGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMzYyLDEzICsz NjIsMjEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKCFleHByZXNzaW9uU3RyaW5nICYmICFwcmVmaXgpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coZXhwcmVzc2lvblN0cmluZywgImNv bXBsZXRpb24iLCB0cnVlLCBldmFsdWF0ZWQuYmluZCh0aGlzKSk7Ci0KLSAgICAgICAgZnVuY3Rp b24gZXZhbHVhdGVkKHJlc3VsdCwgd2FzVGhyb3duKQotICAgICAgICB7Ci0gICAgICAgICAgICBp ZiAod2FzVGhyb3duKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHJlc3Vs dC5nZXRBbGxQcm9wZXJ0aWVzKGV2YWx1YXRlZFByb3BlcnRpZXMuYmluZCh0aGlzKSk7CisgICAg ICAgIGlmICghZXhwcmVzc2lvblN0cmluZyAmJiBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMu cGF1c2VkKSB7CisgICAgICAgICAgICB2YXIgdmFyaWFibGVzID0gV2ViSW5zcGVjdG9yLnBhbmVs cy5zY3JpcHRzLnNlbGVjdGVkQ2FsbEZyYW1lVmFyaWFibGVzKCk7CisgICAgICAgICAgICB2YXIg cHJvcGVydGllcyA9IFtdOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB2YXJpYWJs ZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgcHJvcGVydGllcy5wdXNoKHsgbmFtZTog dmFyaWFibGVzW2ldIH0pOworICAgICAgICAgICAgZXZhbHVhdGVkUHJvcGVydGllcy5jYWxsKHRo aXMsIHByb3BlcnRpZXMpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5ldmFs SW5JbnNwZWN0ZWRXaW5kb3coZXhwcmVzc2lvblN0cmluZywgImNvbXBsZXRpb24iLCB0cnVlLCBl dmFsdWF0ZWQuYmluZCh0aGlzKSk7CisgICAgCisgICAgICAgICAgICBmdW5jdGlvbiBldmFsdWF0 ZWQocmVzdWx0LCB3YXNUaHJvd24pCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYg KHdhc1Rocm93bikKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IHJlc3VsdC5nZXRBbGxQcm9wZXJ0aWVzKGV2YWx1YXRlZFByb3BlcnRpZXMuYmluZCh0aGlzKSk7 CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBldmFsdWF0ZWRQ cm9wZXJ0aWVzKHByb3BlcnRpZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXgg N2QxYTgzMTlhM2E3MDk0Y2M1MjY2ODVlZWU0Y2NhODFkYjkyMTQzNS4uMDFkNDcxM2M3ZmI2ZWMw ZDU5YjE0NWQzZWMwODNmYzU2MzFmY2M4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q cwpAQCAtNjU4LDYgKzY1OCwxMSBAQCBXZWJJbnNwZWN0b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUg PSBmdW5jdGlvbihjYWxsRnJhbWUsIGluZGV4LCBzb3VyY2VGaWxlKQogfQogCiBXZWJJbnNwZWN0 b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUucHJvdG90eXBlID0geworICAgIGdldCB2YXJpYWJsZXMo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NhbGxGcmFtZS52YXJpYWJsZXM7CisgICAg fSwKKwogICAgIGdldCBmdW5jdGlvbk5hbWUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMu X2NhbGxGcmFtZS5mdW5jdGlvbk5hbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDg4ZDgzODIyMmFlZjVmN2VjMDNlYWE2 NWVjNGY0NjYzODlmMWQ2MjUuLjM5MmY1ZWVhMjBiODY3OGM3MmMzMDQ0ZGUyYjU0OWQwYzhjNjcy OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCkBAIC0zNzUsNiArMzc1LDEyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICBzZWxlY3RlZENhbGxGcmFtZS5ldmFsdWF0ZShjb2RlLCBv YmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjYWxsYmFjayk7CiAgICAgfSwKIAor ICAgIHNlbGVjdGVkQ2FsbEZyYW1lVmFyaWFibGVzOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3Rl ZENhbGxGcmFtZTsKKyAgICAgICAgcmV0dXJuIHNlbGVjdGVkQ2FsbEZyYW1lID8gc2VsZWN0ZWRD YWxsRnJhbWUudmFyaWFibGVzIDogW107CisgICAgfSwKKwogICAgIF9kZWJ1Z2dlclBhdXNlZDog ZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgY2FsbEZyYW1lcyA9IGV2ZW50LmRh dGEuY2FsbEZyYW1lczsK 93918 2011-05-18 08:28:18 -0700 2011-05-18 08:33:45 -0700 Patch bug-60811-20110518192816.patch text/plain 10208 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODY3NjAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxZjdlYTFmZGExZjg3MzUyMDQ4YjUz ODQ4MDcyOGE4ZjkzOTUxNGQ1Li5kNTMzNmQyODYwMjkyMTlkNjU0OTBmMWJiMzIyMmRkNDdhYTg2 YzgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBDb21wbGV0aW9uIHdoaWxl IG9uIGEgYnJlYWtwb2ludCBpcyBub3Qgd29ya2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwODExCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVi dWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1v bi1jYWxsLWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDExLTA1LTE4ICBab2x0YW4gSG9ydmF0aCAg PHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB3aGl0ZXNwYWNlIGZyb20gdGhl IGxpbmUgb2YgZmFzdC9mb3Jtcy9WYWxpZGl0eVN0YXRlLXZhbHVlTWlzc2luZy0wMDIuaHRtbApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBs ZXRpb25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBsZXRpb25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjE0NTczMjBkYTA0NWRiM2M0NzNmMTFlMTZkNzE0Mzc3NDkwNzg0NmUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXIt Y29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAor VGVzdCB0aGF0IGNvbXBsZXRpb25zIGluIHRoZSBjb250ZXh0IG9mIHRoZSBjYWxsIGZyYW1lIHdp bGwgcmVzdWx0IGluIG5hbWVzIG9mIGl0cyBzY29wZSB2YXJpYWJsZXMuCisKK0RlYnVnZ2VyIHdh cyBlbmFibGVkLgorU2V0IHRpbWVyIGZvciB0ZXN0IGZ1bmN0aW9uLgorU2NyaXB0IGV4ZWN1dGlv biBwYXVzZWQuCit2YXIxCit2YXIyCitkaXIKK2RpcnhtbAord2luZG93Cit0aGlzCitTY3JpcHQg ZXhlY3V0aW9uIHJlc3VtZWQuCitEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1vbi1j YWxsLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXIt Y29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU3OGYyY2IzZGIwNWM4 NjAwMTlmOWM4ZGU5MzQ4ZGQyZjYwNTAzZDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5o dG1sCkBAIC0wLDAgKzEsNzEgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4v aHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwvc2Ny aXB0PgorPHNjcmlwdD4KKwordmFyIGEgPSAxOworZnVuY3Rpb24gdGVzdEZ1bmN0aW9uKCkKK3sK KyAgICB2YXIgdmFyMSA9IDI7CisgICAgdmFyIHZhcjIgPSAzOworICAgIGRlYnVnZ2VyOworfQor Cit2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LnN0YXJ0RGVidWdn ZXJUZXN0KHN0ZXAxKTsKKworICAgIGZ1bmN0aW9uIHN0ZXAxKCkKKyAgICB7CisgICAgICAgIElu c3BlY3RvclRlc3QucnVuVGVzdEZ1bmN0aW9uQW5kV2FpdFVudGlsUGF1c2VkKHN0ZXAyKTsKKyAg ICB9CisKKyAgICBmdW5jdGlvbiBzdGVwMigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3Iu Y29uc29sZS5fY29tcGxldGlvbnMoIiIsICJ2YXIiLCB0cnVlLCBjaGVja0FnYWluc3RHb2xkZW4u YmluZCh0aGlzLCBbICJ2YXIxIiwgInZhcjIiIF0sIHN0ZXAzKSk7CisgICAgfQorCisgICAgZnVu Y3Rpb24gc3RlcDMoKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBs ZXRpb25zKCIiLCAiZGkiLCB0cnVlLCBjaGVja0FnYWluc3RHb2xkZW4uYmluZCh0aGlzLCBbICJk aXIiLCAiZGlyeG1sIiBdLCBzdGVwNCkpOworICAgIH0KKworICAgIGZ1bmN0aW9uIHN0ZXA0KCkK KyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLl9jb21wbGV0aW9ucygiIiwgIndp biIsIHRydWUsIGNoZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgIndpbmRvdyIgXSwgc3Rl cDUpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBzdGVwNSgpCisgICAgeworICAgICAgICBXZWJJ bnNwZWN0b3IuY29uc29sZS5fY29tcGxldGlvbnMoIiIsICJ0IiwgdHJ1ZSwgY2hlY2tBZ2FpbnN0 R29sZGVuLmJpbmQodGhpcywgWyAidGhpcyIgXSwgc3RlcDYpKTsKKyAgICB9CisKKyAgICBmdW5j dGlvbiBzdGVwNigpCisgICAgeworICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlRGVidWdn ZXJUZXN0KCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gY2hlY2tBZ2FpbnN0R29sZGVuKGdvbGRl biwgY29udGludWF0aW9uLCBjb21wbGV0aW9ucykKKyAgICB7CisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgZ29sZGVuLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBpZiAoY29tcGxldGlv bnMuaW5kZXhPZihnb2xkZW5baV0pICE9PSAtMSkKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmFkZFJlc3VsdChnb2xkZW5baV0pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJOT1QgRk9VTkQ6ICIgKyBnb2xkZW5baV0pOwor ICAgICAgICB9CisgICAgICAgIGNvbnRpbnVhdGlvbigpOworICAgIH0KK30KKworPC9zY3JpcHQ+ Cis8L2hlYWQ+CisKKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPgorVGVzdCB0aGF0IGNv bXBsZXRpb25zIGluIHRoZSBjb250ZXh0IG9mIHRoZSBjYWxsIGZyYW1lIHdpbGwgcmVzdWx0IGlu IG5hbWVzCitvZiBpdHMgc2NvcGUgdmFyaWFibGVzLgorPC9wPgorCis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggOTMxMWMwOTgwYWEwMGI5ZTk5ODRjMzIyYTliNTlkOTFlMDMzZTRiMS4u ODdkMTBiNWI0MTc5YWQzYTQ4N2E4OTExOTMwZTUwYjJmNTI2MjdiZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDIyIEBACiAyMDExLTA1LTE4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xl LmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gQ29tcGxldGlvbiB3aGlsZSBvbiBhIGJyZWFrcG9p bnQgaXMgbm90IHdvcmtpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02MDgxMQorCisgICAgICAgIFRlc3Q6IGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1 Z2dlci1jb21wbGV0aW9ucy1vbi1jYWxsLWZyYW1lLmh0bWwKKworICAgICAgICAqIGluc3BlY3Rv ci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3Rv dHlwZS5jb21wbGV0aW9ucy5lbHNlLmV2YWx1YXRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlByZXNlbmF0aW9uQ2FsbEZyYW1lLnByb3RvdHlwZS5nZXQgdmFyaWFibGVzKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnNlbGVjdGVkQ2FsbEZyYW1lVmFyaWFibGVz KToKKworMjAxMS0wNS0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisK ICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBtYWtlIHBhcmVudElkIGZvciBmcmFtZSBvcHRpb25hbC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDVmZjkyNzk0 YTNmMzE3MmMwZjlmNTljYjUzMmU4N2YxNzBjMTUyYjYuLjU5YmYyM2I1N2MyZWJhN2I0OWUwN2Y2 ZDBlMzMwOWZkYTIzNzA2MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMzUwLDYgKzM1MCwxMiBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAvLyBQYXNzIGxlc3Mgc3RvcCBjaGFy YWN0ZXJzIHRvIHJhbmdlT2ZXb3JkIHNvIHRoZSByYW5nZSB3aWxsIGJlIGEgbW9yZSBjb21wbGV0 ZSBleHByZXNzaW9uLgogICAgICAgICB2YXIgZXhwcmVzc2lvblJhbmdlID0gd29yZFJhbmdlLnN0 YXJ0Q29udGFpbmVyLnJhbmdlT2ZXb3JkKHdvcmRSYW5nZS5zdGFydE9mZnNldCwgRXhwcmVzc2lv blN0b3BDaGFyYWN0ZXJzLCB0aGlzLnByb21wdEVsZW1lbnQsICJiYWNrd2FyZCIpOwogICAgICAg ICB2YXIgZXhwcmVzc2lvblN0cmluZyA9IGV4cHJlc3Npb25SYW5nZS50b1N0cmluZygpOworICAg ICAgICB2YXIgcHJlZml4ID0gd29yZFJhbmdlLnRvU3RyaW5nKCk7CisgICAgICAgIHRoaXMuX2Nv bXBsZXRpb25zKGV4cHJlc3Npb25TdHJpbmcsIHByZWZpeCwgYmVzdE1hdGNoT25seSwgY29tcGxl dGlvbnNSZWFkeUNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgX2NvbXBsZXRpb25zOiBmdW5jdGlv bihleHByZXNzaW9uU3RyaW5nLCBwcmVmaXgsIGJlc3RNYXRjaE9ubHksIGNvbXBsZXRpb25zUmVh ZHlDYWxsYmFjaykKKyAgICB7CiAgICAgICAgIHZhciBsYXN0SW5kZXggPSBleHByZXNzaW9uU3Ry aW5nLmxlbmd0aCAtIDE7CiAKICAgICAgICAgdmFyIGRvdE5vdGF0aW9uID0gKGV4cHJlc3Npb25T dHJpbmdbbGFzdEluZGV4XSA9PT0gIi4iKTsKQEAgLTM1OCwxMSArMzY0LDEzIEBAIFdlYkluc3Bl Y3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChkb3ROb3RhdGlvbiB8 fCBicmFja2V0Tm90YXRpb24pCiAgICAgICAgICAgICBleHByZXNzaW9uU3RyaW5nID0gZXhwcmVz c2lvblN0cmluZy5zdWJzdHIoMCwgbGFzdEluZGV4KTsKIAotICAgICAgICB2YXIgcHJlZml4ID0g d29yZFJhbmdlLnRvU3RyaW5nKCk7CiAgICAgICAgIGlmICghZXhwcmVzc2lvblN0cmluZyAmJiAh cHJlZml4KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuZXZhbEluSW5zcGVj dGVkV2luZG93KGV4cHJlc3Npb25TdHJpbmcsICJjb21wbGV0aW9uIiwgdHJ1ZSwgZXZhbHVhdGVk LmJpbmQodGhpcykpOworICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJpbmcgJiYgV2ViSW5zcGVj dG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5l bHMuc2NyaXB0cy5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcyhyZXBvcnRDb21wbGV0aW9u cy5iaW5kKHRoaXMpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5ldmFsSW5JbnNw ZWN0ZWRXaW5kb3coZXhwcmVzc2lvblN0cmluZywgImNvbXBsZXRpb24iLCB0cnVlLCBldmFsdWF0 ZWQuYmluZCh0aGlzKSk7CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbHVhdGVkKHJlc3VsdCwgd2Fz VGhyb3duKQogICAgICAgICB7CkBAIC0zNzQsMTQgKzM4MiwyMSBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBldmFsdWF0ZWRQcm9wZXJ0 aWVzKHByb3BlcnRpZXMpCiAgICAgICAgIHsKICAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5yZWxl YXNlT2JqZWN0R3JvdXAoImNvbXBsZXRpb24iKTsKLSAgICAgICAgICAgIHZhciBwcm9wZXJ0eU5h bWVzID0gW107CisgICAgICAgICAgICB2YXIgcHJvcGVydHlOYW1lcyA9IHt9OwogICAgICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IHByb3BlcnRpZXMgJiYgaSA8IHByb3BlcnRpZXMubGVuZ3RoOyAr K2kpCi0gICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lcy5wdXNoKHByb3BlcnRpZXNbaV0ubmFt ZSk7CisgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lc1twcm9wZXJ0aWVzW2ldLm5hbWVdID0g dHJ1ZTsKKyAgICAgICAgICAgIHJlcG9ydENvbXBsZXRpb25zLmNhbGwodGhpcywgcHJvcGVydHlO YW1lcyk7CisgICAgICAgIH0KIAorICAgICAgICBmdW5jdGlvbiByZXBvcnRDb21wbGV0aW9ucyhw cm9wZXJ0eU5hbWVzKQorICAgICAgICB7CiAgICAgICAgICAgICB2YXIgaW5jbHVkZUNvbW1hbmRM aW5lQVBJID0gKCFkb3ROb3RhdGlvbiAmJiAhYnJhY2tldE5vdGF0aW9uKTsKLSAgICAgICAgICAg IGlmIChpbmNsdWRlQ29tbWFuZExpbmVBUEkpCi0gICAgICAgICAgICAgICAgcHJvcGVydHlOYW1l cy5zcGxpY2UoMCwgMCwgImRpciIsICJkaXJ4bWwiLCAia2V5cyIsICJ2YWx1ZXMiLCAicHJvZmls ZSIsICJwcm9maWxlRW5kIiwgIm1vbml0b3JFdmVudHMiLCAidW5tb25pdG9yRXZlbnRzIiwgImlu c3BlY3QiLCAiY29weSIsICJjbGVhciIpOwotICAgICAgICAgICAgdGhpcy5fcmVwb3J0Q29tcGxl dGlvbnMoYmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3RhdGlv biwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgsIHByb3BlcnR5TmFtZXMpOworICAgICAgICAgICAg aWYgKGluY2x1ZGVDb21tYW5kTGluZUFQSSkgeworICAgICAgICAgICAgICAgIGNvbnN0IGNvbW1h bmRMaW5lQVBJID0gWyJkaXIiLCAiZGlyeG1sIiwgImtleXMiLCAidmFsdWVzIiwgInByb2ZpbGUi LCAicHJvZmlsZUVuZCIsICJtb25pdG9yRXZlbnRzIiwgInVubW9uaXRvckV2ZW50cyIsICJpbnNw ZWN0IiwgImNvcHkiLCAiY2xlYXIiXTsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IGNvbW1hbmRMaW5lQVBJLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgICAgICAgICBwcm9w ZXJ0eU5hbWVzW2NvbW1hbmRMaW5lQVBJW2ldXSA9IHRydWU7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICB0aGlzLl9yZXBvcnRDb21wbGV0aW9ucyhiZXN0TWF0Y2hPbmx5LCBjb21wbGV0aW9u c1JlYWR5Q2FsbGJhY2ssIGRvdE5vdGF0aW9uLCBicmFja2V0Tm90YXRpb24sIHByZWZpeCwgT2Jq ZWN0LmtleXMocHJvcGVydHlOYW1lcykpOwogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwppbmRleCBi NjAzOGNhN2E5NTk1YTdmM2I2YmY4OGU2ZmMyMzc3ZTYzMjczYzgxLi5lYmExZTI3M2IwNmY3MTkw MWE4YjE3NWRjNmM5ZjQxMzI2NmIxNTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwpAQCAtMTI1LDggKzEyNSwxMCBAQCBXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgICAgICBm dW5jdGlvbiByZW1vdGVPYmplY3RCaW5kZXIoZXJyb3IsIHByb3BlcnRpZXMpCiAgICAgICAgIHsK LSAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIGlmIChlcnJvcikgeworICAgICAg ICAgICAgICAgIGNhbGxiYWNrKG51bGwpOwogICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBwcm9wZXJ0aWVzICYmIGkgPCBw cm9wZXJ0aWVzLmxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIHByb3BlcnRpZXNbaV0udmFs dWUgPSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHByb3BlcnRpZXNbaV0u dmFsdWUpOwogICAgICAgICAgICAgY2FsbGJhY2socHJvcGVydGllcyk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDFmZTBi YWExMTZkZWNhMGRhMzUzYTRjZjZlOWFlM2MwODlhYTA1MzEuLjNlNThmZmVhMDVjYWJhODlhNDZj ZGFjYmY4OWZlNzA3ZWI2OTcyNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0zNzYsNiArMzc2LDMyIEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBzZWxlY3RlZENhbGxGcmFt ZS5ldmFsdWF0ZShjb2RlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjYWxs YmFjayk7CiAgICAgfSwKIAorICAgIGdldFNlbGVjdGVkQ2FsbEZyYW1lVmFyaWFibGVzOiBmdW5j dGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciByZXN1bHQgPSB7fTsKKworICAgICAg ICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3Rl ZENhbGxGcmFtZTsKKyAgICAgICAgaWYgKCFzZWxlY3RlZENhbGxGcmFtZSkKKyAgICAgICAgICAg IGNhbGxiYWNrKHJlc3VsdCk7CisKKyAgICAgICAgdmFyIHBlbmRpbmdSZXF1ZXN0cyA9IDA7CisK KyAgICAgICAgZnVuY3Rpb24gcHJvcGVydGllc0NvbGxlY3RlZChwcm9wZXJ0aWVzKQorICAgICAg ICB7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgcHJvcGVydGllcyAmJiBpIDwgcHJvcGVy dGllcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICByZXN1bHRbcHJvcGVydGllc1tpXS5u YW1lXSA9IHRydWU7CisgICAgICAgICAgICBpZiAoLS1wZW5kaW5nUmVxdWVzdHMgPT0gMCkKKyAg ICAgICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQpOworICAgICAgICB9CisKKyAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBzZWxlY3RlZENhbGxGcmFtZS5zY29wZUNoYWluLmxlbmd0aDsgKytp KSB7CisgICAgICAgICAgICB2YXIgc2NvcGUgPSBzZWxlY3RlZENhbGxGcmFtZS5zY29wZUNoYWlu W2ldOworICAgICAgICAgICAgdmFyIG9iamVjdCA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3Qu ZnJvbVBheWxvYWQoc2NvcGUub2JqZWN0KTsKKyAgICAgICAgICAgIHBlbmRpbmdSZXF1ZXN0cysr OworICAgICAgICAgICAgb2JqZWN0LmdldEFsbFByb3BlcnRpZXMocHJvcGVydGllc0NvbGxlY3Rl ZCk7CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX2RlYnVnZ2VyUGF1c2VkOiBmdW5jdGlvbihl dmVudCkKICAgICB7CiAgICAgICAgIHZhciBjYWxsRnJhbWVzID0gZXZlbnQuZGF0YS5jYWxsRnJh bWVzOwo= 93920 2011-05-18 08:33:54 -0700 2011-05-18 08:53:09 -0700 Patch bug-60811-20110518193351.patch text/plain 10238 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODY3NjAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxZjdlYTFmZGExZjg3MzUyMDQ4YjUz ODQ4MDcyOGE4ZjkzOTUxNGQ1Li5kNTMzNmQyODYwMjkyMTlkNjU0OTBmMWJiMzIyMmRkNDdhYTg2 YzgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBDb21wbGV0aW9uIHdoaWxl IG9uIGEgYnJlYWtwb2ludCBpcyBub3Qgd29ya2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwODExCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVi dWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1v bi1jYWxsLWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDExLTA1LTE4ICBab2x0YW4gSG9ydmF0aCAg PHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB3aGl0ZXNwYWNlIGZyb20gdGhl IGxpbmUgb2YgZmFzdC9mb3Jtcy9WYWxpZGl0eVN0YXRlLXZhbHVlTWlzc2luZy0wMDIuaHRtbApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBs ZXRpb25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBsZXRpb25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjE0NTczMjBkYTA0NWRiM2M0NzNmMTFlMTZkNzE0Mzc3NDkwNzg0NmUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXIt Y29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAor VGVzdCB0aGF0IGNvbXBsZXRpb25zIGluIHRoZSBjb250ZXh0IG9mIHRoZSBjYWxsIGZyYW1lIHdp bGwgcmVzdWx0IGluIG5hbWVzIG9mIGl0cyBzY29wZSB2YXJpYWJsZXMuCisKK0RlYnVnZ2VyIHdh cyBlbmFibGVkLgorU2V0IHRpbWVyIGZvciB0ZXN0IGZ1bmN0aW9uLgorU2NyaXB0IGV4ZWN1dGlv biBwYXVzZWQuCit2YXIxCit2YXIyCitkaXIKK2RpcnhtbAord2luZG93Cit0aGlzCitTY3JpcHQg ZXhlY3V0aW9uIHJlc3VtZWQuCitEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1vbi1j YWxsLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXIt Y29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE3M2VhZTlhNzY2ZWYw YjIwZGZjYzA3MjQyODk1ZDhlYTM2OTFjOWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5o dG1sCkBAIC0wLDAgKzEsNzEgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4v aHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwvc2Ny aXB0PgorPHNjcmlwdD4KKwordmFyIGEgPSAxOworZnVuY3Rpb24gdGVzdEZ1bmN0aW9uKCkKK3sK KyAgICB2YXIgdmFyMSA9IDI7CisgICAgdmFyIHZhcjIgPSAzOworICAgIGRlYnVnZ2VyOworfQor Cit2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LnN0YXJ0RGVidWdn ZXJUZXN0KHN0ZXAxKTsKKworICAgIGZ1bmN0aW9uIHN0ZXAxKCkKKyAgICB7CisgICAgICAgIElu c3BlY3RvclRlc3QucnVuVGVzdEZ1bmN0aW9uQW5kV2FpdFVudGlsUGF1c2VkKHN0ZXAyKTsKKyAg ICB9CisKKyAgICBmdW5jdGlvbiBzdGVwMigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3Iu Y29uc29sZS5fY29tcGxldGlvbnMoIiIsICJ2YXIiLCBmYWxzZSwgY2hlY2tBZ2FpbnN0R29sZGVu LmJpbmQodGhpcywgWyAidmFyMSIsICJ2YXIyIiBdLCBzdGVwMykpOworICAgIH0KKworICAgIGZ1 bmN0aW9uIHN0ZXAzKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLl9jb21w bGV0aW9ucygiIiwgImRpIiwgZmFsc2UsIGNoZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsg ImRpciIsICJkaXJ4bWwiIF0sIHN0ZXA0KSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDQo KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAi d2luIiwgZmFsc2UsIGNoZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgIndpbmRvdyIgXSwg c3RlcDUpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBzdGVwNSgpCisgICAgeworICAgICAgICBX ZWJJbnNwZWN0b3IuY29uc29sZS5fY29tcGxldGlvbnMoIiIsICJ0IiwgZmFsc2UsIGNoZWNrQWdh aW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgInRoaXMiIF0sIHN0ZXA2KSk7CisgICAgfQorCisgICAg ZnVuY3Rpb24gc3RlcDYoKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZURl YnVnZ2VyVGVzdCgpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGNoZWNrQWdhaW5zdEdvbGRlbihn b2xkZW4sIGNvbnRpbnVhdGlvbiwgY29tcGxldGlvbnMpCisgICAgeworICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IGdvbGRlbi5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgaWYgKGNvbXBs ZXRpb25zLmluZGV4T2YoZ29sZGVuW2ldKSAhPT0gLTEpCisgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoZ29sZGVuW2ldKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTk9UIEZPVU5EOiAiICsgZ29sZGVuW2ld KTsKKyAgICAgICAgfQorICAgICAgICBjb250aW51YXRpb24oKTsKKyAgICB9Cit9CisKKzwvc2Ny aXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD4KK1Rlc3QgdGhh dCBjb21wbGV0aW9ucyBpbiB0aGUgY29udGV4dCBvZiB0aGUgY2FsbCBmcmFtZSB3aWxsIHJlc3Vs dCBpbiBuYW1lcworb2YgaXRzIHNjb3BlIHZhcmlhYmxlcy4KKzwvcD4KKworPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDkzMTFjMDk4MGFhMDBiOWU5OTg0YzMyMmE5YjU5ZDkxZTAzM2U0 YjEuLjg3ZDEwYjViNDE3OWFkM2E0ODdhODkxMTkzMGU1MGIyZjUyNjI3YmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsNSArMSwyMiBAQAogMjAxMS0wNS0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdv b2dsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2ViIEluc3BlY3RvcjogW1JFR1JFU1NJT05dIENvbXBsZXRpb24gd2hpbGUgb24gYSBicmVh a3BvaW50IGlzIG5vdCB3b3JraW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjA4MTEKKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZGVidWdnZXIv ZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuY29tcGxldGlvbnMuZWxzZS5ldmFsdWF0ZWQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUuZ2V0IHZhcmlhYmxlcyk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zZWxlY3RlZENhbGxGcmFtZVZhcmlh Ymxlcyk6CisKKzIwMTEtMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29t PgorCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogbWFrZSBwYXJlbnRJZCBmb3IgZnJhbWUgb3B0aW9uYWwuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA1ZmY5 Mjc5NGEzZjMxNzJjMGY5ZjU5Y2I1MzJlODdmMTcwYzE1MmI2Li5hZWRiY2VmOTM4NzI1MDdlZDMw YTM5YzU5MTIyZGU3YWNjZTM0YTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTM1MCw2ICszNTAsMTIgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gUGFzcyBsZXNzIHN0b3Ag Y2hhcmFjdGVycyB0byByYW5nZU9mV29yZCBzbyB0aGUgcmFuZ2Ugd2lsbCBiZSBhIG1vcmUgY29t cGxldGUgZXhwcmVzc2lvbi4KICAgICAgICAgdmFyIGV4cHJlc3Npb25SYW5nZSA9IHdvcmRSYW5n ZS5zdGFydENvbnRhaW5lci5yYW5nZU9mV29yZCh3b3JkUmFuZ2Uuc3RhcnRPZmZzZXQsIEV4cHJl c3Npb25TdG9wQ2hhcmFjdGVycywgdGhpcy5wcm9tcHRFbGVtZW50LCAiYmFja3dhcmQiKTsKICAg ICAgICAgdmFyIGV4cHJlc3Npb25TdHJpbmcgPSBleHByZXNzaW9uUmFuZ2UudG9TdHJpbmcoKTsK KyAgICAgICAgdmFyIHByZWZpeCA9IHdvcmRSYW5nZS50b1N0cmluZygpOworICAgICAgICB0aGlz Ll9jb21wbGV0aW9ucyhleHByZXNzaW9uU3RyaW5nLCBwcmVmaXgsIGJlc3RNYXRjaE9ubHksIGNv bXBsZXRpb25zUmVhZHlDYWxsYmFjayk7CisgICAgfSwKKworICAgIF9jb21wbGV0aW9uczogZnVu Y3Rpb24oZXhwcmVzc2lvblN0cmluZywgcHJlZml4LCBiZXN0TWF0Y2hPbmx5LCBjb21wbGV0aW9u c1JlYWR5Q2FsbGJhY2spCisgICAgewogICAgICAgICB2YXIgbGFzdEluZGV4ID0gZXhwcmVzc2lv blN0cmluZy5sZW5ndGggLSAxOwogCiAgICAgICAgIHZhciBkb3ROb3RhdGlvbiA9IChleHByZXNz aW9uU3RyaW5nW2xhc3RJbmRleF0gPT09ICIuIik7CkBAIC0zNTgsMTEgKzM2NCwxMyBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoZG90Tm90YXRp b24gfHwgYnJhY2tldE5vdGF0aW9uKQogICAgICAgICAgICAgZXhwcmVzc2lvblN0cmluZyA9IGV4 cHJlc3Npb25TdHJpbmcuc3Vic3RyKDAsIGxhc3RJbmRleCk7CiAKLSAgICAgICAgdmFyIHByZWZp eCA9IHdvcmRSYW5nZS50b1N0cmluZygpOwogICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJpbmcg JiYgIXByZWZpeCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLmV2YWxJbklu c3BlY3RlZFdpbmRvdyhleHByZXNzaW9uU3RyaW5nLCAiY29tcGxldGlvbiIsIHRydWUsIGV2YWx1 YXRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgaWYgKCFleHByZXNzaW9uU3RyaW5nICYmIFdlYklu c3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLnNjcmlwdHMuZ2V0U2VsZWN0ZWRDYWxsRnJhbWVWYXJpYWJsZXMocmVwb3J0Q29tcGxl dGlvbnMuYmluZCh0aGlzKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuZXZhbElu SW5zcGVjdGVkV2luZG93KGV4cHJlc3Npb25TdHJpbmcsICJjb21wbGV0aW9uIiwgdHJ1ZSwgZXZh bHVhdGVkLmJpbmQodGhpcykpOwogCiAgICAgICAgIGZ1bmN0aW9uIGV2YWx1YXRlZChyZXN1bHQs IHdhc1Rocm93bikKICAgICAgICAgewpAQCAtMzc0LDE0ICszODIsMjIgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgZnVuY3Rpb24gZXZhbHVhdGVkUHJv cGVydGllcyhwcm9wZXJ0aWVzKQogICAgICAgICB7CiAgICAgICAgICAgICBSdW50aW1lQWdlbnQu cmVsZWFzZU9iamVjdEdyb3VwKCJjb21wbGV0aW9uIik7Ci0gICAgICAgICAgICB2YXIgcHJvcGVy dHlOYW1lcyA9IFtdOworICAgICAgICAgICAgdmFyIHByb3BlcnR5TmFtZXMgPSB7fTsKICAgICAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBwcm9wZXJ0aWVzICYmIGkgPCBwcm9wZXJ0aWVzLmxlbmd0 aDsgKytpKQotICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZXMucHVzaChwcm9wZXJ0aWVzW2ld Lm5hbWUpOworICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZXNbcHJvcGVydGllc1tpXS5uYW1l XSA9IHRydWU7CisgICAgICAgICAgICByZXBvcnRDb21wbGV0aW9ucy5jYWxsKHRoaXMsIHByb3Bl cnR5TmFtZXMpOworICAgICAgICB9CiAKKyAgICAgICAgZnVuY3Rpb24gcmVwb3J0Q29tcGxldGlv bnMocHJvcGVydHlOYW1lcykKKyAgICAgICAgewogICAgICAgICAgICAgdmFyIGluY2x1ZGVDb21t YW5kTGluZUFQSSA9ICghZG90Tm90YXRpb24gJiYgIWJyYWNrZXROb3RhdGlvbik7Ci0gICAgICAg ICAgICBpZiAoaW5jbHVkZUNvbW1hbmRMaW5lQVBJKQotICAgICAgICAgICAgICAgIHByb3BlcnR5 TmFtZXMuc3BsaWNlKDAsIDAsICJkaXIiLCAiZGlyeG1sIiwgImtleXMiLCAidmFsdWVzIiwgInBy b2ZpbGUiLCAicHJvZmlsZUVuZCIsICJtb25pdG9yRXZlbnRzIiwgInVubW9uaXRvckV2ZW50cyIs ICJpbnNwZWN0IiwgImNvcHkiLCAiY2xlYXIiKTsKLSAgICAgICAgICAgIHRoaXMuX3JlcG9ydENv bXBsZXRpb25zKGJlc3RNYXRjaE9ubHksIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaywgZG90Tm90 YXRpb24sIGJyYWNrZXROb3RhdGlvbiwgcHJlZml4LCBwcm9wZXJ0eU5hbWVzKTsKKyAgICAgICAg ICAgIGlmIChpbmNsdWRlQ29tbWFuZExpbmVBUEkpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBj b21tYW5kTGluZUFQSSA9IFsiZGlyIiwgImRpcnhtbCIsICJrZXlzIiwgInZhbHVlcyIsICJwcm9m aWxlIiwgInByb2ZpbGVFbmQiLCAibW9uaXRvckV2ZW50cyIsICJ1bm1vbml0b3JFdmVudHMiLCAi aW5zcGVjdCIsICJjb3B5IiwgImNsZWFyIl07CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBjb21tYW5kTGluZUFQSS5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICAgICAg cHJvcGVydHlOYW1lc1tjb21tYW5kTGluZUFQSVtpXV0gPSB0cnVlOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgCisgICAgICAgICAgICB0aGlzLl9yZXBvcnRDb21wbGV0aW9ucyhiZXN0TWF0 Y2hPbmx5LCBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2ssIGRvdE5vdGF0aW9uLCBicmFja2V0Tm90 YXRpb24sIHByZWZpeCwgT2JqZWN0LmtleXMocHJvcGVydHlOYW1lcykpOwogICAgICAgICB9CiAg ICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90 ZU9iamVjdC5qcwppbmRleCBiNjAzOGNhN2E5NTk1YTdmM2I2YmY4OGU2ZmMyMzc3ZTYzMjczYzgx Li5lYmExZTI3M2IwNmY3MTkwMWE4YjE3NWRjNmM5ZjQxMzI2NmIxNTk1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwpAQCAtMTI1 LDggKzEyNSwxMCBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAg ICAgICAgfQogICAgICAgICBmdW5jdGlvbiByZW1vdGVPYmplY3RCaW5kZXIoZXJyb3IsIHByb3Bl cnRpZXMpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIGlm IChlcnJvcikgeworICAgICAgICAgICAgICAgIGNhbGxiYWNrKG51bGwpOwogICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBw cm9wZXJ0aWVzICYmIGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAg IHByb3BlcnRpZXNbaV0udmFsdWUgPSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXls b2FkKHByb3BlcnRpZXNbaV0udmFsdWUpOwogICAgICAgICAgICAgY2FsbGJhY2socHJvcGVydGll cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCmluZGV4IDFmZTBiYWExMTZkZWNhMGRhMzUzYTRjZjZlOWFlM2MwODlhYTA1MzEuLmVm ZmNlMjhiMTc5MjUyZmY3NTZlYmU5Mzc5Y2Q1MzA3YzQxNGE3ODcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0zNzYsNiAr Mzc2LDMyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICBzZWxlY3RlZENhbGxGcmFtZS5ldmFsdWF0ZShjb2RlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNv bW1hbmRMaW5lQVBJLCBjYWxsYmFjayk7CiAgICAgfSwKIAorICAgIGdldFNlbGVjdGVkQ2FsbEZy YW1lVmFyaWFibGVzOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciByZXN1 bHQgPSB7IHRoaXM6IHRydWUgfTsKKworICAgICAgICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0 aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3RlZENhbGxGcmFtZTsKKyAgICAgICAgaWYgKCFz ZWxlY3RlZENhbGxGcmFtZSkKKyAgICAgICAgICAgIGNhbGxiYWNrKHJlc3VsdCk7CisKKyAgICAg ICAgdmFyIHBlbmRpbmdSZXF1ZXN0cyA9IDA7CisKKyAgICAgICAgZnVuY3Rpb24gcHJvcGVydGll c0NvbGxlY3RlZChwcm9wZXJ0aWVzKQorICAgICAgICB7CisgICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgcHJvcGVydGllcyAmJiBpIDwgcHJvcGVydGllcy5sZW5ndGg7ICsraSkKKyAgICAgICAg ICAgICAgICByZXN1bHRbcHJvcGVydGllc1tpXS5uYW1lXSA9IHRydWU7CisgICAgICAgICAgICBp ZiAoLS1wZW5kaW5nUmVxdWVzdHMgPT0gMCkKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhyZXN1 bHQpOworICAgICAgICB9CisKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWxlY3RlZENh bGxGcmFtZS5zY29wZUNoYWluLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICB2YXIgc2NvcGUg PSBzZWxlY3RlZENhbGxGcmFtZS5zY29wZUNoYWluW2ldOworICAgICAgICAgICAgdmFyIG9iamVj dCA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQoc2NvcGUub2JqZWN0KTsK KyAgICAgICAgICAgIHBlbmRpbmdSZXF1ZXN0cysrOworICAgICAgICAgICAgb2JqZWN0LmdldEFs bFByb3BlcnRpZXMocHJvcGVydGllc0NvbGxlY3RlZCk7CisgICAgICAgIH0KKyAgICB9LAorCiAg ICAgX2RlYnVnZ2VyUGF1c2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciBj YWxsRnJhbWVzID0gZXZlbnQuZGF0YS5jYWxsRnJhbWVzOwo=