65701 2011-08-04 10:20:34 -0700 Web Inspector: auto-completion for string literals doesn't work 2011-08-10 07:37:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 antonm pfeldman apavlov bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 446593 0 antonm 2011-08-04 10:20:34 -0700 In console 'a'. does suggest possible completions. 449063 1 103459 pfeldman 2011-08-10 03:03:44 -0700 Created attachment 103459 Patch 449064 2 webkit.review.bot 2011-08-10 03:07:46 -0700 Attachment 103459 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:77: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorDebuggerAgent.cpp:398: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorDebuggerAgent.h:107: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InjectedScript.h:79: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 4 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 449070 3 103459 webkit.review.bot 2011-08-10 03:29:00 -0700 Comment on attachment 103459 Patch Attachment 103459 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9340519 New failing tests: inspector/network-status-non-http.html 449110 4 103459 yurys 2011-08-10 06:08:20 -0700 Comment on attachment 103459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103459&action=review > Source/WebCore/inspector/front-end/ConsoleView.js:427 > + function getCompletions(primitiveType) This must be left as var getCompletions = function... to avoid cluttering inspected global scope with our named functions. 449138 5 pfeldman 2011-08-10 07:37:48 -0700 Committed r92768: <http://trac.webkit.org/changeset/92768> 103459 2011-08-10 03:03:44 -0700 2011-08-10 06:08:20 -0700 Patch bug-65701-20110810140341.patch text/plain 25319 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTI2OTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ODM2MTViMGM4ZTBhNjZhOTViZWNh YjI2OWFhNTViMWQ1ZjllZjcyLi40YTNhYTgyY2E1ZTQyMWI3YzVkZDRkYTYwNjhjMWM1ZTIxNGFm OWMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMTAgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGF1dG8tY29tcGxl dGlvbiBmb3Igc3RyaW5nIGxpdGVyYWxzIGRvZXNuJ3Qgd29yaworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3MDEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dl ci1jb21wbGV0aW9ucy1vbi1jYWxsLWZyYW1lLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS5odG1sOgor CiAyMDExLTA4LTA5ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAg ICAgICBOb3QgcmV2aWV3ZWQ6IHJlYmFzZWxpbmluZyBpbnNwZWN0b3IgdGVzdC4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1v bi1jYWxsLWZyYW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1vbi1jYWxsLWZyYW1lLWV4cGVjdGVkLnR4dAppbmRleCAx NDU3MzIwZGEwNDVkYjNjNDczZjExZTE2ZDcxNDM3NzQ5MDc4NDZlLi5kM2NjZDBiNmVmNjQ4M2Iy YjZkNGQxOWZkODJkY2I1ODJmNDA1NGNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2FsbC1mcmFtZS1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLWNvbXBsZXRp b25zLW9uLWNhbGwtZnJhbWUtZXhwZWN0ZWQudHh0CkBAIC05LDYgKzksNyBAQCBkaXIKIGRpcnht bAogd2luZG93CiB0aGlzCit0b0V4cG9uZW50aWFsCiBTY3JpcHQgZXhlY3V0aW9uIHJlc3VtZWQu CiBEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1vbi1jYWxsLWZyYW1lLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItY29tcGxldGlvbnMtb24tY2Fs bC1mcmFtZS5odG1sCmluZGV4IDE3M2VhZTlhNzY2ZWYwYjIwZGZjYzA3MjQyODk1ZDhlYTM2OTFj OWMuLmNhMGUzNTQ5NzRmMWY0Mjg2MzkzY2RjYmNlOGNmN2U4NjliOTY4MWIgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1jb21wbGV0aW9ucy1vbi1j YWxsLWZyYW1lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVn Z2VyLWNvbXBsZXRpb25zLW9uLWNhbGwtZnJhbWUuaHRtbApAQCAtMjMsMzAgKzIzLDQwIEBAIHZh ciB0ZXN0ID0gZnVuY3Rpb24oKQogCiAgICAgZnVuY3Rpb24gc3RlcDIoKQogICAgIHsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAidmFyIiwgZmFsc2UsIGNo ZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgInZhcjEiLCAidmFyMiIgXSwgc3RlcDMpKTsK KyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAidmFyIiwgZmFs c2UsIGNoZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgInZhcjEiLCAidmFyMiIgXSwgW10s IHN0ZXAzKSk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gc3RlcDMoKQogICAgIHsKLSAgICAgICAg V2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAiZGkiLCBmYWxzZSwgY2hlY2tB Z2FpbnN0R29sZGVuLmJpbmQodGhpcywgWyAiZGlyIiwgImRpcnhtbCIgXSwgc3RlcDQpKTsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAiZGkiLCBmYWxzZSwg Y2hlY2tBZ2FpbnN0R29sZGVuLmJpbmQodGhpcywgWyAiZGlyIiwgImRpcnhtbCIgXSwgW10sIHN0 ZXA0KSk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gc3RlcDQoKQogICAgIHsKLSAgICAgICAgV2Vi SW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAid2luIiwgZmFsc2UsIGNoZWNrQWdh aW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgIndpbmRvdyIgXSwgc3RlcDUpKTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLmNvbnNvbGUuX2NvbXBsZXRpb25zKCIiLCAid2luIiwgZmFsc2UsIGNoZWNrQWdh aW5zdEdvbGRlbi5iaW5kKHRoaXMsIFsgIndpbmRvdyIgXSwgW10sIHN0ZXA1KSk7CiAgICAgfQog CiAgICAgZnVuY3Rpb24gc3RlcDUoKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNv bGUuX2NvbXBsZXRpb25zKCIiLCAidCIsIGZhbHNlLCBjaGVja0FnYWluc3RHb2xkZW4uYmluZCh0 aGlzLCBbICJ0aGlzIiBdLCBzdGVwNikpOworICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5f Y29tcGxldGlvbnMoIiIsICJ0IiwgZmFsc2UsIGNoZWNrQWdhaW5zdEdvbGRlbi5iaW5kKHRoaXMs IFsgInRoaXMiIF0sIFtdLCBzdGVwNikpOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIHN0ZXA2KCkK ICAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLl9jb21wbGV0aW9ucygidmFyMSIs ICJ0b0V4cCIsIGZhbHNlLCBjaGVja0FnYWluc3RHb2xkZW4uYmluZCh0aGlzLCBbICJ0b0V4cG9u ZW50aWFsIiBdLCBbXSwgc3RlcDcpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBzdGVwNygpCisg ICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5fY29tcGxldGlvbnMoIjEyMyIsICJ0 b0V4cCIsIGZhbHNlLCBjaGVja0FnYWluc3RHb2xkZW4uYmluZCh0aGlzLCBbXSwgWyAidG9FeHBv bmVudGlhbCIgXSwgc3RlcDgpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBzdGVwOCgpCisgICAg ewogICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlRGVidWdnZXJUZXN0KCk7CiAgICAgfQog Ci0gICAgZnVuY3Rpb24gY2hlY2tBZ2FpbnN0R29sZGVuKGdvbGRlbiwgY29udGludWF0aW9uLCBj b21wbGV0aW9ucykKKyAgICBmdW5jdGlvbiBjaGVja0FnYWluc3RHb2xkZW4oZ29sZGVuLCBhbnRp R29sZGVuLCBjb250aW51YXRpb24sIGNvbXBsZXRpb25zKQogICAgIHsKICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBnb2xkZW4ubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIGlmIChjb21w bGV0aW9ucy5pbmRleE9mKGdvbGRlbltpXSkgIT09IC0xKQpAQCAtNTQsNiArNjQsMTIgQEAgdmFy IHRlc3QgPSBmdW5jdGlvbigpCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5hZGRSZXN1bHQoIk5PVCBGT1VORDogIiArIGdvbGRlbltpXSk7CiAgICAgICAg IH0KKworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFudGlHb2xkZW4ubGVuZ3RoOyArK2kp IHsKKyAgICAgICAgICAgIGlmIChjb21wbGV0aW9ucy5pbmRleE9mKGFudGlHb2xkZW5baV0pICE9 PSAtMSkKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiRk9VTkQ6ICIg KyBhbnRpR29sZGVuW2ldKTsKKyAgICAgICAgfQorCiAgICAgICAgIGNvbnRpbnVhdGlvbigpOwog ICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkOTllNjUxZGQ3MmNhMGRjYzk5OTFiYjQ3Y2NhZjBjN2Yx MzYyYmRlLi41YTkwZGNhZWQ1Yjg1M2MzNjViZmY1ZWY4Nzc5NzYzZDViYWQ3YmMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDgtMTAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGF1dG8tY29tcGxldGlvbiBm b3Igc3RyaW5nIGxpdGVyYWxzIGRvZXNuJ3Qgd29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdDo6ZXZhbHVhdGVPbkNhbGxGcmFtZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Lmg6CisgICAgICAgICogaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0U291cmNlLmpzOgorICAgICAgICAoLik6CisgICAgICAgICgpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1 Z2dlckFnZW50OjpldmFsdWF0ZU9uQ2FsbEZyYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9jb21wbGV0aW9ucy5ldmFsdWF0ZWQuZ2V0Q29tcGxldGlvbnMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY29tcGxldGlvbnMuZXZhbHVhdGVkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX2NvbXBsZXRpb25zLnJl Y2VpdmVkUHJvcGVydHlOYW1lc0Zyb21FdmFsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25z b2xlVmlldy5wcm90b3R5cGUuX2NvbXBsZXRpb25zLnJlY2VpdmVkUHJvcGVydHlOYW1lcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9jb21wbGV0aW9ucyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmV2YWxJbkluc3Bl Y3RlZFdpbmRvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNlbmF0aW9uQ2FsbEZy YW1lLnByb3RvdHlwZS5ldmFsdWF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxG cmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlw dHNQYW5lbC5wcm90b3R5cGUuZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lKToKKwogMjAxMS0w OC0wOSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgSmF2 YSBCcmlkZ2UgbGVha3MgbG9jYWwgcmVmZXJlbmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdC5jcHAKaW5kZXggZWNlNjlhNzg4MTI4ZGY1YjRhZTk3YTFkMWYwODAz MWNkMTY1NDUxMi4uZDI4OTAzMjQ4NzNhZGY4NTZhNDBjMTYyZmNjMmUxZTM2ZjE5NGFjMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC03NCw3ICs3 NCw3IEBAIHZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmNhbGxGdW5jdGlvbk9uKEVycm9yU3RyaW5nKiBl cnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBvYmplCiAgICAgbWFrZUV2YWxDYWxsKGVycm9yU3Ry aW5nLCBmdW5jdGlvbiwgcmVzdWx0LCB3YXNUaHJvd24pOwogfQogCi12b2lkIEluamVjdGVkU2Ny aXB0OjpldmFsdWF0ZU9uQ2FsbEZyYW1lKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3Qg U2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0IFN0cmluZyYgY2FsbEZyYW1lSWQsIGNvbnN0 IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNs dWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wq IHdhc1Rocm93bikKK3ZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmV2YWx1YXRlT25DYWxsRnJhbWUoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywgY29u c3QgU3RyaW5nJiBjYWxsRnJhbWVJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBT dHJpbmcmIG9iamVjdEdyb3VwLCBib29sIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgYm9vbCByZXR1 cm5CeVZhbHVlLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNUaHJv d24pCiB7CiAgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1faW5qZWN0ZWRTY3JpcHRP YmplY3QsICJldmFsdWF0ZU9uQ2FsbEZyYW1lIik7CiAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoY2FsbEZyYW1lcyk7CkBAIC04Miw2ICs4Miw3IEBAIHZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmV2 YWx1YXRlT25DYWxsRnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTY3JpcHRW CiAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoZXhwcmVzc2lvbik7CiAgICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQob2JqZWN0R3JvdXApOwogICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50 KGluY2x1ZGVDb21tYW5kTGluZUFQSSk7CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQocmV0 dXJuQnlWYWx1ZSk7CiAgICAgbWFrZUV2YWxDYWxsKGVycm9yU3RyaW5nLCBmdW5jdGlvbiwgcmVz dWx0LCB3YXNUaHJvd24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdC5oCmluZGV4IDNlZWQ1ZjEzMTgzZjg2ZjBlOGVhMDdhNzhkOGE5MDRhYTA1OTY3MDEuLmIx YmIxMjQ3OWY3NGRiMTIzMzFkZTFmMjc2NTk4ZjNhYTBkMDlhYWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCkBAIC02OSw3ICs2OSwxNSBAQCBwdWJsaWM6CiAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIHJldHVybkJ5VmFsdWUsCiAgICAgICAgICAgICAg ICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LAogICAgICAgICAgICAg ICAgICAgICAgICAgYm9vbCogd2FzVGhyb3duKTsKLSAgICB2b2lkIGV2YWx1YXRlT25DYWxsRnJh bWUoRXJyb3JTdHJpbmcqLCBjb25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywgY29uc3QgU3Ry aW5nJiBjYWxsRnJhbWVJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcm IG9iamVjdEdyb3VwLCBib29sIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4qIHJlc3VsdCwgYm9vbCogd2FzVGhyb3duKTsKKyAgICB2b2lkIGV2YWx1YXRlT25D YWxsRnJhbWUoRXJyb3JTdHJpbmcqLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgU3RyaW5nJiBjYWxsRnJhbWVJZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgU3RyaW5nJiBleHByZXNzaW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBTdHJpbmcmIG9iamVjdEdyb3VwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIGluY2x1ZGVDb21tYW5kTGluZUFQSSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ym9vbCByZXR1cm5CeVZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sKiB3YXNUaHJvd24pOwogICAgIHZvaWQgZ2V0UHJvcGVydGllcyhFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgb2JqZWN0SWQsIGJvb2wgaWdub3JlSGFzT3duUHJvcGVydHksIFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4qIHJlc3VsdCk7CiAgICAgTm9kZSogbm9kZUZvck9iamVjdElkKGNvbnN0 IFN0cmluZyYgb2JqZWN0SWQpOwogICAgIHZvaWQgcmVsZWFzZU9iamVjdChjb25zdCBTdHJpbmcm IG9iamVjdElkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdFNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dFNvdXJjZS5qcwppbmRleCA4ZmFiMzFmMTc4ZDE4MTBmYmFjYThiZjQxYWViODEyYTljOTU5ZjA5 Li5lMjk4NjA1MWI5NmU4YzUzMDQ1ZTdiNTM0NTUwMWRiZTM3NmJlODdkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCkBAIC0zMzcsMTIg KzMzNywxMiBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBy ZXN1bHQ7CiAgICAgfSwKIAotICAgIGV2YWx1YXRlT25DYWxsRnJhbWU6IGZ1bmN0aW9uKHRvcENh bGxGcmFtZSwgY2FsbEZyYW1lSWQsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmplY3RDb21t YW5kTGluZUFQSSkKKyAgICBldmFsdWF0ZU9uQ2FsbEZyYW1lOiBmdW5jdGlvbih0b3BDYWxsRnJh bWUsIGNhbGxGcmFtZUlkLCBleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5qZWN0Q29tbWFuZExp bmVBUEksIHJldHVybkJ5VmFsdWUpCiAgICAgewogICAgICAgICB2YXIgY2FsbEZyYW1lID0gdGhp cy5fY2FsbEZyYW1lRm9ySWQodG9wQ2FsbEZyYW1lLCBjYWxsRnJhbWVJZCk7CiAgICAgICAgIGlm ICghY2FsbEZyYW1lKQogICAgICAgICAgICAgcmV0dXJuICJDb3VsZCBub3QgZmluZCBjYWxsIGZy YW1lIHdpdGggZ2l2ZW4gaWQiOwotICAgICAgICByZXR1cm4gdGhpcy5fZXZhbHVhdGVBbmRXcmFw KGNhbGxGcmFtZS5ldmFsdWF0ZSwgY2FsbEZyYW1lLCBleHByZXNzaW9uLCBvYmplY3RHcm91cCwg dHJ1ZSwgaW5qZWN0Q29tbWFuZExpbmVBUEkpOworICAgICAgICByZXR1cm4gdGhpcy5fZXZhbHVh dGVBbmRXcmFwKGNhbGxGcmFtZS5ldmFsdWF0ZSwgY2FsbEZyYW1lLCBleHByZXNzaW9uLCBvYmpl Y3RHcm91cCwgdHJ1ZSwgaW5qZWN0Q29tbWFuZExpbmVBUEksIHJldHVybkJ5VmFsdWUpOwogICAg IH0sCiAKICAgICBfY2FsbEZyYW1lRm9ySWQ6IGZ1bmN0aW9uKHRvcENhbGxGcmFtZSwgY2FsbEZy YW1lSWQpCkBAIC00NTQsNyArNDU0LDYgQEAgSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0ID0g ZnVuY3Rpb24ob2JqZWN0LCBvYmplY3RHcm91cE5hbWUsIGZvcmNlVmFsdWVUeXBlKQogewogICAg IHRoaXMudHlwZSA9IHR5cGVvZiBvYmplY3Q7CiAgICAgaWYgKGluamVjdGVkU2NyaXB0LmlzUHJp bWl0aXZlVmFsdWUob2JqZWN0KSB8fCBvYmplY3QgPT09IG51bGwgfHwgZm9yY2VWYWx1ZVR5cGUp IHsKLQogICAgICAgICAvLyBXZSBkb24ndCBzZW5kIHVuZGVmaW5lZCB2YWx1ZXMgb3ZlciBKU09O LgogICAgICAgICBpZiAodHlwZW9mIG9iamVjdCAhPT0gInVuZGVmaW5lZCIpCiAgICAgICAgICAg ICB0aGlzLnZhbHVlID0gb2JqZWN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uCmluZGV4IGVkMDk4NDUyYjFmZGM1Y2ZmNDgwYjY1MzMyNWQ2MjNmZGM5YmE2NzguLmVmYjBk NWFlZTQzOTdiMjUwYzY4Y2FlMGU3MzM4NWE1NzRmZGExYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTE2MDgsNyArMTYwOCw4IEBACiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiY2FsbEZyYW1lSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3Jp cHRpb24iOiAiQ2FsbCBmcmFtZSBpZGVudGlmaWVyIHRvIGV2YWx1YXRlIG9uLiBUaGlzIGlkZW50 aWZpZXIgaXMgYSBwYXJ0IG9mIGJhY2t0cmFjZSByZXBvcnRlZCBieSB0aGUgPGNvZGU+cGF1c2Vk U2NyaXB0PC9jb2RlPi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXhwcmVz c2lvbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJFeHByZXNzaW9uIHRvIGV2 YWx1YXRlLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RHcm91cCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTdHJp bmcgb2JqZWN0IGdyb3VwIG5hbWUgdG8gcHV0IHJlc3VsdCBpbnRvIChhbGxvd3MgcmFwaWQgcmVs ZWFzaW5nIHJlc3VsdGluZyBvYmplY3QgaGFuZGxlcyB1c2luZyA8Y29kZT5yZWxlYXNlT2JqZWN0 R3JvdXA8L2NvZGU+KS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaW5jbHVk ZUNvbW1hbmRMaW5lQVBJIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJTcGVjaWZpZXMgd2hldGhlciBjb21tYW5kIGxpbmUgQVBJIHNob3VsZCBi ZSBhdmFpbGFibGUgdG8gdGhlIGV2YWx1YXRlZCBleHByZXNzaW9uLCBkZWZhdWx0cyB0byBmYWxz ZS4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbmNsdWRlQ29tbWFuZExpbmVB UEkiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog IlNwZWNpZmllcyB3aGV0aGVyIGNvbW1hbmQgbGluZSBBUEkgc2hvdWxkIGJlIGF2YWlsYWJsZSB0 byB0aGUgZXZhbHVhdGVkIGV4cHJlc3Npb24sIGRlZmF1bHRzIHRvIGZhbHNlLiIgfSwKKyAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXR1cm5CeVZhbHVlIiwgInR5cGUiOiAiYm9vbGVh biIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJXaGV0aGVyIHRoZSByZXN1bHQg aXMgZXhwZWN0ZWQgdG8gYmUgYSBKU09OIG9iamVjdCB0aGF0IHNob3VsZCBiZSBzZW50IGJ5IHZh bHVlLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBb CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzdWx0IiwgIiRyZWYiOiAiUnVudGlt ZS5SZW1vdGVPYmplY3QiLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHdyYXBwZXIgZm9yIHRoZSBl dmFsdWF0aW9uIHJlc3VsdC4iIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggYjYyNTVjOWE3MDVjNTNmYmE0NTkxN2Iy MTFlZjg4OTdmMTA2ODZlZi4uN2JkMGQ4ZTM5MTA3YjBiYTAwOTA4M2ZhMmUxYTQ2NDBhMTg2YzBl ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcApAQCAtMzk1LDE0ICszOTUsMTQgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9ucyhFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnMK ICAgICAgICAgKmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yLiBDb3VsZCBub3QgY2hhbmdl IHBhdXNlIG9uIGV4Y2VwdGlvbnMgc3RhdGUiOwogfQogCi12b2lkIEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmV2YWx1YXRlT25DYWxsRnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25z dCBTdHJpbmcmIGNhbGxGcmFtZUlkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0 cmluZyogY29uc3Qgb2JqZWN0R3JvdXAsIGNvbnN0IGJvb2wqIGNvbnN0IGluY2x1ZGVDb21tYW5k TGluZUFQSSwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHJlc3VsdCwgYm9vbCogd2FzVGhyb3du KQordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpldmFsdWF0ZU9uQ2FsbEZyYW1lKEVycm9y U3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBjYWxsRnJhbWVJZCwgY29uc3QgU3Ry aW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9iamVjdEdyb3VwLCBjb25zdCBi b29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGNvbnN0IGJvb2wqIGNvbnN0IHJldHVy bkJ5VmFsdWUsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Rocm93 bikKIHsKICAgICBJbmplY3RlZFNjcmlwdCBpbmplY3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvck9iamVjdElkKGNhbGxGcmFtZUlkKTsKICAgICBp ZiAoaW5qZWN0ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKSB7CiAgICAgICAgICplcnJvclN0cmluZyA9 ICJJbnNwZWN0ZWQgZnJhbWUgaGFzIGdvbmUiOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAg IGluamVjdGVkU2NyaXB0LmV2YWx1YXRlT25DYWxsRnJhbWUoZXJyb3JTdHJpbmcsIG1fY3VycmVu dENhbGxTdGFjaywgY2FsbEZyYW1lSWQsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwID8gKm9iamVj dEdyb3VwIDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSSA/ICppbmNsdWRlQ29tbWFuZExpbmVB UEkgOiBmYWxzZSwgcmVzdWx0LCB3YXNUaHJvd24pOworICAgIGluamVjdGVkU2NyaXB0LmV2YWx1 YXRlT25DYWxsRnJhbWUoZXJyb3JTdHJpbmcsIG1fY3VycmVudENhbGxTdGFjaywgY2FsbEZyYW1l SWQsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwID8gKm9iamVjdEdyb3VwIDogIiIsIGluY2x1ZGVD b21tYW5kTGluZUFQSSA/ICppbmNsdWRlQ29tbWFuZExpbmVBUEkgOiBmYWxzZSwgcmV0dXJuQnlW YWx1ZSA/ICpyZXR1cm5CeVZhbHVlIDogZmFsc2UsIHJlc3VsdCwgd2FzVGhyb3duKTsKIH0KIAog UGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y3VycmVu dENhbGxGcmFtZXMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmgKaW5kZXggNTFlYTI1OTAzZDgwODhhMDE1ZTc3MTAxYThmMzMwYmI5MzNl N2E5My4uNzZlNTAwMzU3Yjk3MmNiMzExNDU4ODM0N2EzYTZkMDVmNGVkZWMxNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBAIC05 OCw3ICs5OCwxNCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwSW50byhFcnJvclN0cmluZyopOwog ICAgIHZvaWQgc3RlcE91dChFcnJvclN0cmluZyopOwogICAgIHZvaWQgc2V0UGF1c2VPbkV4Y2Vw dGlvbnMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHBhdXNlU3RhdGUpOwotICAgIHZvaWQg ZXZhbHVhdGVPbkNhbGxGcmFtZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgY2FsbEZyYW1l SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nKiBjb25zdCBvYmplY3RH cm91cCwgY29uc3QgYm9vbCogY29uc3QgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNUaHJvd24pOworICAgIHZvaWQgZXZhbHVh dGVPbkNhbGxGcmFtZShFcnJvclN0cmluZyosCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFN0cmluZyYgY2FsbEZyYW1lSWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgU3RyaW5nKiBjb25zdCBvYmplY3RHcm91cCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgYm9vbCogY29uc3QgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBib29sKiBjb25zdCByZXR1cm5CeVZhbHVlLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sKiB3YXNUaHJvd24pOwogCiAgICAg Y2xhc3MgTGlzdGVuZXIgewogICAgIHB1YmxpYzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDUyM2JlMmRiZjFkNDNmNjc3M2Zi MmQwN2ZkZDY0N2M2NTk1MjZkNzUuLjk3NDc3NTg4NzJiNjZiNjNlMDAwZmRlZDBiODIwMDgwMTMx M2Y5NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qcwpAQCAtNDAxLDggKzQwMSwxNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoZG90Tm90YXRpb24gfHwgYnJhY2tldE5vdGF0aW9u KQogICAgICAgICAgICAgZXhwcmVzc2lvblN0cmluZyA9IGV4cHJlc3Npb25TdHJpbmcuc3Vic3Ry KDAsIGxhc3RJbmRleCk7CiAKLSAgICAgICAgaWYgKCFleHByZXNzaW9uU3RyaW5nICYmICFwcmVm aXgpCisgICAgICAgIGlmICghZXhwcmVzc2lvblN0cmluZyAmJiAhcHJlZml4KSB7CisgICAgICAg ICAgICBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2soW10pOwogICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKKyAgICAgICAgaWYgKHBhcnNlSW50KGV4cHJlc3Npb25TdHJpbmcpID09IGV4 cHJlc3Npb25TdHJpbmcpIHsKKyAgICAgICAgICAgIC8vIFVzZXIgaXMgZW50ZXJpbmcgZmxvYXQg dmFsdWUsIGRvIG5vdCBzdWdnZXN0IGFueXRoaW5nLgorICAgICAgICAgICAgY29tcGxldGlvbnNS ZWFkeUNhbGxiYWNrKFtdKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCiAgICAg ICAgIGlmICghZXhwcmVzc2lvblN0cmluZyAmJiBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMu cGF1c2VkKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmdldFNlbGVj dGVkQ2FsbEZyYW1lVmFyaWFibGVzKHJlY2VpdmVkUHJvcGVydHlOYW1lcy5iaW5kKHRoaXMpKTsK QEAgLTQxMSwxMiArNDE5LDI1IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbHVhdGVkKHJlc3VsdCwgd2FzVGhyb3duKQogICAg ICAgICB7Ci0gICAgICAgICAgICBpZiAod2FzVGhyb3duKQorICAgICAgICAgICAgaWYgKCFyZXN1 bHQgfHwgd2FzVGhyb3duKSB7CisgICAgICAgICAgICAgICAgY29tcGxldGlvbnNSZWFkeUNhbGxi YWNrKFtdKTsKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB2YXIgZ2V0Q29t cGxldGlvbnMgPSBmdW5jdGlvbigpCisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0 aW9uIGdldENvbXBsZXRpb25zKHByaW1pdGl2ZVR5cGUpCiAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgdmFyIG9iamVjdDsKKyAgICAgICAgICAgICAgICBpZiAocHJpbWl0aXZlVHlwZSA9 PT0gInN0cmluZyIpCisgICAgICAgICAgICAgICAgICAgIG9iamVjdCA9IG5ldyBTdHJpbmcoKTsK KyAgICAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVUeXBlID09PSAibnVtYmVyIikKKyAg ICAgICAgICAgICAgICAgICAgb2JqZWN0ID0gbmV3IE51bWJlcigpOworICAgICAgICAgICAgICAg IGVsc2UgaWYgKHByaW1pdGl2ZVR5cGUgPT09ICJib29sZWFuIikKKyAgICAgICAgICAgICAgICAg ICAgb2JqZWN0ID0gbmV3IEJvb2xlYW4oKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAg ICAgICAgICAgICAgIG9iamVjdCA9IHRoaXM7CisKICAgICAgICAgICAgICAgICB2YXIgcmVzdWx0 U2V0ID0ge307Ci0gICAgICAgICAgICAgICAgZm9yICh2YXIgbyA9IHRoaXM7IG87IG8gPSBvLl9f cHJvdG9fXykgeworICAgICAgICAgICAgICAgIGZvciAodmFyIG8gPSBvYmplY3Q7IG87IG8gPSBv Ll9fcHJvdG9fXykgewogICAgICAgICAgICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgICAg ICAgICAgICAgdmFyIG5hbWVzID0gT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMobyk7CiAgICAg ICAgICAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5hbWVzLmxlbmd0aDsgKytp KQpAQCAtNDI2LDIxICs0NDcsMzQgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdFNl dDsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlc3VsdC5jYWxsRnVuY3Rpb25KU09OKGdl dENvbXBsZXRpb25zLCByZWNlaXZlZFByb3BlcnR5TmFtZXMuYmluZCh0aGlzKSk7CisKKyAgICAg ICAgICAgIGlmIChyZXN1bHQudHlwZSA9PT0gIm9iamVjdCIgfHwgcmVzdWx0LnR5cGUgPT09ICJm dW5jdGlvbiIpCisgICAgICAgICAgICAgICAgcmVzdWx0LmNhbGxGdW5jdGlvbkpTT04oZ2V0Q29t cGxldGlvbnMsIHJlY2VpdmVkUHJvcGVydHlOYW1lcy5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAg IGVsc2UgaWYgKHJlc3VsdC50eXBlID09PSAic3RyaW5nIiB8fCByZXN1bHQudHlwZSA9PT0gIm51 bWJlciIgfHwgcmVzdWx0LnR5cGUgPT09ICJib29sZWFuIikKKyAgICAgICAgICAgICAgICB0aGlz LmV2YWxJbkluc3BlY3RlZFdpbmRvdygiKCIgKyBnZXRDb21wbGV0aW9ucyArICIpKFwiIiArIHJl c3VsdC50eXBlICsgIlwiKSIsICJjb21wbGV0aW9uIiwgdW5kZWZpbmVkLCB0cnVlLCB0cnVlLCBy ZWNlaXZlZFByb3BlcnR5TmFtZXNGcm9tRXZhbC5iaW5kKHRoaXMpKTsKKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIHJlY2VpdmVkUHJvcGVydHlOYW1lc0Zyb21FdmFsKHJlc3VsdCwgd2Fz VGhyb3duKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAocmVzdWx0ICYmICF3YXNUaHJvd24p CisgICAgICAgICAgICAgICAgcmVjZWl2ZWRQcm9wZXJ0eU5hbWVzLmNhbGwodGhpcywgcmVzdWx0 LnZhbHVlKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uc1Jl YWR5Q2FsbGJhY2soW10pOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gcmVjZWl2ZWRQ cm9wZXJ0eU5hbWVzKHByb3BlcnR5TmFtZXMpCiAgICAgICAgIHsKICAgICAgICAgICAgIFJ1bnRp bWVBZ2VudC5yZWxlYXNlT2JqZWN0R3JvdXAoImNvbXBsZXRpb24iKTsKLSAgICAgICAgICAgIGlm ICghcHJvcGVydHlOYW1lcykKKyAgICAgICAgICAgIGlmICghcHJvcGVydHlOYW1lcykgeworICAg ICAgICAgICAgICAgIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjayhbXSk7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICAgICAgfQogICAgICAgICAgICAgdmFyIGluY2x1ZGVDb21tYW5k TGluZUFQSSA9ICghZG90Tm90YXRpb24gJiYgIWJyYWNrZXROb3RhdGlvbik7CiAgICAgICAgICAg ICBpZiAoaW5jbHVkZUNvbW1hbmRMaW5lQVBJKSB7CiAgICAgICAgICAgICAgICAgY29uc3QgY29t bWFuZExpbmVBUEkgPSBbImRpciIsICJkaXJ4bWwiLCAia2V5cyIsICJ2YWx1ZXMiLCAicHJvZmls ZSIsICJwcm9maWxlRW5kIiwgIm1vbml0b3JFdmVudHMiLCAidW5tb25pdG9yRXZlbnRzIiwgImlu c3BlY3QiLCAiY29weSIsICJjbGVhciJdOwogICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgY29tbWFuZExpbmVBUEkubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICAgICAgICAgIHBy b3BlcnR5TmFtZXNbY29tbWFuZExpbmVBUElbaV1dID0gdHJ1ZTsKICAgICAgICAgICAgIH0KLQog ICAgICAgICAgICAgdGhpcy5fcmVwb3J0Q29tcGxldGlvbnMoYmVzdE1hdGNoT25seSwgY29tcGxl dGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3RhdGlvbiwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgs IE9iamVjdC5rZXlzKHByb3BlcnR5TmFtZXMpKTsKICAgICAgICAgfQogICAgIH0sCkBAIC01ODYs MTAgKzYyMCwxMCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICB9CiAgICAgfSwKIAotICAgIGV2YWxJbkluc3BlY3RlZFdpbmRvdzogZnVuY3Rpb24oZXhw cmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9u RXhjZXB0aW9ucywgZXZhbEFzSlNPTlZhbHVlLCBjYWxsYmFjaykKKyAgICBldmFsSW5JbnNwZWN0 ZWRXaW5kb3c6IGZ1bmN0aW9uKGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFu ZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnMsIHJldHVybkJ5VmFsdWUsIGNhbGxiYWNr KQogICAgIHsKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cyAmJiBXZWJJ bnNwZWN0b3IucGFuZWxzLnNjcmlwdHMucGF1c2VkKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0 b3IucGFuZWxzLnNjcmlwdHMuZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lKGV4cHJlc3Npb24s IG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGNhbGxiYWNrKTsKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJh bWUoZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgcmV0dXJu QnlWYWx1ZSwgY2FsbGJhY2spOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAg LTYwMCwxMCArNjM0LDE4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgZnVuY3Rpb24gZXZhbENhbGxiYWNrKGVycm9yLCByZXN1bHQsIHdhc1Rocm93 bikKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFlcnJvcikKKyAgICAgICAgICAgIGlmIChl cnJvcikgeworICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpOworICAgICAgICAg ICAgICAgIGNhbGxiYWNrKG51bGwpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgaWYgKHJldHVybkJ5VmFsdWUgJiYgIXdhc1Rocm93bikKKyAg ICAgICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQsIHdhc1Rocm93bik7CisgICAgICAgICAgICBl bHNlCiAgICAgICAgICAgICAgICAgY2FsbGJhY2soV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5m cm9tUGF5bG9hZChyZXN1bHQpLCB3YXNUaHJvd24pOwogICAgICAgICB9Ci0gICAgICAgIFJ1bnRp bWVBZ2VudC5ldmFsdWF0ZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCBkb05vdFBhdXNlT25FeGNlcHRpb25zLCB0aGlzLl9jdXJyZW50RXZhbHVhdGlvbkNv bnRleHRJZCgpLCBldmFsQXNKU09OVmFsdWUsIGV2YWxDYWxsYmFjayk7CisgICAgICAgIFJ1bnRp bWVBZ2VudC5ldmFsdWF0ZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCBkb05vdFBhdXNlT25FeGNlcHRpb25zLCB0aGlzLl9jdXJyZW50RXZhbHVhdGlvbkNv bnRleHRJZCgpLCByZXR1cm5CeVZhbHVlLCBldmFsQ2FsbGJhY2spOwogICAgIH0sCiAKICAgICBf ZW50ZXJLZXlQcmVzc2VkOiBmdW5jdGlvbihldmVudCkKQEAgLTYyNiw2ICs2NjgsOSBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2VsZiA9IHRo aXM7CiAgICAgICAgIGZ1bmN0aW9uIHByaW50UmVzdWx0KHJlc3VsdCwgd2FzVGhyb3duKQogICAg ICAgICB7CisgICAgICAgICAgICBpZiAoIXJlc3VsdCkKKyAgICAgICAgICAgICAgICByZXR1cm47 CisKICAgICAgICAgICAgIHNlbGYucHJvbXB0Lmhpc3RvcnkucHVzaChzdHIpOwogICAgICAgICAg ICAgc2VsZi5wcm9tcHQuaGlzdG9yeU9mZnNldCA9IDA7CiAgICAgICAgICAgICBzZWxmLnByb21w dC50ZXh0ID0gIiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggMTZjYWU1NWFk NGQ2NzBjYzIzM2FkNDk2MjI3N2JmNTEwYTY1NWRiMy4uYTllYzg3NzZjNTVkMWZkZTUyYzliNTFm NTNlNDA0NWM0NzA5ZGE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtNzk2 LDEzICs3OTYsMjIgQEAgV2ViSW5zcGVjdG9yLlByZXNlbmF0aW9uQ2FsbEZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3NvdXJjZUZpbGUuZm9yY2VMb2FkQ29udGVudCh0aGlz Ll9zY3JpcHQpOwogICAgIH0sCiAKLSAgICBldmFsdWF0ZTogZnVuY3Rpb24oY29kZSwgb2JqZWN0 R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgY2FsbGJhY2spCisgICAgZXZhbHVhdGU6IGZ1 bmN0aW9uKGNvZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIHJldHVybkJ5 VmFsdWUsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gZGlkRXZhbHVhdGVPbkNh bGxGcmFtZShlcnJvciwgcmVzdWx0LCB3YXNUaHJvd24pCiAgICAgICAgIHsKLSAgICAgICAgICAg IGNhbGxiYWNrKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVzdWx0KSwg d2FzVGhyb3duKTsKKyAgICAgICAgICAgIGlmIChlcnJvcikgeworICAgICAgICAgICAgICAgIGNv bnNvbGUuZXJyb3IoZXJyb3IpOworICAgICAgICAgICAgICAgIGNhbGxiYWNrKG51bGwpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKHJl dHVybkJ5VmFsdWUgJiYgIXdhc1Rocm93bikKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhyZXN1 bHQsIHdhc1Rocm93bik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgY2FsbGJh Y2soV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpLCB3YXNUaHJv d24pOwogICAgICAgICB9Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuZXZhbHVhdGVPbkNhbGxGcmFt ZSh0aGlzLl9jYWxsRnJhbWUuaWQsIGNvZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExp bmVBUEksIGRpZEV2YWx1YXRlT25DYWxsRnJhbWUuYmluZCh0aGlzKSk7CisgICAgICAgIERlYnVn Z2VyQWdlbnQuZXZhbHVhdGVPbkNhbGxGcmFtZSh0aGlzLl9jYWxsRnJhbWUuaWQsIGNvZGUsIG9i amVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIHJldHVybkJ5VmFsdWUsIGRpZEV2YWx1 YXRlT25DYWxsRnJhbWUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIHNvdXJjZUxpbmU6IGZ1 bmN0aW9uKGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1JlbW90ZU9iamVjdC5qcwppbmRleCBhNDVkN2M1NGViNDBmNmNkNmRlMjBlMTc2YmVhZTUw M2JhNjY5YTE1Li4zODI3NGU0YmE1ZDUyZGY1MTg3MGU1NTBjNGM5MTNlNTY5YTliNTcxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5q cwpAQCAtMzgsNyArMzgsOCBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0gZnVuY3Rpb24o b2JqZWN0SWQsIHR5cGUsIHN1YnR5cGUsIHZhbHVlLCBkZXNjcmlwdGlvbgogICAgICAgICB0aGlz Ll9kZXNjcmlwdGlvbiA9IGRlc2NyaXB0aW9uOwogICAgICAgICB0aGlzLl9oYXNDaGlsZHJlbiA9 IHRydWU7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgLy8gUHJpbWl0aXZlCisgICAgICAgIC8vIFBy aW1pdGl2ZSBvciBudWxsIG9iamVjdC4KKyAgICAgICAgY29uc29sZS5hc3NlcnQodHlwZSAhPT0g Im9iamVjdCIgfHwgdmFsdWUgPT09IG51bGwpOwogICAgICAgICB0aGlzLl9kZXNjcmlwdGlvbiA9 IGRlc2NyaXB0aW9uIHx8ICh2YWx1ZSArICIiKTsKICAgICAgICAgdGhpcy5faGFzQ2hpbGRyZW4g PSBmYWxzZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDMxOTNhN2Q3NTMwYWRhMjdhOWI0ODU4YTgxNzRhY2I1 MGI3NDU5MjEuLjkyZWMzYmJhM2JiZjA3OWM1ZWM1NDllMWYxZDYzZjBhNGQ5MDY0MWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz CkBAIC0zOTQsMTAgKzM5NCwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuanNCcmVha3BvaW50cy5yZW1vdmVCcmVh a3BvaW50KGJyZWFrcG9pbnQuc291cmNlRmlsZUlkLCBicmVha3BvaW50LmxpbmVOdW1iZXIpOwog ICAgIH0sCiAKLSAgICBldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWU6IGZ1bmN0aW9uKGNvZGUs IG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGNhbGxiYWNrKQorICAgIGV2YWx1 YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24oY29kZSwgb2JqZWN0R3JvdXAsIGluY2x1 ZGVDb21tYW5kTGluZUFQSSwgcmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spCiAgICAgewogICAgICAg ICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3Rl ZENhbGxGcmFtZTsKLSAgICAgICAgc2VsZWN0ZWRDYWxsRnJhbWUuZXZhbHVhdGUoY29kZSwgb2Jq ZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgY2FsbGJhY2spOworICAgICAgICBzZWxl Y3RlZENhbGxGcmFtZS5ldmFsdWF0ZShjb2RlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCByZXR1cm5CeVZhbHVlLCBjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIGdldFNlbGVj dGVkQ2FsbEZyYW1lVmFyaWFibGVzOiBmdW5jdGlvbihjYWxsYmFjaykKQEAgLTExOTIsNyArMTE5 Miw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgIGV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24o c3RyaW5nLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2Ny aXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUoc3RyaW5nLCB0aGlzLl9wb3BvdmVyT2Jq ZWN0R3JvdXAsIGZhbHNlLCBjYWxsYmFjayk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu c2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUoc3RyaW5nLCB0aGlzLl9wb3BvdmVy T2JqZWN0R3JvdXAsIGZhbHNlLCBmYWxzZSwgY2FsbGJhY2spOwogICAgIH0sCiAKICAgICByZWxl YXNlRXZhbHVhdGlvblJlc3VsdDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFy UGFuZS5qcwppbmRleCA0YmJhZDI5MDY2YTE5NmQyMTZiYzRiZjdmMjEwNzAzM2Q3YjdlNmY4Li5h M2M2NzQ5ZmQyOGFkN2Q0ZjZjNWYwZDM0MmNlZTg5MDllMTYyOWZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFu ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVz c2lvbnNTaWRlYmFyUGFuZS5qcwpAQCAtMTA3LDYgKzEwNyw5IEBAIFdlYkluc3BlY3Rvci5XYXRj aEV4cHJlc3Npb25zU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gYXBw ZW5kUmVzdWx0KGV4cHJlc3Npb24sIHdhdGNoSW5kZXgsIHJlc3VsdCwgd2FzVGhyb3duKQogICAg ICAgICB7CisgICAgICAgICAgICBpZiAoIXJlc3VsdCkKKyAgICAgICAgICAgICAgICByZXR1cm47 CisKICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2Jq ZWN0UHJvcGVydHkoZXhwcmVzc2lvbiwgcmVzdWx0KTsKICAgICAgICAgICAgIHByb3BlcnR5Lndh dGNoSW5kZXggPSB3YXRjaEluZGV4OwogICAgICAgICAgICAgcHJvcGVydHkud2FzVGhyb3duID0g d2FzVGhyb3duOwo=