65110 2011-07-25 07:45:54 -0700 Web Inspector: use dedicated type for object id in the protocol. 2011-07-26 09:16:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 65117 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo ossy pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 441647 0 pfeldman 2011-07-25 07:45:54 -0700 Patch to follow. 441650 1 101868 pfeldman 2011-07-25 07:51:46 -0700 Created attachment 101868 Patch 441652 2 webkit.review.bot 2011-07-25 07:54:27 -0700 Attachment 101868 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/insp..." exit_code: 1 Source/WebCore/inspector/InjectedScript.cpp:66: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InjectedScript.h:59: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 441654 3 101868 yurys 2011-07-25 07:59:00 -0700 Comment on attachment 101868 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101868&action=review > Source/WebCore/inspector/InjectedScriptSource.js:289 > + args = JSON.parse(args); JSON.parse may be overriden, use safe eval. > Source/WebCore/inspector/InjectedScriptSource.js:304 > + return "Call argument should either contain object id or value property."; Please add undefined argument handling. 441655 4 101869 pfeldman 2011-07-25 08:07:56 -0700 Created attachment 101869 Patch 441657 5 pfeldman 2011-07-25 08:11:00 -0700 Committed r91668: <http://trac.webkit.org/changeset/91668> 442287 6 ossy 2011-07-26 08:40:54 -0700 inspector/console/console-format.html fails after https://trac.webkit.org/changeset/91749 : http://build.webkit.org/results/Qt%20Linux%20Release/r91750%20%2835770%29/inspector/console/console-format-pretty-diff.html Could you check it, please? 442305 7 pfeldman 2011-07-26 09:16:54 -0700 (In reply to comment #6) > inspector/console/console-format.html fails after https://trac.webkit.org/changeset/91749 : > http://build.webkit.org/results/Qt%20Linux%20Release/r91750%20%2835770%29/inspector/console/console-format-pretty-diff.html > > Could you check it, please? Needs rebaseline. Moment. 101868 2011-07-25 07:51:46 -0700 2011-07-25 08:07:48 -0700 Patch bug-65110-20110725185144.patch text/plain 16547 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzMThmMzA2YmUyZDJkN2U0NDBkZDQz ZTBmMTQ5ZjFmYWE2Yjc5ZjI4Li42MDE4OGQ0MWJiYTJjODIyZDY3NzQ2ODNiMzMyNmEzMWYzNjI3 OTVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDctMjUgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBkZWRpY2F0 ZWQgdHlwZSBmb3Igb2JqZWN0IGlkIGluIHRoZSBwcm90b2NvbC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MTEwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGltZS9ydW50aW1l LWNhbGxGdW5jdGlvbk9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGlt ZS9ydW50aW1lLWNhbGxGdW5jdGlvbk9uLmh0bWw6CisKKzIwMTEtMDctMjUgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlZmFj dG9yIHJlbW90ZSBvYmplY3Qgc3RydWN0dXJlIHRvIGNvbnRhaW4gdmFsdWUgZm9yIHByaW1pdGl2 ZSB2YWx1ZXMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NTEwMwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50 aW1lLWNhbGxGdW5jdGlvbk9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9y dW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CmluZGV4IDg3YzVmNDhh NmM5YWI5ZjAyNDE5Yjk3YzgzNjkxYjBjZDU2OWJlNzQuLjQ4YjJkMDA4ZTIwNzFiYzNkMjM0NmU1 Njk0ZDA0YWMxNDAzMmExMDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50 aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CkBA IC04LDQgKzgsNSBAQCBSdW5uaW5nOiB0ZXN0QXJndW1lbnRzCiB7ImEiOjEsImIiOjJ9CiB7ImEi OjEsImIiOjJ9CiB7ImMiOjEsImQiOjJ9Cis0CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24uaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24uaHRtbAppbmRleCA3NmY2 MGJjNTMyYzhiMzgxZDJkMDRjMTU0NWI0ZDRkZDJjOWUxMDhlLi4wMDdlZDFmODQ1ZDA4ZDAyNTJk NmU1ZGFiMTcxMjEwYzUwZDE4MGM0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv cnVudGltZS9ydW50aW1lLWNhbGxGdW5jdGlvbk9uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3J1bnRpbWUvcnVudGltZS1jYWxsRnVuY3Rpb25Pbi5odG1sCkBAIC0zNywxMyArMzcs MTMgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAxKGVycm9y LCByZXN1bHQsIHdhc1Rocm93bikKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBmdW5j dGlvbiBmb3JtYXQoYW9iajEsIGFvYmoyKQorICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGZvcm1h dChhb2JqMSwgYW9iajIsIHZhbCkKICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAg ICAgIHJldHVybiBKU09OLnN0cmluZ2lmeSh0aGlzKSArICJcbiIgKyBKU09OLnN0cmluZ2lmeShh b2JqMSkgKyAiXG4iICsgSlNPTi5zdHJpbmdpZnkoYW9iajIpOworICAgICAgICAgICAgICAgICAg ICByZXR1cm4gSlNPTi5zdHJpbmdpZnkodGhpcykgKyAiXG4iICsgSlNPTi5zdHJpbmdpZnkoYW9i ajEpICsgIlxuIiArIEpTT04uc3RyaW5naWZ5KGFvYmoyKSArICJcbiIgKyB2YWw7CiAgICAgICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgb2JqMiA9IHJlc3VsdDsKLSAgICAgICAgICAg ICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24ob2JqMS5vYmplY3RJZCwgZm9ybWF0LnRv U3RyaW5nKCksIFtvYmoxLm9iamVjdElkLCBvYmoyLm9iamVjdElkXSwgc3RlcDIpOworICAgICAg ICAgICAgICAgIFJ1bnRpbWVBZ2VudC5jYWxsRnVuY3Rpb25PbihvYmoxLm9iamVjdElkLCBmb3Jt YXQudG9TdHJpbmcoKSwgW3tvYmplY3RJZDogb2JqMS5vYmplY3RJZH0sIHtvYmplY3RJZDogb2Jq Mi5vYmplY3RJZH0sIHt2YWx1ZTo0fV0sIHN0ZXAyKTsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgZnVuY3Rpb24gc3RlcDIoZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDQyYzU1YzBlOWZhYTgxMTljMDYyN2UwODg5YzA4ZjBiMGU0Y2M5YzkuLjEyYTM0YmM3OGE3 MTMzNWQ3ZGQwYzU3Y2Q3MmU3Zjc3OTQxMWNkMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBA QAogMjAxMS0wNy0yNSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKKyAg ICAgICAgV2ViIEluc3BlY3RvcjogdXNlIGRlZGljYXRlZCB0eXBlIGZvciBvYmplY3QgaWQgaW4g dGhlIHByb3RvY29sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjUxMTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bmplY3RlZFNjcmlwdDo6Y2FsbEZ1bmN0aW9uT24pOgorICAgICAgICAqIGluc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5q czoKKyAgICAgICAgKC4pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclJ1bnRpbWVBZ2VudDo6Y2FsbEZ1bmN0aW9uT24pOgorCisyMDExLTA3 LTI1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBXZWIg SW5zcGVjdG9yOiByZWZhY3RvciByZW1vdGUgb2JqZWN0IHN0cnVjdHVyZSB0byBjb250YWluIHZh bHVlIGZvciBwcmltaXRpdmUgdmFsdWVzLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjUxMDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdC5jcHAKaW5kZXggNDBiNjE1Y2I2MzE3NWUzY2IyNzc0MDg3YTNlNDdjOTAzNzBj NzMzNS4uNmNmNjVlODIyZjRkNWE1OGVlZTdlN2I2YWQ1NWNkY2E2YWM1YTY0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC02MywxOSArNjMsMTIg QEAgdm9pZCBJbmplY3RlZFNjcmlwdDo6ZXZhbHVhdGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5n LCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24KICAgICBtYWtlRXZhbENhbGwoZXJyb3JTdHJpbmcs IGZ1bmN0aW9uLCByZXN1bHQsIHdhc1Rocm93bik7CiB9CiAKLXZvaWQgSW5qZWN0ZWRTY3JpcHQ6 OmNhbGxGdW5jdGlvbk9uKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBv YmplY3RJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBQYXNzUmVmUHRyPEluc3BlY3RvckFy cmF5PiBhcmd1bWVudHMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdh c1Rocm93bikKK3ZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmNhbGxGdW5jdGlvbk9uKEVycm9yU3RyaW5n KiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBleHBy ZXNzaW9uLCBjb25zdCBTdHJpbmcmIGFyZ3VtZW50cywgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4q IHJlc3VsdCwgYm9vbCogd2FzVGhyb3duKQogewogICAgIFNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5j dGlvbihtX2luamVjdGVkU2NyaXB0T2JqZWN0LCAiY2FsbEZ1bmN0aW9uT24iKTsKICAgICBmdW5j dGlvbi5hcHBlbmRBcmd1bWVudChvYmplY3RJZCk7CiAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoZXhwcmVzc2lvbik7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGFyZ3VtZW50cy0+ bGVuZ3RoKCk7ICsraSkgewotICAgICAgICBTdHJpbmcgYXJndW1lbnRJZDsKLSAgICAgICAgaWYg KCFhcmd1bWVudHMtPmdldChpKS0+YXNTdHJpbmcoJmFyZ3VtZW50SWQpKSB7Ci0gICAgICAgICAg ICAqZXJyb3JTdHJpbmcgPSAiQ2FsbCBhcmd1bWVudCBzaG91bGQgYmUgYW4gb2JqZWN0IGlkIjsK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBmdW5jdGlvbi5hcHBlbmRB cmd1bWVudChhcmd1bWVudElkKTsKLSAgICB9CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQo YXJndW1lbnRzKTsKICAgICBtYWtlRXZhbENhbGwoZXJyb3JTdHJpbmcsIGZ1bmN0aW9uLCByZXN1 bHQsIHdhc1Rocm93bik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0LmgKaW5kZXggOWMxZDQ1ZmZmZDA3YjNmYzllM2IxODQwZjM5NTUwYWI5YTAxNDQwOC4uYzk0 NDcxNWEzMjZhNDRkZjk1MjZmYmFiYjRhOWNlMTVhOGViOWNmNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmgKQEAgLTU2LDcgKzU2LDcgQEAgcHVibGljOgogICAg IGJvb2wgaGFzTm9WYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5qZWN0ZWRTY3JpcHRPYmplY3Qu aGFzTm9WYWx1ZSgpOyB9CiAKICAgICB2b2lkIGV2YWx1YXRlKEVycm9yU3RyaW5nKiwgY29uc3Qg U3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcmIG9iamVjdEdyb3VwLCBib29sIGluY2x1 ZGVDb21tYW5kTGluZUFQSSwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHJlc3VsdCwgYm9vbCog d2FzVGhyb3duKTsKLSAgICB2b2lkIGNhbGxGdW5jdGlvbk9uKEVycm9yU3RyaW5nKiwgY29uc3Qg U3RyaW5nJiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBQYXNzUmVmUHRyPElu c3BlY3RvckFycmF5PiBhcmd1bWVudHMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQs IGJvb2wqIHdhc1Rocm93bik7CisgICAgdm9pZCBjYWxsRnVuY3Rpb25PbihFcnJvclN0cmluZyos IGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3Qg U3RyaW5nJiBhcmd1bWVudHMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wq IHdhc1Rocm93bik7CiAgICAgdm9pZCBldmFsdWF0ZU9uQ2FsbEZyYW1lKEVycm9yU3RyaW5nKiwg Y29uc3QgU2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0IFN0cmluZyYgY2FsbEZyYW1lSWQs IGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9v bCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQs IGJvb2wqIHdhc1Rocm93bik7CiAgICAgdm9pZCBnZXRQcm9wZXJ0aWVzKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiBvYmplY3RJZCwgYm9vbCBpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgUmVmUHRy PEluc3BlY3RvckFycmF5PiogcmVzdWx0KTsKICAgICBOb2RlKiBub2RlRm9yT2JqZWN0SWQoY29u c3QgU3RyaW5nJiBvYmplY3RJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRTb3VyY2UuanMKaW5kZXggNjQ0OTc0N2JlNjg4N2EwZjBhYTA4MTE0OTcwODhm NDE3MDQ2ZDEzOS4uYmQwMDE5NmVhYTQ1MWFkOWUwMDhjOTBkYjgxNzFiMGYyNzRlNGZkMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpA QCAtMjc3LDI0ICsyNzcsMzIgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAg ICByZXR1cm4gdGhpcy5fZXZhbHVhdGVBbmRXcmFwKEluamVjdGVkU2NyaXB0SG9zdC5ldmFsdWF0 ZSwgSW5qZWN0ZWRTY3JpcHRIb3N0LCBleHByZXNzaW9uLCBvYmplY3RHcm91cCwgZmFsc2UsIGlu amVjdENvbW1hbmRMaW5lQVBJKTsKICAgICB9LAogCi0gICAgY2FsbEZ1bmN0aW9uT246IGZ1bmN0 aW9uKG9iamVjdElkLCBleHByZXNzaW9uKQorICAgIGNhbGxGdW5jdGlvbk9uOiBmdW5jdGlvbihv YmplY3RJZCwgZXhwcmVzc2lvbiwgYXJncykKICAgICB7CiAgICAgICAgIHZhciBwYXJzZWRPYmpl Y3RJZCA9IHRoaXMuX3BhcnNlT2JqZWN0SWQob2JqZWN0SWQpOwogICAgICAgICB2YXIgb2JqZWN0 ID0gdGhpcy5fb2JqZWN0Rm9ySWQocGFyc2VkT2JqZWN0SWQpOwogICAgICAgICBpZiAoIW9iamVj dCkKICAgICAgICAgICAgIHJldHVybiAiQ291bGQgbm90IGZpbmQgb2JqZWN0IHdpdGggZ2l2ZW4g aWQiOwogCi0gICAgICAgIHZhciByZXNvbHZlZEFyZ3MgPSBbXTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDI7IGkgPCBhcmd1bWVudHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBwYXJz ZWRBcmdJZCA9IHRoaXMuX3BhcnNlT2JqZWN0SWQoYXJndW1lbnRzW2ldKTsKLSAgICAgICAgICAg IGlmICghcGFyc2VkQXJnSWQgfHwgcGFyc2VkQXJnSWQuaW5qZWN0ZWRTY3JpcHRJZCAhPT0gaW5q ZWN0ZWRTY3JpcHRJZCkKLSAgICAgICAgICAgICAgICByZXR1cm4gIkFyZ3VtZW50cyBzaG91bGQg YmVsb25nIHRvIHRoZSBzYW1lIEphdmFTY3JpcHQgd29ybGQgYXMgdGhlIHRhcmdldCBvYmplY3Qu IjsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgdmFyIHJlc29sdmVkQXJnID0gdGhpcy5fb2Jq ZWN0Rm9ySWQocGFyc2VkQXJnSWQpOwotICAgICAgICAgICAgaWYgKCFyZXNvbHZlZEFyZykKLSAg ICAgICAgICAgICAgICByZXR1cm4gIkNvdWxkIG5vdCBmaW5kIG9iamVjdCB3aXRoIGdpdmVuIGlk IjsKLQotICAgICAgICAgICAgcmVzb2x2ZWRBcmdzLnB1c2gocmVzb2x2ZWRBcmcpOworICAgICAg ICBpZiAoYXJncykgeworICAgICAgICAgICAgdmFyIHJlc29sdmVkQXJncyA9IFtdOworICAgICAg ICAgICAgYXJncyA9IEpTT04ucGFyc2UoYXJncyk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGFyZ3MubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAgICB2YXIgb2JqZWN0SWQg PSBhcmdzW2ldLm9iamVjdElkOworICAgICAgICAgICAgICAgIGlmIChvYmplY3RJZCkgeworICAg ICAgICAgICAgICAgICAgICB2YXIgcGFyc2VkQXJnSWQgPSB0aGlzLl9wYXJzZU9iamVjdElkKG9i amVjdElkKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFwYXJzZWRBcmdJZCB8fCBwYXJzZWRB cmdJZC5pbmplY3RlZFNjcmlwdElkICE9PSBpbmplY3RlZFNjcmlwdElkKQorICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuICJBcmd1bWVudHMgc2hvdWxkIGJlbG9uZyB0byB0aGUgc2FtZSBK YXZhU2NyaXB0IHdvcmxkIGFzIHRoZSB0YXJnZXQgb2JqZWN0LiI7CisKKyAgICAgICAgICAgICAg ICAgICAgdmFyIHJlc29sdmVkQXJnID0gdGhpcy5fb2JqZWN0Rm9ySWQocGFyc2VkQXJnSWQpOwor ICAgICAgICAgICAgICAgICAgICBpZiAoIXJlc29sdmVkQXJnKQorICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuICJDb3VsZCBub3QgZmluZCBvYmplY3Qgd2l0aCBnaXZlbiBpZCI7CisgICAg ICAgICAgICAgICAgICAgIHJlc29sdmVkQXJncy5wdXNoKHJlc29sdmVkQXJnKTsKKyAgICAgICAg ICAgICAgICB9IGVsc2UgaWYgKGFyZ3NbaV0udmFsdWUpCisgICAgICAgICAgICAgICAgICAgIHJl c29sdmVkQXJncy5wdXNoKGFyZ3NbaV0udmFsdWUpOworICAgICAgICAgICAgICAgIGVsc2UKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuICJDYWxsIGFyZ3VtZW50IHNob3VsZCBlaXRoZXIgY29u dGFpbiBvYmplY3QgaWQgb3IgdmFsdWUgcHJvcGVydHkuIjsKKyAgICAgICAgICAgIH0KICAgICAg ICAgfQogCiAgICAgICAgIHRyeSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KaW5kZXggMzZmZWFmYTNiY2JmZDRmYWI2NDc0MmQyY2M2NTcwYTVmOTFkMGUzNy4uY2E5Yjdh ZTgxZmU1N2UwNzVmYTk2OTk4ODdkNWExNWVlZmNlZjk0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMjE4LDYgKzIxOCwxMSBAQAogICAgICAgICAiZGVzY3Jp cHRpb24iOiAiUnVudGltZSBkb21haW4gZXhwb3NlcyBKYXZhU2NyaXB0IHJ1bnRpbWUgYnkgbWVh bnMgb2YgcmVtb3RlIGV2YWx1YXRpb24gYW5kIG1pcnJvciBvYmplY3RzLiBFdmFsdWF0aW9uIHJl c3VsdHMgYXJlIHJldHVybmVkIGFzIG1pcnJvciBvYmplY3QgdGhhdCBleHBvc2UgdHlwZSwgc3Ry aW5nIHJlcHJlc2VudGF0aW9uIGFuZCB1bmlxdWUgaWRlbnRpZmllciB0aGF0IGNhbiBiZSB1c2Vk IGZvciBmdXJ0aGVyIG9iamVjdCBpbnRlcmFjdGlvbi4gT3JpZ2luYWwgb2JqZWN0cyBhcmUgbWFp bnRhaW5lZCBpbiBtZW1vcnkgdW5sZXNzIHRoZXkgYXJlIGVpdGhlciBleHBsaWNpdGx5IHJlbGVh c2VkIG9yIGFyZSByZWxlYXNlZCBhbG9uZyB3aXRoIHRoZSBvdGhlciBvYmplY3RzIGluIHRoZWly IG9iamVjdCBncm91cC4iLAogICAgICAgICAidHlwZXMiOiBbCiAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgImlkIjogIlJlbW90ZU9iamVjdElkIiwKKyAgICAgICAgICAgICAgICAidHlw ZSI6ICJzdHJpbmciLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJVbmlxdWUgb2Jq ZWN0IGlkZW50aWZpZXIuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKICAgICAgICAg ICAgICAgICAiaWQiOiAiUmVtb3RlT2JqZWN0IiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJv YmplY3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJNaXJyb3Igb2JqZWN0IHJl ZmVyZW5jaW5nIG9yaWdpbmFsIEphdmFTY3JpcHQgb2JqZWN0LiIsCkBAIC0yMjcsNyArMjMyLDcg QEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjbGFzc05hbWUiLCAidHlwZSI6ICJz dHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IGNsYXNzIChj b25zdHJ1Y3RvcikgbmFtZS4gU3BlY2lmaWVkIGZvciA8Y29kZT5vYmplY3Q8L2NvZGU+IHR5cGUg dmFsdWVzIG9ubHkuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZhbHVlIiwg InR5cGUiOiAiYW55IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlbW90ZSBv YmplY3QgdmFsdWUgKGluIGNhc2Ugb2YgcHJpbWl0aXZlIHZhbHVlcykuIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImRlc2NyaXB0aW9uIiwgInR5cGUiOiAic3RyaW5nIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlN0cmluZyByZXByZXNlbnRhdGlvbiBvZiB0 aGUgb2JqZWN0LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RJZCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVbmlx dWUgb2JqZWN0IGlkZW50aWZpZXIgKGZvciBub24tcHJpbWl0aXZlIHZhbHVlcykuIiB9CisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAiJHJlZiI6ICJSZW1vdGVPYmpl Y3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVbmlxdWUgb2JqZWN0IGlk ZW50aWZpZXIgKGZvciBub24tcHJpbWl0aXZlIHZhbHVlcykuIiB9CiAgICAgICAgICAgICAgICAg XQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKQEAgLTI0MCw2ICsyNDUsMTUgQEAKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ3YXNUaHJvd24iLCAidHlwZSI6ICJib29sZWFu IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgZXhjZXB0aW9uIHdh cyB0aHJvd24gb24gYXR0ZW1wdCB0byBnZXQgdGhlIHByb3BlcnR5IHZhbHVlLCBpbiB0aGF0IGNh c2UgdGhlIHZhbHVlIHByb3Blcnkgd2lsbCBjb250YWluIHRocm93biB2YWx1ZS4iIH0sCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaXNHZXR0ZXIiLCAidHlwZSI6ICJib29sZWFuIiwg Im9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgdGhpcyBwcm9wZXJ0eSBp cyBnZXR0ZXIuIiB9CiAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiQ2FsbEFyZ3VtZW50IiwKKyAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJS ZXByZXNlbnRzIGZ1bmN0aW9uIGNhbGwgYXJndW1lbnQuIEVpdGhlciByZW1vdGUgb2JqZWN0IGlk IDxjb2RlPm9iamVjdElkPC9jb2RlPiBvciBwcmltaXRpdmUgPGNvZGU+dmFsdWU8L2NvZGU+IHNo b3VsZCBiZSBzcGVjaWZpZWQuIiwKKyAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZSIsICJ0eXBlIjogImFueSIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJQcmltaXRpdmUgdmFsdWUuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0 IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlbW90ZSBvYmplY3QgaGFuZGxl LiIgfQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0KICAgICAgICAgXSwKICAgICAg ICAgImNvbW1hbmRzIjogWwpAQCAtMjYwLDkgKzI3NCw5IEBACiAgICAgICAgICAgICB7CiAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiY2FsbEZ1bmN0aW9uT24iLAogICAgICAgICAgICAgICAgICJw YXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIG9iamVj dCB0byBjYWxsIGZ1bmN0aW9uIG9uLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJvYmplY3RJZCIsICIkcmVmIjogIlJlbW90ZU9iamVjdElkIiwgImRlc2NyaXB0aW9uIjogIklk ZW50aWZpZXIgb2YgdGhlIG9iamVjdCB0byBjYWxsIGZ1bmN0aW9uIG9uLiIgfSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJmdW5jdGlvbkRlY2xhcmF0aW9uIiwgInR5cGUiOiAic3Ry aW5nIiwgImRlc2NyaXB0aW9uIjogIkRlY2xhcmF0aW9uIG9mIHRoZSBmdW5jdGlvbiB0byBjYWxs LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJhcmd1bWVudHMiLCAidHlwZSI6 ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklk ZW50aWZpZXIgb2YgdGhlIGFyZ3VtZW50LiIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIkNhbGwgYXJndW1lbnRzLiBBbGwgY2FsbCBhcmd1bWVudHMgbXVzdCBiZWxvbmcgdG8g dGhlIHNhbWUgSmF2YVNjcmlwdCB3b3JsZCBhcyB0aGUgdGFyZ2V0IG9iamVjdC4iIH0KKyAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJhcmd1bWVudHMiLCAidHlwZSI6ICJhcnJheSIsICJp dGVtcyI6IHsgIiRyZWYiOiAiQ2FsbEFyZ3VtZW50IiwgImRlc2NyaXB0aW9uIjogIkNhbGwgYXJn dW1lbnQuIiB9LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiQ2FsbCBhcmd1bWVu dHMuIEFsbCBjYWxsIGFyZ3VtZW50cyBtdXN0IGJlbG9uZyB0byB0aGUgc2FtZSBKYXZhU2NyaXB0 IHdvcmxkIGFzIHRoZSB0YXJnZXQgb2JqZWN0LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAg ICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cmVzdWx0IiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIkNhbGwgcmVz dWx0LiIgfSwKQEAgLTI3Myw3ICsyODcsNyBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogImdldFByb3BlcnRpZXMiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJz IjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAi c3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIG9iamVjdCB0byByZXR1 cm4gcHJvcGVydGllcyBmb3IuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm9i amVjdElkIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0SWQiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRp ZmllciBvZiB0aGUgb2JqZWN0IHRvIHJldHVybiBwcm9wZXJ0aWVzIGZvci4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWdub3JlSGFzT3duUHJvcGVydHkiLCAidHlwZSI6ICJi b29sZWFuIiwgImRlc2NyaXB0aW9uIjogIklmIHRydWUsIHJldHVybnMgcHJvcGVydGllcyBiZWxv bmdpbmcgdG8gYW55IGVsZW1lbnQgb2YgdGhlIHByb3RvdHlwZSBjaGFpbi4iIH0KICAgICAgICAg ICAgICAgICBdLAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwpAQCAtMjg0LDcgKzI5OCw3 IEBACiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0UHJvcGVydHlW YWx1ZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24i OiAiSWRlbnRpZmllciBvZiB0aGUgb2JqZWN0IHRvIHNldCBwcm9wZXJ0eSBvbi4iIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAiJHJlZiI6ICJSZW1vdGVPYmpl Y3RJZCIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBvYmplY3QgdG8gc2V0IHBy b3BlcnR5IG9uLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwcm9wZXJ0eU5h bWUiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUHJvcGVydHkgbmFtZSB0byBz ZXQgdmFsdWUgZm9yLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHByZXNz aW9uIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkV4cHJlc3Npb24gdG8gZXZh bHVhdGUuIiB9CiAgICAgICAgICAgICAgICAgXSwKQEAgLTI5Myw3ICszMDcsNyBAQAogICAgICAg ICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInJlbGVhc2VPYmplY3QiLAogICAgICAg ICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog Im9iamVjdElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIg b2YgdGhlIG9iamVjdCB0byByZWxlYXNlLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogIm9iamVjdElkIiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0SWQiLCAiZGVzY3JpcHRpb24iOiAi SWRlbnRpZmllciBvZiB0aGUgb2JqZWN0IHRvIHJlbGVhc2UuIiB9CiAgICAgICAgICAgICAgICAg XSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmVsZWFzZXMgcmVtb3RlIG9iamVj dCB3aXRoIGdpdmVuIGlkLiIKICAgICAgICAgICAgIH0sCkBAIC05NjcsNyArOTgxLDcgQEAKICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJwdXNoTm9kZVRvRnJvbnRlbmQi LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkph dmFTY3JpcHQgb2JqZWN0IGlkIHRvIGNvbnZlcnQgaW50byBub2RlLiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgIiRyZWYiOiAiUnVudGltZS5SZW1vdGVPYmpl Y3RJZCIsICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IG9iamVjdCBpZCB0byBjb252ZXJ0IGlu dG8gbm9kZS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJyZXR1cm5z IjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBlIjogImlu dGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTm9kZSBpZCBmb3IgZ2l2ZW4gb2JqZWN0LiIgfQpAQCAt MTM5NSw3ICsxNDA5LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6 ICJzdGFydCIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAibWF4Q2FsbFN0YWNrRGVwdGgiLCAib3B0aW9uYWwiOiB0cnVlLCAi dHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlNhbXBsZXMgSmF2YVNjcmlwdCBzdGFj ayB0cmFjZXMgdXAgdG8gPGNvZGU+bWF4Q2FsbFN0YWNrRGVwdGg8L2NvZGU+LCBkZWZhdWx0cyB0 byA1LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtYXhDYWxsU3RhY2tEZXB0 aCIsICJvcHRpb25hbCI6IHRydWUsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAi U2FtcGxlcyBKYXZhU2NyaXB0IHN0YWNrIHRyYWNlcyB1cCB0byA8Y29kZT5tYXhDYWxsU3RhY2tE ZXB0aDwvY29kZT4sIGRlZmF1bHRzIHRvIDUuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU3RhcnRzIGNhcHR1cmluZyBpbnN0cnVtZW50YXRp b24gZXZlbnRzLiIKICAgICAgICAgICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCmluZGV4IDkxODYzMTBiOGRiNDRlZjRmMzM2 ZTBiMTJjNmU5N2M4ZWUxODgwYjEuLjI4YWVhNzY5MzhiYTQwMzJiOTk3YjJiMzdhMjI3MjE4NTlm OGU5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50 aW1lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50 aW1lQWdlbnQuY3BwCkBAIC04OSwxMSArODksOSBAQCB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2Vu dDo6Y2FsbEZ1bmN0aW9uT24oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbgog ICAgICAgICAqZXJyb3JTdHJpbmcgPSAiSW5zcGVjdGVkIGZyYW1lIGhhcyBnb25lIjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGFyZ3VtZW50cyA9 IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKLSAgICBpZiAob3B0aW9uYWxBcmd1bWVudHMpIHsK LSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8ICgqb3B0aW9uYWxBcmd1bWVudHMpLT5s ZW5ndGgoKTsgKytpKQotICAgICAgICAgICAgYXJndW1lbnRzLT5wdXNoVmFsdWUoKCpvcHRpb25h bEFyZ3VtZW50cyktPmdldChpKSk7Ci0gICAgfQorICAgIFN0cmluZyBhcmd1bWVudHM7CisgICAg aWYgKG9wdGlvbmFsQXJndW1lbnRzKQorICAgICAgICBhcmd1bWVudHMgPSAoKm9wdGlvbmFsQXJn dW1lbnRzKS0+dG9KU09OU3RyaW5nKCk7CiAgICAgaW5qZWN0ZWRTY3JpcHQuY2FsbEZ1bmN0aW9u T24oZXJyb3JTdHJpbmcsIG9iamVjdElkLCBleHByZXNzaW9uLCBhcmd1bWVudHMsIHJlc3VsdCwg d2FzVGhyb3duKTsKIH0KIAo= 101869 2011-07-25 08:07:56 -0700 2011-07-25 08:08:58 -0700 Patch bug-65110-20110725190754.patch text/plain 17347 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzMThmMzA2YmUyZDJkN2U0NDBkZDQz ZTBmMTQ5ZjFmYWE2Yjc5ZjI4Li42MDE4OGQ0MWJiYTJjODIyZDY3NzQ2ODNiMzMyNmEzMWYzNjI3 OTVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDctMjUgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBkZWRpY2F0 ZWQgdHlwZSBmb3Igb2JqZWN0IGlkIGluIHRoZSBwcm90b2NvbC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MTEwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGltZS9ydW50aW1l LWNhbGxGdW5jdGlvbk9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcnVudGlt ZS9ydW50aW1lLWNhbGxGdW5jdGlvbk9uLmh0bWw6CisKKzIwMTEtMDctMjUgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlZmFj dG9yIHJlbW90ZSBvYmplY3Qgc3RydWN0dXJlIHRvIGNvbnRhaW4gdmFsdWUgZm9yIHByaW1pdGl2 ZSB2YWx1ZXMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NTEwMwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50 aW1lLWNhbGxGdW5jdGlvbk9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9y dW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CmluZGV4IDg3YzVmNDhh NmM5YWI5ZjAyNDE5Yjk3YzgzNjkxYjBjZDU2OWJlNzQuLjVkYTU1YTM0ZjM2YjQ3Y2UxNzk5NWJi MDdkYzU5MzQwZGMzMDFiYTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9ydW50 aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24tZXhwZWN0ZWQudHh0CkBA IC04LDQgKzgsNiBAQCBSdW5uaW5nOiB0ZXN0QXJndW1lbnRzCiB7ImEiOjEsImIiOjJ9CiB7ImEi OjEsImIiOjJ9CiB7ImMiOjEsImQiOjJ9Cis0Cit1bmRlZmluZWQKIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvcnVudGltZS1jYWxsRnVuY3Rpb25Pbi5odG1sIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3J1bnRpbWUvcnVudGltZS1jYWxsRnVuY3Rpb25Pbi5odG1s CmluZGV4IDc2ZjYwYmM1MzJjOGIzODFkMmQwNGMxNTQ1YjRkNGRkMmM5ZTEwOGUuLjNmYTA0MTlj NzA2NWM1Zjc5M2VmZWU0NjNhMmY5ZjE3NTkwYzRjNTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24uaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcnVudGltZS9ydW50aW1lLWNhbGxGdW5jdGlvbk9uLmh0bWwKQEAg LTM3LDEzICszNywxMyBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24g c3RlcDEoZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIGZ1bmN0aW9uIGZvcm1hdChhb2JqMSwgYW9iajIpCisgICAgICAgICAgICAgICAgZnVu Y3Rpb24gZm9ybWF0KGFvYmoxLCBhb2JqMiwgdmFsLCB1bmRlZikKICAgICAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBKU09OLnN0cmluZ2lmeSh0aGlzKSArICJcbiIg KyBKU09OLnN0cmluZ2lmeShhb2JqMSkgKyAiXG4iICsgSlNPTi5zdHJpbmdpZnkoYW9iajIpOwor ICAgICAgICAgICAgICAgICAgICByZXR1cm4gSlNPTi5zdHJpbmdpZnkodGhpcykgKyAiXG4iICsg SlNPTi5zdHJpbmdpZnkoYW9iajEpICsgIlxuIiArIEpTT04uc3RyaW5naWZ5KGFvYmoyKSArICJc biIgKyB2YWwgKyAiXG4iICsgdW5kZWY7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICAgICAgb2JqMiA9IHJlc3VsdDsKLSAgICAgICAgICAgICAgICBSdW50aW1lQWdlbnQuY2FsbEZ1 bmN0aW9uT24ob2JqMS5vYmplY3RJZCwgZm9ybWF0LnRvU3RyaW5nKCksIFtvYmoxLm9iamVjdElk LCBvYmoyLm9iamVjdElkXSwgc3RlcDIpOworICAgICAgICAgICAgICAgIFJ1bnRpbWVBZ2VudC5j YWxsRnVuY3Rpb25PbihvYmoxLm9iamVjdElkLCBmb3JtYXQudG9TdHJpbmcoKSwgW29iajEsIG9i ajIsIHt2YWx1ZTo0fSwge31dLCBzdGVwMik7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IGZ1bmN0aW9uIHN0ZXAyKGVycm9yLCByZXN1bHQsIHdhc1Rocm93bikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0 MmM1NWMwZTlmYWE4MTE5YzA2MjdlMDg4OWMwOGYwYjBlNGNjOWM5Li4xMmEzNGJjNzhhNzEzMzVk N2RkMGM1N2NkNzJlN2Y3Nzk0MTFjZDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIw MTEtMDctMjUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IHVzZSBkZWRpY2F0ZWQgdHlwZSBmb3Igb2JqZWN0IGlkIGluIHRoZSBw cm90b2NvbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY1MTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5qZWN0 ZWRTY3JpcHQ6OmNhbGxGdW5jdGlvbk9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6Cisg ICAgICAgICguKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmNhbGxGdW5jdGlvbk9uKToKKworMjAxMS0wNy0yNSAg UGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVmYWN0b3IgcmVtb3RlIG9iamVjdCBzdHJ1Y3R1cmUgdG8gY29udGFpbiB2YWx1ZSBm b3IgcHJpbWl0aXZlIHZhbHVlcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1MTAzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHQuY3BwCmluZGV4IDQwYjYxNWNiNjMxNzVlM2NiMjc3NDA4N2EzZTQ3YzkwMzcwYzczMzUu LjZjZjY1ZTgyMmY0ZDVhNThlZWU3ZTdiNmFkNTVjZGNhNmFjNWE2NGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcApAQCAtNjMsMTkgKzYzLDEyIEBAIHZv aWQgSW5qZWN0ZWRTY3JpcHQ6OmV2YWx1YXRlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29u c3QgU3RyaW5nJiBleHByZXNzaW9uCiAgICAgbWFrZUV2YWxDYWxsKGVycm9yU3RyaW5nLCBmdW5j dGlvbiwgcmVzdWx0LCB3YXNUaHJvd24pOwogfQogCi12b2lkIEluamVjdGVkU2NyaXB0OjpjYWxs RnVuY3Rpb25PbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgb2JqZWN0 SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4g YXJndW1lbnRzLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNUaHJv d24pCit2b2lkIEluamVjdGVkU2NyaXB0OjpjYWxsRnVuY3Rpb25PbihFcnJvclN0cmluZyogZXJy b3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lv biwgY29uc3QgU3RyaW5nJiBhcmd1bWVudHMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1 bHQsIGJvb2wqIHdhc1Rocm93bikKIHsKICAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24o bV9pbmplY3RlZFNjcmlwdE9iamVjdCwgImNhbGxGdW5jdGlvbk9uIik7CiAgICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQob2JqZWN0SWQpOwogICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGV4 cHJlc3Npb24pOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhcmd1bWVudHMtPmxlbmd0 aCgpOyArK2kpIHsKLSAgICAgICAgU3RyaW5nIGFyZ3VtZW50SWQ7Ci0gICAgICAgIGlmICghYXJn dW1lbnRzLT5nZXQoaSktPmFzU3RyaW5nKCZhcmd1bWVudElkKSkgewotICAgICAgICAgICAgKmVy cm9yU3RyaW5nID0gIkNhbGwgYXJndW1lbnQgc2hvdWxkIGJlIGFuIG9iamVjdCBpZCI7Ci0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoYXJndW1lbnRJZCk7Ci0gICAgfQorICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGFyZ3Vt ZW50cyk7CiAgICAgbWFrZUV2YWxDYWxsKGVycm9yU3RyaW5nLCBmdW5jdGlvbiwgcmVzdWx0LCB3 YXNUaHJvd24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5o CmluZGV4IDljMWQ0NWZmZmQwN2IzZmM5ZTNiMTg0MGYzOTU1MGFiOWEwMTQ0MDguLmM5NDQ3MTVh MzI2YTQ0ZGY5NTI2ZmJhYmI0YTljZTE1YThlYjljZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdC5oCkBAIC01Niw3ICs1Niw3IEBAIHB1YmxpYzoKICAgICBib29s IGhhc05vVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2luamVjdGVkU2NyaXB0T2JqZWN0Lmhhc05v VmFsdWUoKTsgfQogCiAgICAgdm9pZCBldmFsdWF0ZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNsdWRlQ29t bWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Ro cm93bik7Ci0gICAgdm9pZCBjYWxsRnVuY3Rpb25PbihFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgUGFzc1JlZlB0cjxJbnNwZWN0 b3JBcnJheT4gYXJndW1lbnRzLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29s KiB3YXNUaHJvd24pOworICAgIHZvaWQgY2FsbEZ1bmN0aW9uT24oRXJyb3JTdHJpbmcqLCBjb25z dCBTdHJpbmcmIG9iamVjdElkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmlu ZyYgYXJndW1lbnRzLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNU aHJvd24pOwogICAgIHZvaWQgZXZhbHVhdGVPbkNhbGxGcmFtZShFcnJvclN0cmluZyosIGNvbnN0 IFNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzLCBjb25zdCBTdHJpbmcmIGNhbGxGcmFtZUlkLCBjb25z dCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmluZyYgb2JqZWN0R3JvdXAsIGJvb2wgaW5j bHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29s KiB3YXNUaHJvd24pOwogICAgIHZvaWQgZ2V0UHJvcGVydGllcyhFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgb2JqZWN0SWQsIGJvb2wgaWdub3JlSGFzT3duUHJvcGVydHksIFJlZlB0cjxJbnNw ZWN0b3JBcnJheT4qIHJlc3VsdCk7CiAgICAgTm9kZSogbm9kZUZvck9iamVjdElkKGNvbnN0IFN0 cmluZyYgb2JqZWN0SWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0U291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0U291cmNlLmpzCmluZGV4IDY0NDk3NDdiZTY4ODdhMGYwYWEwODExNDk3MDg4ZjQxNzA0 NmQxMzkuLjM1YmQxMTVjOGJkNDY3MmY3NjAxMTM5NDZkMzNkNTFlZjBjYzFlNzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTI3 NywyNCArMjc3LDMzIEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX2V2YWx1YXRlQW5kV3JhcChJbmplY3RlZFNjcmlwdEhvc3QuZXZhbHVhdGUsIElu amVjdGVkU2NyaXB0SG9zdCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGZhbHNlLCBpbmplY3RD b21tYW5kTGluZUFQSSk7CiAgICAgfSwKIAotICAgIGNhbGxGdW5jdGlvbk9uOiBmdW5jdGlvbihv YmplY3RJZCwgZXhwcmVzc2lvbikKKyAgICBjYWxsRnVuY3Rpb25PbjogZnVuY3Rpb24ob2JqZWN0 SWQsIGV4cHJlc3Npb24sIGFyZ3MpCiAgICAgewogICAgICAgICB2YXIgcGFyc2VkT2JqZWN0SWQg PSB0aGlzLl9wYXJzZU9iamVjdElkKG9iamVjdElkKTsKICAgICAgICAgdmFyIG9iamVjdCA9IHRo aXMuX29iamVjdEZvcklkKHBhcnNlZE9iamVjdElkKTsKICAgICAgICAgaWYgKCFvYmplY3QpCiAg ICAgICAgICAgICByZXR1cm4gIkNvdWxkIG5vdCBmaW5kIG9iamVjdCB3aXRoIGdpdmVuIGlkIjsK IAotICAgICAgICB2YXIgcmVzb2x2ZWRBcmdzID0gW107Ci0gICAgICAgIGZvciAodmFyIGkgPSAy OyBpIDwgYXJndW1lbnRzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgcGFyc2VkQXJn SWQgPSB0aGlzLl9wYXJzZU9iamVjdElkKGFyZ3VtZW50c1tpXSk7Ci0gICAgICAgICAgICBpZiAo IXBhcnNlZEFyZ0lkIHx8IHBhcnNlZEFyZ0lkLmluamVjdGVkU2NyaXB0SWQgIT09IGluamVjdGVk U2NyaXB0SWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuICJBcmd1bWVudHMgc2hvdWxkIGJlbG9u ZyB0byB0aGUgc2FtZSBKYXZhU2NyaXB0IHdvcmxkIGFzIHRoZSB0YXJnZXQgb2JqZWN0LiI7Ci0g ICAgICAgICAgICAKLSAgICAgICAgICAgIHZhciByZXNvbHZlZEFyZyA9IHRoaXMuX29iamVjdEZv cklkKHBhcnNlZEFyZ0lkKTsKLSAgICAgICAgICAgIGlmICghcmVzb2x2ZWRBcmcpCi0gICAgICAg ICAgICAgICAgcmV0dXJuICJDb3VsZCBub3QgZmluZCBvYmplY3Qgd2l0aCBnaXZlbiBpZCI7Ci0K LSAgICAgICAgICAgIHJlc29sdmVkQXJncy5wdXNoKHJlc29sdmVkQXJnKTsKKyAgICAgICAgaWYg KGFyZ3MpIHsKKyAgICAgICAgICAgIHZhciByZXNvbHZlZEFyZ3MgPSBbXTsKKyAgICAgICAgICAg IGFyZ3MgPSBJbmplY3RlZFNjcmlwdEhvc3QuZXZhbHVhdGUoYXJncyk7CisgICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IGFyZ3MubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAgICB2 YXIgb2JqZWN0SWQgPSBhcmdzW2ldLm9iamVjdElkOworICAgICAgICAgICAgICAgIGlmIChvYmpl Y3RJZCkgeworICAgICAgICAgICAgICAgICAgICB2YXIgcGFyc2VkQXJnSWQgPSB0aGlzLl9wYXJz ZU9iamVjdElkKG9iamVjdElkKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFwYXJzZWRBcmdJ ZCB8fCBwYXJzZWRBcmdJZC5pbmplY3RlZFNjcmlwdElkICE9PSBpbmplY3RlZFNjcmlwdElkKQor ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuICJBcmd1bWVudHMgc2hvdWxkIGJlbG9uZyB0 byB0aGUgc2FtZSBKYXZhU2NyaXB0IHdvcmxkIGFzIHRoZSB0YXJnZXQgb2JqZWN0LiI7CisKKyAg ICAgICAgICAgICAgICAgICAgdmFyIHJlc29sdmVkQXJnID0gdGhpcy5fb2JqZWN0Rm9ySWQocGFy c2VkQXJnSWQpOworICAgICAgICAgICAgICAgICAgICBpZiAoIXJlc29sdmVkQXJnKQorICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuICJDb3VsZCBub3QgZmluZCBvYmplY3Qgd2l0aCBnaXZl biBpZCI7CisKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZWRBcmdzLnB1c2gocmVzb2x2ZWRB cmcpOworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoYXJnc1tpXS52YWx1ZSkKKyAgICAgICAg ICAgICAgICAgICAgcmVzb2x2ZWRBcmdzLnB1c2goYXJnc1tpXS52YWx1ZSk7CisgICAgICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByZXNvbHZlZEFyZ3MucHVzaCh1bmRlZmlu ZWQpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgdHJ5IHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCAzNmZlYWZhM2JjYmZkNGZhYjY0NzQy ZDJjYzY1NzBhNWY5MWQwZTM3Li5hN2JjZjIxYjU3OWMwN2RhMThkZmUxNjcyOWZhZGUwOGMwYzM5 ZDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0yMTgsNiAr MjE4LDExIEBACiAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSdW50aW1lIGRvbWFpbiBleHBvc2Vz IEphdmFTY3JpcHQgcnVudGltZSBieSBtZWFucyBvZiByZW1vdGUgZXZhbHVhdGlvbiBhbmQgbWly cm9yIG9iamVjdHMuIEV2YWx1YXRpb24gcmVzdWx0cyBhcmUgcmV0dXJuZWQgYXMgbWlycm9yIG9i amVjdCB0aGF0IGV4cG9zZSB0eXBlLCBzdHJpbmcgcmVwcmVzZW50YXRpb24gYW5kIHVuaXF1ZSBp ZGVudGlmaWVyIHRoYXQgY2FuIGJlIHVzZWQgZm9yIGZ1cnRoZXIgb2JqZWN0IGludGVyYWN0aW9u LiBPcmlnaW5hbCBvYmplY3RzIGFyZSBtYWludGFpbmVkIGluIG1lbW9yeSB1bmxlc3MgdGhleSBh cmUgZWl0aGVyIGV4cGxpY2l0bHkgcmVsZWFzZWQgb3IgYXJlIHJlbGVhc2VkIGFsb25nIHdpdGgg dGhlIG90aGVyIG9iamVjdHMgaW4gdGhlaXIgb2JqZWN0IGdyb3VwLiIsCiAgICAgICAgICJ0eXBl cyI6IFsKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiUmVtb3RlT2JqZWN0 SWQiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCisgICAgICAgICAgICAgICAg ImRlc2NyaXB0aW9uIjogIlVuaXF1ZSBvYmplY3QgaWRlbnRpZmllci4iCisgICAgICAgICAgICB9 LAorICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJpZCI6ICJSZW1vdGVPYmplY3QiLAog ICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIk1pcnJvciBvYmplY3QgcmVmZXJlbmNpbmcgb3JpZ2luYWwgSmF2YVNjcmlwdCBv YmplY3QuIiwKQEAgLTIyNyw3ICsyMzIsNyBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImNsYXNzTmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJPYmplY3QgY2xhc3MgKGNvbnN0cnVjdG9yKSBuYW1lLiBTcGVjaWZpZWQgZm9y IDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1ZXMgb25seS4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJhbnkiLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiUmVtb3RlIG9iamVjdCB2YWx1ZSAoaW4gY2FzZSBvZiBwcmltaXRp dmUgdmFsdWVzKS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGVzY3JpcHRp b24iLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAi U3RyaW5nIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBvYmplY3QuIiB9LAotICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlVuaXF1ZSBvYmplY3QgaWRlbnRpZmllciAoZm9yIG5vbi1w cmltaXRpdmUgdmFsdWVzKS4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmpl Y3RJZCIsICIkcmVmIjogIlJlbW90ZU9iamVjdElkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIlVuaXF1ZSBvYmplY3QgaWRlbnRpZmllciAoZm9yIG5vbi1wcmltaXRpdmUgdmFs dWVzKS4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewpAQCAtMjQwLDYgKzI0NSwxNSBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIndh c1Rocm93biIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRp b24iOiAiVHJ1ZSBpZiBleGNlcHRpb24gd2FzIHRocm93biBvbiBhdHRlbXB0IHRvIGdldCB0aGUg cHJvcGVydHkgdmFsdWUsIGluIHRoYXQgY2FzZSB0aGUgdmFsdWUgcHJvcGVyeSB3aWxsIGNvbnRh aW4gdGhyb3duIHZhbHVlLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpc0dl dHRlciIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiVHJ1ZSBpZiB0aGlzIHByb3BlcnR5IGlzIGdldHRlci4iIH0KICAgICAgICAgICAgICAgICBd CisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6ICJD YWxsQXJndW1lbnQiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCisgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJlcHJlc2VudHMgZnVuY3Rpb24gY2FsbCBhcmd1bWVu dC4gRWl0aGVyIHJlbW90ZSBvYmplY3QgaWQgPGNvZGU+b2JqZWN0SWQ8L2NvZGU+IG9yIHByaW1p dGl2ZSA8Y29kZT52YWx1ZTwvY29kZT4gb3IgbmVpdGhlciBvZiAoZm9yIHVuZGVmaW5lZCkgdGhl bSBzaG91bGQgYmUgc3BlY2lmaWVkLiIsCisgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiBb CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJhbnkiLCAi b3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiUHJpbWl0aXZlIHZhbHVlLiIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RJZCIsICIkcmVmIjogIlJlbW90ZU9i amVjdCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJSZW1vdGUgb2JqZWN0IGhh bmRsZS4iIH0KKyAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9CiAgICAgICAgIF0sCiAg ICAgICAgICJjb21tYW5kcyI6IFsKQEAgLTI1NSwyNSArMjY5LDI1IEBACiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAicmVzdWx0IiwgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgImRlc2Ny aXB0aW9uIjogIkV2YWx1YXRpb24gcmVzdWx0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ3YXNUaHJvd24iLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIlRydWUgaWZmIHRoZSByZXN1bHQgd2FzIHRocm93biBkdXJpbmcgdGhl IGV2YWx1YXRpb24uIiB9CiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAiZGVz Y3JpcHRpb24iOiAiRXZhbHVhdGUgZXhwcmVzc2lvbiBvbiBnbG9iYWwgb2JqZWN0LiIKKyAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRXZhbHVhdGVzIGV4cHJlc3Npb24gb24gZ2xvYmFs IG9iamVjdC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAg ICJuYW1lIjogImNhbGxGdW5jdGlvbk9uIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RJZCIsICJ0eXBlIjogInN0 cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBvYmplY3QgdG8gY2FsbCBm dW5jdGlvbiBvbi4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQi LCAiJHJlZiI6ICJSZW1vdGVPYmplY3RJZCIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9m IHRoZSBvYmplY3QgdG8gY2FsbCBmdW5jdGlvbiBvbi4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiZnVuY3Rpb25EZWNsYXJhdGlvbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNj cmlwdGlvbiI6ICJEZWNsYXJhdGlvbiBvZiB0aGUgZnVuY3Rpb24gdG8gY2FsbC4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYXJndW1lbnRzIiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9m IHRoZSBhcmd1bWVudC4iIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDYWxs IGFyZ3VtZW50cy4gQWxsIGNhbGwgYXJndW1lbnRzIG11c3QgYmVsb25nIHRvIHRoZSBzYW1lIEph dmFTY3JpcHQgd29ybGQgYXMgdGhlIHRhcmdldCBvYmplY3QuIiB9CisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiYXJndW1lbnRzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIk cmVmIjogIkNhbGxBcmd1bWVudCIsICJkZXNjcmlwdGlvbiI6ICJDYWxsIGFyZ3VtZW50LiIgfSwg Im9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNhbGwgYXJndW1lbnRzLiBBbGwgY2Fs bCBhcmd1bWVudHMgbXVzdCBiZWxvbmcgdG8gdGhlIHNhbWUgSmF2YVNjcmlwdCB3b3JsZCBhcyB0 aGUgdGFyZ2V0IG9iamVjdC4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAg ICJyZXR1cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICIk cmVmIjogIlJlbW90ZU9iamVjdCIsICJkZXNjcmlwdGlvbiI6ICJDYWxsIHJlc3VsdC4iIH0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAid2FzVGhyb3duIiwgInR5cGUiOiAiYm9vbGVh biIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmZiB0aGUgcmVzdWx0 IHdhcyB0aHJvd24gZHVyaW5nIHRoZSBldmFsdWF0aW9uLiIgfQogICAgICAgICAgICAgICAgIF0s Ci0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNhbGwgZnVuY3Rpb24gd2l0aCBnaXZl biBkZWNsYXJhdGlvbiBvbiB0aGUgZ2l2ZW4gb2JqZWN0LiIKKyAgICAgICAgICAgICAgICAiZGVz Y3JpcHRpb24iOiAiQ2FsbHMgZnVuY3Rpb24gd2l0aCBnaXZlbiBkZWNsYXJhdGlvbiBvbiB0aGUg Z2l2ZW4gb2JqZWN0LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgIm5hbWUiOiAiZ2V0UHJvcGVydGllcyIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRl cnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0aGUgb2JqZWN0IHRvIHJl dHVybiBwcm9wZXJ0aWVzIGZvci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi b2JqZWN0SWQiLCAiJHJlZiI6ICJSZW1vdGVPYmplY3RJZCIsICJkZXNjcmlwdGlvbiI6ICJJZGVu dGlmaWVyIG9mIHRoZSBvYmplY3QgdG8gcmV0dXJuIHByb3BlcnRpZXMgZm9yLiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZ25vcmVIYXNPd25Qcm9wZXJ0eSIsICJ0eXBlIjog ImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiSWYgdHJ1ZSwgcmV0dXJucyBwcm9wZXJ0aWVzIGJl bG9uZ2luZyB0byBhbnkgZWxlbWVudCBvZiB0aGUgcHJvdG90eXBlIGNoYWluLiIgfQogICAgICAg ICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCkBAIC0yODQsNyArMjk4 LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRQcm9wZXJ0 eVZhbHVlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJvYmplY3RJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJJZGVudGlmaWVyIG9mIHRoZSBvYmplY3QgdG8gc2V0IHByb3BlcnR5IG9uLiIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RJZCIsICIkcmVmIjogIlJlbW90ZU9i amVjdElkIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIG9iamVjdCB0byBzZXQg cHJvcGVydHkgb24uIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInByb3BlcnR5 TmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJQcm9wZXJ0eSBuYW1lIHRv IHNldCB2YWx1ZSBmb3IuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImV4cHJl c3Npb24iLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRXhwcmVzc2lvbiB0byBl dmFsdWF0ZS4iIH0KICAgICAgICAgICAgICAgICBdLApAQCAtMjkzLDcgKzMwNyw3IEBACiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVsZWFzZU9iamVjdCIsCiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAib2JqZWN0SWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmll ciBvZiB0aGUgb2JqZWN0IHRvIHJlbGVhc2UuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAib2JqZWN0SWQiLCAiJHJlZiI6ICJSZW1vdGVPYmplY3RJZCIsICJkZXNjcmlwdGlvbiI6 ICJJZGVudGlmaWVyIG9mIHRoZSBvYmplY3QgdG8gcmVsZWFzZS4iIH0KICAgICAgICAgICAgICAg ICBdLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZWxlYXNlcyByZW1vdGUgb2Jq ZWN0IHdpdGggZ2l2ZW4gaWQuIgogICAgICAgICAgICAgfSwKQEAgLTk2Nyw3ICs5ODEsNyBAQAog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInB1c2hOb2RlVG9Gcm9udGVu ZCIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAib2JqZWN0SWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi SmF2YVNjcmlwdCBvYmplY3QgaWQgdG8gY29udmVydCBpbnRvIG5vZGUuIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAiJHJlZiI6ICJSdW50aW1lLlJlbW90ZU9i amVjdElkIiwgImRlc2NyaXB0aW9uIjogIkphdmFTY3JpcHQgb2JqZWN0IGlkIHRvIGNvbnZlcnQg aW50byBub2RlLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVy bnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAi aW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJOb2RlIGlkIGZvciBnaXZlbiBvYmplY3QuIiB9CkBA IC0xMzk1LDcgKzE0MDksNyBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1l IjogInN0YXJ0IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJtYXhDYWxsU3RhY2tEZXB0aCIsICJvcHRpb25hbCI6IHRydWUs ICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2FtcGxlcyBKYXZhU2NyaXB0IHN0 YWNrIHRyYWNlcyB1cCB0byA8Y29kZT5tYXhDYWxsU3RhY2tEZXB0aDwvY29kZT4sIGRlZmF1bHRz IHRvIDUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm1heENhbGxTdGFja0Rl cHRoIiwgIm9wdGlvbmFsIjogdHJ1ZSwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6 ICJTYW1wbGVzIEphdmFTY3JpcHQgc3RhY2sgdHJhY2VzIHVwIHRvIDxjb2RlPm1heENhbGxTdGFj a0RlcHRoPC9jb2RlPiwgZGVmYXVsdHMgdG8gNS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTdGFydHMgY2FwdHVyaW5nIGluc3RydW1lbnRh dGlvbiBldmVudHMuIgogICAgICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKaW5kZXggOTE4NjMxMGI4ZGI0NGVmNGYz MzZlMGIxMmM2ZTk3YzhlZTE4ODBiMS4uMjhhZWE3NjkzOGJhNDAzMmI5OTdiMmIzN2EyMjcyMTg1 OWY4ZTk0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1 bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1 bnRpbWVBZ2VudC5jcHAKQEAgLTg5LDExICs4OSw5IEBAIHZvaWQgSW5zcGVjdG9yUnVudGltZUFn ZW50OjpjYWxsRnVuY3Rpb25PbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmlu CiAgICAgICAgICplcnJvclN0cmluZyA9ICJJbnNwZWN0ZWQgZnJhbWUgaGFzIGdvbmUiOwogICAg ICAgICByZXR1cm47CiAgICAgfQotICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gYXJndW1lbnRz ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwotICAgIGlmIChvcHRpb25hbEFyZ3VtZW50cykg ewotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgKCpvcHRpb25hbEFyZ3VtZW50cykt Pmxlbmd0aCgpOyArK2kpCi0gICAgICAgICAgICBhcmd1bWVudHMtPnB1c2hWYWx1ZSgoKm9wdGlv bmFsQXJndW1lbnRzKS0+Z2V0KGkpKTsKLSAgICB9CisgICAgU3RyaW5nIGFyZ3VtZW50czsKKyAg ICBpZiAob3B0aW9uYWxBcmd1bWVudHMpCisgICAgICAgIGFyZ3VtZW50cyA9ICgqb3B0aW9uYWxB cmd1bWVudHMpLT50b0pTT05TdHJpbmcoKTsKICAgICBpbmplY3RlZFNjcmlwdC5jYWxsRnVuY3Rp b25PbihlcnJvclN0cmluZywgb2JqZWN0SWQsIGV4cHJlc3Npb24sIGFyZ3VtZW50cywgcmVzdWx0 LCB3YXNUaHJvd24pOwogfQogCg==