69269 2011-10-03 11:06:38 -0700 Web Inspector: add DebuggerPresentationModel and ConsoleView to compilation. 2011-10-04 01:36:15 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 477084 0 pfeldman 2011-10-03 11:06:38 -0700 Patch to follow. Btw, this compilation round found a bug introduced in r96500. 477086 1 109497 pfeldman 2011-10-03 11:08:14 -0700 Created attachment 109497 Patch 477101 2 109497 webkit.review.bot 2011-10-03 11:29:19 -0700 Comment on attachment 109497 Patch Attachment 109497 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9942004 New failing tests: http/tests/inspector/network/network-disabling-check-no-memory-leak.html http/tests/inspector/network/network-iframe-load-and-delete.html http/tests/inspector/console-xhr-logging.html http/tests/inspector/network/network-cachedresources-with-same-urls.html http/tests/inspector/console-cd.html http/tests/inspector/network/network-disable-cache-memory.html http/tests/inspector/resource-har-headers.html http/tests/inspector/network/network-disable-cache-xhrs.html http/tests/inspector-enabled/console-clear-arguments-on-frame-remove.html http/tests/inspector/inspect-iframe-from-different-domain.html http/tests/inspector-enabled/console-log-before-frame-navigation.html http/tests/inspector/network-preflight-options.html http/tests/inspector/network/network-content-replacement-xhr.html http/tests/inspector/console-cd-completions.html http/tests/inspector-enabled/dom-storage-open.html http/tests/inspector/resource-har-conversion.html http/tests/inspector/console-resource-errors.html http/tests/inspector/resource-parameters.html http/tests/inspector-enabled/database-open.html http/tests/inspector/change-iframe-src.html 477486 3 pfeldman 2011-10-04 01:36:15 -0700 Committed r96575: <http://trac.webkit.org/changeset/96575> 109497 2011-10-03 11:08:14 -0700 2011-10-04 01:33:15 -0700 Patch bug-69269-20111003220812.patch text/plain 29187 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY1MTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZGEyM2JkZTI5MWY5YTQ3 YzY5NGIxNzlkZjFlMTMzNzFjMGYxNWY0Li5mZjhhOGY3YTEzMmRkYzlkY2JlNTYyODhhOTkxYTYw YmUxODVkMWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMgQEAKKzIwMTEtMTAtMDMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGFkZCBEZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsIGFuZCBDb25zb2xlVmlldyB0byBjb21waWxh dGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5 MjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9CcmVha3BvaW50TWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3Bv aW50TWFuYWdlci5wcm90b3R5cGUudWlTb3VyY2VDb2RlQWRkZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29u c29sZVZpZXcucHJvdG90eXBlLl9jb25zb2xlQ2xlYXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9jb21wbGV0aW9ucy5ldmFsdWF0ZWQuZ2V0Q29tcGxl dGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY29t cGxldGlvbnMuZXZhbHVhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuX21lc3NhZ2VzQ2xpY2tlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9Db250ZW50UHJvdmlkZXJzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRl bnRQcm92aWRlci5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlci5wcm90b3R5cGUuc2VhcmNoSW5Db250ZW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fYWRkU2Ny aXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnBy b3RvdHlwZS5fY29uc29sZU1lc3NhZ2VBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2RlYnVnZ2VyUGF1c2VkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fcmF3 U291cmNlQ29kZUZvclNjcmlwdFdpdGhVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5fc2NyaXB0Rm9yUmF3U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2NyZWF0ZVJhd1NvdXJjZUNvZGVJZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbFJlc291cmNlQmlu ZGluZy5wcm90b3R5cGUuY2FuU2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuc2V0Q29udGVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lRXZhbHVhdGlvbkNvbnRleHQucHJvdG90eXBlLmdldCBk aXNwbGF5TmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0 Y3V0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2UuZGlzcGxheU5hbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0Rm9ybWF0dGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRl ci5wcm90b3R5cGUuX2RpZEZvcm1hdENvbnRlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2hvcnRjdXRzU2NyZWVuLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U3RhdHVzQmFyQnV0dG9uLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFBy b21wdC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IucG9wdWxhdGVIcmVmQ29udGV4dE1lbnUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC50aGlzLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnRoaXMuZ2V0U2VsZWN0ZWRDYWxsRnJhbWVWYXJp YWJsZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC91dGlsaXRpZXMuanM6CisKIDIwMTEtMTAtMDMgIFNoZXJpZmYgQm90ICA8d2Via2l0 LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHI5NjUwMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZy b250LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5z aAppbmRleCBmODljMzRhYjE2YTZmOTljOGU5MjBiMjQzMzI5M2RlMDY4NWY5YjdlLi5hZmJlZWRj ZWJmMTQ4ZjE3ZTM3MzJmM2Y5YTEwNTMyNjM2ZGY1OTgxIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCkBAIC00NCwyNSArNDQsMzcgQEAgamF2YSAt amFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BU SU1JWkFUSU9OUyAtLXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL09iamVjdC5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1 bGVfc2RrOjk6anNtb2R1bGVfY29tbW9uLGpzbW9kdWxlX2hvc3QgXAorICAgIC0tbW9kdWxlIGpz bW9kdWxlX3NkazoxNjpqc21vZHVsZV9jb21tb24sanNtb2R1bGVfaG9zdCBcCisgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanMgXAor ICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFBy b3ZpZGVycy5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db29raWVQYXJzZXIuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgXAogICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMgXAogICAgICAgICAtLWpz IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBcCisg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMgXAorICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qcyBcCiAgICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMg XAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VDYXRlZ29yeS5qcyBcCi0gICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db29raWVQYXJzZXIuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVsLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzIFwKICAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIFwK ICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzIFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9taXNjOjExOmpzbW9kdWxlX3NkayBc CisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJj ZUNvZGUuanMgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxlX21pc2M6MTY6anNtb2R1bGVfc2RrIFwK ICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NoZWNrYm94 LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnRleHRNZW51LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4uanMgXAogICAgICAgICAtLWpz IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBc CisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2Ny aXB0Q29udGV4dE1hbmFnZXIuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9QbGFjYXJkLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU29mdENvbnRleHRNZW51LmpzIFwKKyAgICAgICAg LS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5q cyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0 dXNCYXJCdXR0b24uanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGFiYmVkUGFuZS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lTWFuYWdlci5qcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMK aW5kZXggNTUyOGY0NDBmZWYyNDQwNmU2MzI2ZThiN2FjMTFiNzcxMjBmNWY3Yy4uN2NiMTE3MTA0 YmM5ZDNkYjM4NzI3NDk3ZDU0ODQwN2U4YWIyNTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCkBAIC01OSw3 ICs1OSw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBicmVha3BvaW50LnVpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKICAgICAg ICAgICAgIHRoaXMuX21hdGVyaWFsaXplQnJlYWtwb2ludChicmVha3BvaW50KTsKICAgICAgICAg ICAgIGlmIChicmVha3BvaW50Ll9kZWJ1Z2dlckxvY2F0aW9uKQotICAgICAgICAgICAgICAgIHRo aXMuX2JyZWFrcG9pbnREZWJ1Z2dlckxvY2F0aW9uQ2hhbmdlZChicmVha3BvaW50LCBicmVha3Bv aW50Ll9kZWJ1Z2dlckxvY2F0aW9uKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9icmVha3BvaW50 RGVidWdnZXJMb2NhdGlvbkNoYW5nZWQoYnJlYWtwb2ludCk7CiAgICAgICAgIH0KICAgICB9LAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cwppbmRleCA1NGIxYmEwYjRkZDkzMGJhZDAxZGQ5YzI0YWU0OGYxYjZkZWFlYjg1Li40NjZhMTVj YTM0MGU1M2Y2OWEwZTcyOWM4MmYzMjI0MWJiNjFmMGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTMyLDE0ICszMiwxNyBA QCBjb25zdCBFeHByZXNzaW9uU3RvcENoYXJhY3RlcnMgPSAiID06Wyh7OywhKy0qLyZ8Xjw+IjsK IC8qKgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICogQGNvbnN0cnVjdG9yCisg KiBAcGFyYW0ge2Jvb2xlYW59IGhpZGVDb250ZXh0U2VsZWN0b3IKICAqLwotV2ViSW5zcGVjdG9y LkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oKQorV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVu Y3Rpb24oaGlkZUNvbnRleHRTZWxlY3RvcikKIHsKICAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxs KHRoaXMpOwotICAgIHRoaXMuZWxlbWVudC5pZCA9ICJjb25zb2xlLXZpZXciOwogCisgICAgdGhp cy5lbGVtZW50LmlkID0gImNvbnNvbGUtdmlldyI7CiAgICAgdGhpcy5tZXNzYWdlcyA9IFtdOwog CisgICAgdGhpcy5fc2NyaXB0c1BhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzOwor CiAgICAgdGhpcy5fY2xlYXJDb25zb2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBjb25zb2xlIGxvZy4iKSwgImNs ZWFyLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMuX2NsZWFyQ29uc29sZUJ1dHRvbi5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlcXVlc3RDbGVhck1lc3NhZ2VzLmJpbmQodGhp cyksIGZhbHNlKTsKIApAQCAtNDcsNyArNTAsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcg PSBmdW5jdGlvbigpCiAgICAgdGhpcy5fY29udGV4dFNlbGVjdEVsZW1lbnQuaWQgPSAiY29uc29s ZS1jb250ZXh0IjsKICAgICB0aGlzLl9jb250ZXh0U2VsZWN0RWxlbWVudC5jbGFzc05hbWUgPSAi c3RhdHVzLWJhci1pdGVtIjsKIAotICAgIGlmIChXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5p c1dvcmtlckZyb250ZW5kKCkpCisgICAgaWYgKGhpZGVDb250ZXh0U2VsZWN0b3IpCiAgICAgICAg IHRoaXMuX2NvbnRleHRTZWxlY3RFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogCiAg ICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK QEAgLTMyNCw5ICszMjcsNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMudG9wR3JvdXA7CiAgICAgICAgIHRo aXMudG9wR3JvdXAubWVzc2FnZXNFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAKLSAgICAgICAg ZGVsZXRlIHRoaXMuY29tbWFuZFNpbmNlUHJldmlvdXNNZXNzYWdlOwotICAgICAgICBkZWxldGUg dGhpcy5wcmV2aW91c01lc3NhZ2U7Ci0KICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LkV2ZW50cy5Db25zb2xlQ2xlYXJlZCk7CiAg ICAgfSwKIApAQCAtMzU0LDE0ICszNTQsMTQgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlm IChwYXJzZUludChleHByZXNzaW9uU3RyaW5nKSA9PSBleHByZXNzaW9uU3RyaW5nKSB7CisgICAg ICAgIGlmIChwYXJzZUludChleHByZXNzaW9uU3RyaW5nLCAxMCkgPT0gZXhwcmVzc2lvblN0cmlu ZykgewogICAgICAgICAgICAgLy8gVXNlciBpcyBlbnRlcmluZyBmbG9hdCB2YWx1ZSwgZG8gbm90 IHN1Z2dlc3QgYW55dGhpbmcuCiAgICAgICAgICAgICBjb21wbGV0aW9uc1JlYWR5Q2FsbGJhY2so W10pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFleHBy ZXNzaW9uU3RyaW5nICYmIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQpCi0gICAg ICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuZ2V0U2VsZWN0ZWRDYWxsRnJhbWVW YXJpYWJsZXMocmVjZWl2ZWRQcm9wZXJ0eU5hbWVzLmJpbmQodGhpcykpOworICAgICAgICBpZiAo IWV4cHJlc3Npb25TdHJpbmcgJiYgdGhpcy5fc2NyaXB0c1BhbmVsLnBhdXNlZCkKKyAgICAgICAg ICAgIHRoaXMuX3NjcmlwdHNQYW5lbC5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcyhyZWNl aXZlZFByb3BlcnR5TmFtZXMuYmluZCh0aGlzKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IHRoaXMuZXZhbEluSW5zcGVjdGVkV2luZG93KGV4cHJlc3Npb25TdHJpbmcsICJjb21wbGV0aW9u IiwgdHJ1ZSwgdHJ1ZSwgdW5kZWZpbmVkLCBldmFsdWF0ZWQuYmluZCh0aGlzKSk7CiAKQEAgLTM3 NiwxMSArMzc2LDExIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgdmFyIG9iamVjdDsKICAgICAgICAgICAgICAg ICBpZiAocHJpbWl0aXZlVHlwZSA9PT0gInN0cmluZyIpCi0gICAgICAgICAgICAgICAgICAgIG9i amVjdCA9IG5ldyBTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICAgICAgb2JqZWN0ID0gbmV3IFN0 cmluZygiIik7CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVHlwZSA9PT0gIm51 bWJlciIpCi0gICAgICAgICAgICAgICAgICAgIG9iamVjdCA9IG5ldyBOdW1iZXIoKTsKKyAgICAg ICAgICAgICAgICAgICAgb2JqZWN0ID0gbmV3IE51bWJlcigwKTsKICAgICAgICAgICAgICAgICBl bHNlIGlmIChwcmltaXRpdmVUeXBlID09PSAiYm9vbGVhbiIpCi0gICAgICAgICAgICAgICAgICAg IG9iamVjdCA9IG5ldyBCb29sZWFuKCk7CisgICAgICAgICAgICAgICAgICAgIG9iamVjdCA9IG5l dyBCb29sZWFuKGZhbHNlKTsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg ICAgIG9iamVjdCA9IHRoaXM7CiAKQEAgLTQ5OSwxNiArNDk5LDggQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9tZXNzYWdlc0NsaWNrZWQ6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSBldmVudC50YXJnZXQuZW5jbG9zaW5n Tm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiYSIpOwotICAgICAgICBpZiAoIWxpbmsgfHwgIWxpbmsu cmVwcmVzZW50ZWROb2RlKSB7Ci0gICAgICAgICAgICBpZiAoIXRoaXMucHJvbXB0LmlzQ2FyZXRJ bnNpZGVQcm9tcHQoKSAmJiB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuaXNDb2xsYXBzZWQpCi0gICAg ICAgICAgICAgICAgdGhpcy5wcm9tcHQubW92ZUNhcmV0VG9FbmRPZlByb21wdCgpOwotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLnVwZGF0ZUZv Y3VzZWROb2RlKGxpbmsucmVwcmVzZW50ZWROb2RlLmlkKTsKLSAgICAgICAgZXZlbnQuc3RvcFBy b3BhZ2F0aW9uKCk7Ci0gICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgIGlm ICghdGhpcy5wcm9tcHQuaXNDYXJldEluc2lkZVByb21wdCgpICYmIHdpbmRvdy5nZXRTZWxlY3Rp b24oKS5pc0NvbGxhcHNlZCkKKyAgICAgICAgICAgIHRoaXMucHJvbXB0Lm1vdmVDYXJldFRvRW5k T2ZQcm9tcHQoKTsKICAgICB9LAogCiAgICAgX3JlZ2lzdGVyU2hvcnRjdXRzOiBmdW5jdGlvbigp CkBAIC01NzIsOCArNTY0LDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9 IHsKIAogICAgIGV2YWxJbkluc3BlY3RlZFdpbmRvdzogZnVuY3Rpb24oZXhwcmVzc2lvbiwgb2Jq ZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucywg cmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LnBhbmVscy5zY3JpcHRzICYmIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQpIHsK LSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0 ZWRDYWxsRnJhbWUoZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQ SSwgcmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spOworICAgICAgICBpZiAodGhpcy5fc2NyaXB0c1Bh bmVsLnBhdXNlZCkgeworICAgICAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLmV2YWx1YXRlSW5T ZWxlY3RlZENhbGxGcmFtZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCByZXR1cm5CeVZhbHVlLCBjYWxsYmFjayk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KIApAQCAtNjQyLDYgKzYzNCw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX19wcm90 b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlOwogCisvKioKKyAqIEBjb25zdHJ1Y3Rv cgorICovCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQgPSBmdW5jdGlvbihjb21tYW5kKQog ewogICAgIHRoaXMuY29tbWFuZCA9IGNvbW1hbmQ7CkBAIC02OTcsNiArNjkyLDEwIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlQ29tbWFuZC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIH0KIAorLyoqCisg KiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbH0KKyAqIEBjb25zdHJ1 Y3RvcgorICovCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHQgPSBmdW5jdGlvbihy ZXN1bHQsIHdhc1Rocm93biwgb3JpZ2luYXRpbmdDb21tYW5kKQogewogICAgIHZhciBsZXZlbCA9 ICh3YXNUaHJvd24gPyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVy cm9yIDogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5Mb2cpOwpAQCAt NzE1LDYgKzcxNCw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdC5wcm90b3R5 cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdC5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGU7CiAKKy8q KgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rvci5Db25zb2xlR3JvdXAgPSBmdW5j dGlvbihwYXJlbnRHcm91cCkKIHsKICAgICB0aGlzLnBhcmVudEdyb3VwID0gcGFyZW50R3JvdXA7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQ cm92aWRlcnMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQ cm92aWRlcnMuanMKaW5kZXggODkwOGU4NGUwZTZiZDY5ZDUwOTNkYTZmODRhYzQxOGI5MTFhMzM4 YS4uOTVjNTJlN2QzMGQxMGU0MjhjNDEwMWM2MTgzNzExNzk3YWMwNjM4ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXJzLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVycy5q cwpAQCAtMTg2LDcgKzE4NiwxMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50UHJvdmlk ZXIucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50UHJvdmlkZXIu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXIucHJvdG90 eXBlOwogCi0KKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVj dG9yLkNvbnRlbnRQcm92aWRlcn0KKyAqLwogV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQcm92 aWRlciA9IGZ1bmN0aW9uKG1pbWVUeXBlLCBjb250ZW50KQogewogICAgIHRoaXMuX21pbWVUeXBl ID0gbWltZVR5cGU7CkBAIC0xOTcsNiArMjAwLDExIEBAIFdlYkluc3BlY3Rvci5TdGF0aWNDb250 ZW50UHJvdmlkZXIucHJvdG90eXBlID0gewogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihj YWxsYmFjaykKICAgICB7CiAgICAgICAgIGNhbGxiYWNrKHRoaXMuX21pbWVUeXBlLCB0aGlzLl9j b250ZW50KTsKKyAgICB9LAorCisgICAgc2VhcmNoSW5Db250ZW50OiBmdW5jdGlvbihxdWVyeSwg Y2FsbGJhY2spCisgICAgeworICAgICAgICBjYWxsYmFjayhbXSk7CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51Lmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZXh0TWVudS5qcwppbmRl eCA0ODZlYTViY2Q1OWVlNjJjOWI3YWQ2ZDYzMTlhOTRlZmI2NDNjODJlLi45MGUyMjVjMmNiMjRh Y2JiMjIzYjU2Yjc0MjE3ZmFmNTI1Y2IxOWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29udGV4dE1lbnUuanMKQEAgLTUwLDYgKzUwLDkgQEAgV2ViSW5z cGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlwZSA9IHsKICAgICAgICAgZXZlbnQuc3RvcFByb3Bh Z2F0aW9uKCk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IGRp c2FibGVkCisgICAgICovCiAgICAgYXBwZW5kSXRlbTogZnVuY3Rpb24obGFiZWwsIGhhbmRsZXIs IGRpc2FibGVkKQogICAgIHsKICAgICAgICAgdmFyIGlkID0gdGhpcy5faXRlbXMubGVuZ3RoOwpA QCAtNTcsNiArNjAsOSBAQCBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUucHJvdG90eXBlID0gewog ICAgICAgICB0aGlzLl9oYW5kbGVyc1tpZF0gPSBoYW5kbGVyOwogICAgIH0sCiAKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBkaXNhYmxlZAorICAgICAqLwogICAgIGFwcGVuZENo ZWNrYm94SXRlbTogZnVuY3Rpb24obGFiZWwsIGhhbmRsZXIsIGNoZWNrZWQsIGRpc2FibGVkKQog ICAgIHsKICAgICAgICAgdmFyIGlkID0gdGhpcy5faXRlbXMubGVuZ3RoOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLmpzCmluZGV4IDNiMmY4ODQ5ODY5Y2RiZDdiYzU5NWE3ZDc4OTI3YTZkZWM4 YmJkN2QuLjkxZjY2NWJjMzhiZWMzYTI2MDY1ZDliNWEzZWU2ZjcyYTI2MjExYmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTMwLDYgKzMwLDcgQEAKIAogLyoqCiAgKiBAY29u c3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQogICovCiBXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTEwNCw3 ICsxMDUsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUgPSB7CiAKICAgICBfYWRkU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAgewotICAgICAg ICB2YXIgcmF3U291cmNlQ29kZUlkID0gdGhpcy5fY3JlYXRlUmF3U291cmNlQ29kZUlkKHNjcmlw dC5zb3VyY2VVUkwsIHNjcmlwdC5zY3JpcHRJZCk7CisgICAgICAgIHZhciByYXdTb3VyY2VDb2Rl SWQgPSB0aGlzLl9jcmVhdGVSYXdTb3VyY2VDb2RlSWQoc2NyaXB0KTsKICAgICAgICAgdmFyIHJh d1NvdXJjZUNvZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2RlW3Jhd1NvdXJjZUNvZGVJZF07CiAgICAg ICAgIGlmIChyYXdTb3VyY2VDb2RlKSB7CiAgICAgICAgICAgICByYXdTb3VyY2VDb2RlLmFkZFNj cmlwdChzY3JpcHQpOwpAQCAtMjQ5LDcgKzI1MCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFtZXNzYWdlLnVybCB8 fCAhbWVzc2FnZS5pc0Vycm9yT3JXYXJuaW5nKCkgfHwgIW1lc3NhZ2UubWVzc2FnZSkKICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1Nv dXJjZUNvZGVGb3JTY3JpcHQobWVzc2FnZS51cmwpOworICAgICAgICB2YXIgcmF3U291cmNlQ29k ZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRXaXRoVVJMKG1lc3NhZ2UudXJsKTsKICAg ICAgICAgaWYgKCFyYXdTb3VyY2VDb2RlKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0zNTUs NyArMzU2LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90 eXBlID0gewogICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGU7CiAgICAgICAgICAgICB2YXIg c2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2Fs bEZyYW1lLmxvY2F0aW9uLnNjcmlwdElkKTsKICAgICAgICAgICAgIGlmIChzY3JpcHQpCi0gICAg ICAgICAgICAgICAgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQo c2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNjcmlwdElkKTsKKyAgICAgICAgICAgICAgICByYXdT b3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdChzY3JpcHQpOwogICAgICAg ICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3Iu UHJlc2VudGF0aW9uQ2FsbEZyYW1lKGNhbGxGcmFtZSwgaSwgdGhpcywgcmF3U291cmNlQ29kZSkp OwogICAgICAgICB9CiAgICAgICAgIHZhciBkZXRhaWxzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwuZGVidWdnZXJQYXVzZWREZXRhaWxzOwpAQCAtMzgzLDI5ICszODQsMjggQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lc1t0aGlzLl9zZWxlY3RlZENhbGxGcmFt ZUluZGV4XTsKICAgICB9LAogCi0gICAgX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQ6IGZ1bmN0aW9u KHNvdXJjZVVSTCwgc2NyaXB0SWQpCisgICAgX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRXaXRoVVJM OiBmdW5jdGlvbihzb3VyY2VVUkwpCiAgICAgewotICAgICAgICBpZiAoIXNvdXJjZVVSTCkgewot ICAgICAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlw dEZvclNvdXJjZUlEKHNjcmlwdElkKTsKLSAgICAgICAgICAgIGlmICghc2NyaXB0KQotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHNvdXJjZVVSTCA9IHNjcmlwdC5zb3VyY2VV Ukw7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHRoaXMuX3Jhd1NvdXJjZUNvZGVbdGhpcy5f Y3JlYXRlUmF3U291cmNlQ29kZUlkKHNvdXJjZVVSTCwgc2NyaXB0SWQpXTsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3Jhd1NvdXJjZUNvZGVbc291cmNlVVJMXTsKKyAgICB9LAorCisgICAgX3Jhd1Nv dXJjZUNvZGVGb3JTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLl9yYXdTb3VyY2VDb2RlW3RoaXMuX2NyZWF0ZVJhd1NvdXJjZUNvZGVJZChzY3JpcHQp XTsKICAgICB9LAogCiAgICAgX3NjcmlwdEZvclJhd1NvdXJjZUNvZGU6IGZ1bmN0aW9uKHJhd1Nv dXJjZUNvZGUpCiAgICAgewogICAgICAgICBmdW5jdGlvbiBmaWx0ZXIoc2NyaXB0KQogICAgICAg ICB7Ci0gICAgICAgICAgICByZXR1cm4gdGhpcy5fY3JlYXRlUmF3U291cmNlQ29kZUlkKHNjcmlw dC5zb3VyY2VVUkwsIHNjcmlwdC5zY3JpcHRJZCkgPT09IHJhd1NvdXJjZUNvZGUuaWQ7CisgICAg ICAgICAgICByZXR1cm4gdGhpcy5fY3JlYXRlUmF3U291cmNlQ29kZUlkKHNjcmlwdCkgPT09IHJh d1NvdXJjZUNvZGUuaWQ7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLnF1ZXJ5U2NyaXB0cyhmaWx0ZXIuYmluZCh0aGlzKSlbMF07CiAgICAgfSwK IAotICAgIF9jcmVhdGVSYXdTb3VyY2VDb2RlSWQ6IGZ1bmN0aW9uKHNvdXJjZVVSTCwgc2NyaXB0 SWQpCisgICAgX2NyZWF0ZVJhd1NvdXJjZUNvZGVJZDogZnVuY3Rpb24oc2NyaXB0KQogICAgIHsK LSAgICAgICAgcmV0dXJuIHNvdXJjZVVSTCB8fCBzY3JpcHRJZDsKKyAgICAgICAgcmV0dXJuIHNj cmlwdC5zb3VyY2VVUkwgfHwgc2NyaXB0LnNjcmlwdElkOwogICAgIH0sCiAKICAgICBfZGVidWdn ZXJSZXNldDogZnVuY3Rpb24oKQpAQCAtNTE4LDcgKzUxOCw3IEBAIFdlYkluc3BlY3Rvci5QcmVz ZW50YXRpb25DYWxsRnJhbWUucHJvdG90eXBlID0gewogCiAvKioKICAqIEBjb25zdHJ1Y3Rvcgot ICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5SZXNvdXJjZURvbWFpbk1vZGVsQmluZGluZ30KKyAq IEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VEb21haW5Nb2RlbEJpbmRpbmd9CiAg Ki8KIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsUmVzb3VyY2VCaW5kaW5n ID0gZnVuY3Rpb24obW9kZWwpCiB7CkBAIC01MjksNyArNTI5LDcgQEAgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcgPSBmdW5jdGlvbihtb2RlbCkK IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsUmVzb3VyY2VCaW5kaW5nLnBy b3RvdHlwZSA9IHsKICAgICBjYW5TZXRDb250ZW50OiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7 Ci0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuX3Jh d1NvdXJjZUNvZGVGb3JTY3JpcHQocmVzb3VyY2UudXJsKQorICAgICAgICB2YXIgcmF3U291cmNl Q29kZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0V2l0 aFVSTChyZXNvdXJjZS51cmwpCiAgICAgICAgIGlmICghcmF3U291cmNlQ29kZSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVs LmNhbkVkaXRTY3JpcHRTb3VyY2UocmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nLnVpU291cmNl Q29kZSk7CkBAIC01NDAsNyArNTQwLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIW1ham9y Q2hhbmdlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciByYXdTb3VyY2VDb2Rl ID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQocmVzb3Vy Y2UudXJsKTsKKyAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9wcmVzZW50YXRpb25N b2RlbC5fcmF3U291cmNlQ29kZUZvclNjcmlwdFdpdGhVUkwocmVzb3VyY2UudXJsKTsKICAgICAg ICAgaWYgKCFyYXdTb3VyY2VDb2RlKSB7CiAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soIlJlc291 cmNlIGlzIG5vdCBlZGl0YWJsZSIpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzCmluZGV4IGU3ZWM4Njc5 NTljYTgwYmQ2YjdkZmY5OTQ2YjU3ZGE0YTJjZjI2MjUuLmFkYjMxN2UwZTA3ZmU4Mjk5MGVjNjVm ZWZlODBhOWY5ZTQ4YzliYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVscFNjcmVlbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlbHBTY3JlZW4uanMKQEAgLTI4LDYgKzI4LDkgQEAKICAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAg Ki8KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4g PSBmdW5jdGlvbih0aXRsZSkKIHsKICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLmpzCmluZGV4IGI2YWZjNDg4 OWQ4M2Q5N2E4ZWY3MTcwNzlhM2VjMDY3M2E4NDVjYzUuLjhmNjY0M2NjYzc5MTllNmU4YjQ4NmU5 YmM5MDI1MGNkNTUyMzc3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLmpzCkBAIC0yOCw2 ICsyOCwxMCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisvKioKKyAqIEBjb25zdHJ1Y3Rvcgor ICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CisgKi8KIFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0Q29udGV4dE1hbmFnZXIgPSBmdW5jdGlvbihyZXNvdXJjZVRyZWVNb2RlbCwgY29uc29s ZVZpZXcpCiB7CiAgICAgcmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5GcmFtZUFkZGVkLCB0aGlzLl9mcmFt ZUFkZGVkLCB0aGlzKTsKQEAgLTY4LDYgKzcyLDEwIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 Q29udGV4dE1hbmFnZXIucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdENv bnRleHRNYW5hZ2VyLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnBy b3RvdHlwZTsKIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0 b3IuT2JqZWN0fQorICovCiBXZWJJbnNwZWN0b3IuRnJhbWVFdmFsdWF0aW9uQ29udGV4dCA9IGZ1 bmN0aW9uKGZyYW1lKQogewogICAgIHRoaXMuX2ZyYW1lID0gZnJhbWU7CkBAIC0xMDAsNyArMTA4 LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lRXZhbHVhdGlvbkNvbnRleHQucHJvdG90eXBlID0KICAg ICAgICAgaWYgKCF0aGlzLl9mcmFtZS5wYXJlbnRJZCkKICAgICAgICAgICAgIHJldHVybiAiPHRv cCBmcmFtZT4iOwogICAgICAgICB2YXIgbmFtZSA9IHRoaXMuX2ZyYW1lLm5hbWUgfHwgIiI7Ci0g ICAgICAgIHZhciBzdWJ0aXRsZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2UobnVsbCwgdGhp cy5fZnJhbWUudXJsKS5kaXNwbGF5TmFtZTsKKyAgICAgICAgdmFyIHN1YnRpdGxlID0gV2ViSW5z cGVjdG9yLlJlc291cmNlLmRpc3BsYXlOYW1lKHRoaXMuX2ZyYW1lLnVybCk7CiAgICAgICAgIGlm IChzdWJ0aXRsZSkgewogICAgICAgICAgICAgaWYgKCFuYW1lKQogICAgICAgICAgICAgICAgIHJl dHVybiBzdWJ0aXRsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCA2NDlhYmYzNWFjY2Y5MmVhMmVkNzMzN2Rm MTNkNjdiYjI3Y2YxZGY4Li5mYzRmOTcwNmE5MjVlYjViMmQ2Mzk4MjJjYzMwZDc4ZGExNGNhNmUw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJk U2hvcnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXli b2FyZFNob3J0Y3V0LmpzCkBAIC0zMiw3ICszMiw3IEBACiAgKi8KIFdlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0ID0gZnVuY3Rpb24oKQogewotfTsKK30KIAogLyoqCiAgKiBDb25zdGFudHMg Zm9yIGVuY29kaW5nIG1vZGlmaWVyIGtleSBzZXQgYXMgYSBiaXQgbWFzay4KQEAgLTEzMSw2ICsx MzEsOSBAQCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvciA9IGZ1 bmN0aW9uKGtleSwgb3B0TW9kaWZpZXJzKQogICAgIH07CiB9CiAKKy8qKgorICogQHBhcmFtIHtu dW1iZXI9fSBtb2RpZmllcnMKKyAqLwogV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuc2hv cnRjdXRUb1N0cmluZyA9IGZ1bmN0aW9uKGtleSwgbW9kaWZpZXJzKQogewogICAgIHJldHVybiBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5fbW9kaWZpZXJzVG9TdHJpbmcobW9kaWZpZXJz KSArIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Ll9rZXlOYW1lKGtleSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCA1MTZkODBh NmM3Nzk2ZGUxYzZiZmUwNGE4NzNhY2Y5ZDQxOGM4ZWVmLi42ZmJiOTgzMThjZTg1YTNiYjcwMDI5 ZjhmNWEyYjk2Yjg0YjU1Njc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2UuanMKQEAgLTY5LDcgKzY5LDcgQEAgV2ViSW5zcGVjdG9yLk1JTUVUeXBl cyA9IHsKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9 CiAgKgotICogQHBhcmFtIHtOZXR3b3JrQWdlbnQuUmVxdWVzdElkfSByZXF1ZXN0SWQKKyAqIEBw YXJhbSB7P05ldHdvcmtBZ2VudC5SZXF1ZXN0SWR9IHJlcXVlc3RJZAogICogQHBhcmFtIHtzdHJp bmd9IHVybAogICogQHBhcmFtIHs/c3RyaW5nfSBmcmFtZUlkCiAgKiBAcGFyYW0gez9OZXR3b3Jr QWdlbnQuTG9hZGVySWR9IGxvYWRlcklkCkBAIC05Myw2ICs5MywxMSBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UgPSBmdW5jdGlvbihyZXF1ZXN0SWQsIHVybCwgZnJhbWVJZCwgbG9hZGVySWQpCiAg ICAgdGhpcy5yZWNlaXZlSGVhZGVyc0VuZCA9IDA7CiB9CiAKK1dlYkluc3BlY3Rvci5SZXNvdXJj ZS5kaXNwbGF5TmFtZSA9IGZ1bmN0aW9uKHVybCkKK3sKKyAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5SZXNvdXJjZShudWxsLCB1cmwsIG51bGwsIG51bGwpLmRpc3BsYXlOYW1lOworfQorCiAv LyBLZWVwIHRoZXNlIGluIHN5bmMgd2l0aCBXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6VHlw ZQogV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUgPSB7CiAgICAgRG9jdW1lbnQ6ICAgMCwKQEAg LTE2NSw3ICsxNzAsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucmVnaXN0ZXJEb21haW5Nb2Rl bEJpbmRpbmcgPSBmdW5jdGlvbih0eXBlLCBiaW5kaW5nKQogICAgIFdlYkluc3BlY3Rvci5SZXNv dXJjZS5fZG9tYWluTW9kZWxCaW5kaW5nc1t0eXBlXSA9IGJpbmRpbmc7CiB9CiAKLQogV2ViSW5z cGVjdG9yLlJlc291cmNlLl9yZXNvdXJjZVJldmlzaW9uUmVnaXN0cnkgPSBmdW5jdGlvbigpCiB7 CiAgICAgaWYgKCFXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX3Jlc291cmNlUmV2aXNpb25SZWdpc3Ry eU9iamVjdCkgewpAQCAtODM2LDYgKzg0MCwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJv dG90eXBlID0gewogICAgICAgICBiaW5kaW5nLnNldENvbnRlbnQodGhpcywgbmV3Q29udGVudCwg bWFqb3JDaGFuZ2UsIGNhbGxiYWNrKTsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFt IHtzdHJpbmd9IG5ld0NvbnRlbnQKKyAgICAgKiBAcGFyYW0ge0RhdGU9fSB0aW1lc3RhbXAKKyAg ICAgKiBAcGFyYW0ge2Jvb2xlYW49fSByZXN0b3JpbmdIaXN0b3J5CisgICAgICovCiAgICAgYWRk UmV2aXNpb246IGZ1bmN0aW9uKG5ld0NvbnRlbnQsIHRpbWVzdGFtcCwgcmVzdG9yaW5nSGlzdG9y eSkKICAgICB7CiAgICAgICAgIHZhciByZXZpc2lvbiA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VSZXZpc2lvbih0aGlzLCB0aGlzLl9jb250ZW50LCB0aGlzLl9jb250ZW50VGltZXN0YW1wKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Rm9y bWF0dGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3Jt YXR0ZXIuanMKaW5kZXggZWJmODE2MmU2NTIzZGUxYWNiYjVjNThhOGRmNTNlMTM0Nzk1OWM2Yy4u OTRjYTJhZGM0ZjJkMzNiMTE2MjNiODhjNDAzMTQyYzY4NDAzNDYyOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMKQEAg LTY3LDcgKzY3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlci5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHZhciB0YXNrID0gdGhpcy5fdGFza3Muc2hpZnQoKTsKICAgICAgICAgdmFyIG9y aWdpbmFsQ29udGVudCA9IHRhc2suZGF0YS5jb250ZW50OwogICAgICAgICB2YXIgZm9ybWF0dGVk Q29udGVudCA9IGV2ZW50LmRhdGEuY29udGVudDsKLSAgICAgICAgdmFyIG1hcHBpbmcgPSBldmVu dC5kYXRhLm1hcHBpbmc7CisgICAgICAgIHZhciBtYXBwaW5nID0gZXZlbnQuZGF0YVsibWFwcGlu ZyJdOwogICAgICAgICB2YXIgc291cmNlTWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuRm9ybWF0 dGVkU291cmNlTWFwcGluZyhvcmlnaW5hbENvbnRlbnQubGluZUVuZGluZ3MoKSwgZm9ybWF0dGVk Q29udGVudC5saW5lRW5kaW5ncygpLCBtYXBwaW5nKTsKICAgICAgICAgdGFzay5jYWxsYmFjayhm b3JtYXR0ZWRDb250ZW50LCBzb3VyY2VNYXBwaW5nKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaG9ydGN1dHNTY3JlZW4uanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5qcwppbmRleCBm Y2EwNjU5OTlhZTcwZWZjMzc5YzJhNjZlMjgyNzc1MTIyMWU4MTk5Li5mZjMwNzg2NzEwMjVjYWFi NjYzYWY1NTg3ODZkMmIwNjQ5YzlhNjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5qcwpAQCAtMjgsNiArMjgsOSBAQAog ICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KICAqLwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCiBXZWJJbnNw ZWN0b3IuU2hvcnRjdXRzU2NyZWVuID0gZnVuY3Rpb24oKQogewogICAgIHRoaXMuX3NlY3Rpb25z ID0ge307CkBAIC05MCwxMCArOTMsMTMgQEAgV2ViSW5zcGVjdG9yLlNob3J0Y3V0c1NjcmVlbi5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgcGFyZW50LmFwcGVuZENoaWxkKHRhYmxl KTsKICAgICB9Ci19OworfQogCiBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuID0gbmV3IFdl Ykluc3BlY3Rvci5TaG9ydGN1dHNTY3JlZW4oKTsKIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAq LwogV2ViSW5zcGVjdG9yLlNob3J0Y3V0c1NlY3Rpb24gPSBmdW5jdGlvbihuYW1lKQogewogICAg IHRoaXMubmFtZSA9IG5hbWU7CkBAIC0xNjIsNCArMTY4LDQgQEAgV2ViSW5zcGVjdG9yLlNob3J0 Y3V0c1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmVzLmxlbmd0aCArIDI7IC8vIGFkZCBzb21lIHNwYWNlIGZvciBoZWFkZXIKICAgICB9Ci19Owor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNC YXJCdXR0b24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0Jh ckJ1dHRvbi5qcwppbmRleCA3YTA1MWRkMDkwMDBmMmE5NzY2OTI2N2YyZTNlOTNkZDIzYmNkNzA1 Li5mOGU3MDc1NmVlZmNlOTRlZWM5ODhmN2Q5ZGJiYzI1NGEzMWJkYTY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcwpA QCAtMjgsNiArMjgsMTEgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLyoqCisgKiBAZXh0ZW5k cyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KKyAqIEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHtBcnJh eS48c3RyaW5nPj19IHN0YXRlcworICovCiBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uID0g ZnVuY3Rpb24odGl0bGUsIGNsYXNzTmFtZSwgc3RhdGVzKQogewogICAgIHRoaXMuZWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCmluZGV4IGIwMDE3NTU5N2U1YzIyOTBl NzM2ZjdiMDE4YmU3ZTUxZGRjMzBlNTYuLmFiYzAzMWJmODFmMWQyNzVmNGMyMDE5MWM4NjhiNDE2 ODMwZjJjMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGV4dFByb21wdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rl eHRQcm9tcHQuanMKQEAgLTI4LDYgKzI4LDcgQEAKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKKyAq IEBwYXJhbSB7Ym9vbGVhbj19IG9taXRIaXN0b3J5CiAgKi8KIFdlYkluc3BlY3Rvci5UZXh0UHJv bXB0ID0gZnVuY3Rpb24oZWxlbWVudCwgY29tcGxldGlvbnMsIHN0b3BDaGFyYWN0ZXJzLCBvbWl0 SGlzdG9yeSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvZXh0ZXJucy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJu cy5qcwppbmRleCAzMjAzZTNkYjUwMzlkNDZjY2Y0NzAxZGY4ODgxMTVmMWEzZDU5MTExLi5lZmQw ZmUzZDhlMzI0YWMyZjM3ZWViYjgxOTQ2MmNlMTE3MTgyYTVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCkBAIC0xMTEsMyArMTExLDM4IEBAIFdl Ykluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lID0gZnVuY3Rpb24oKQogV2ViSW5zcGVjdG9y Lm5ldHdvcmtSZXNvdXJjZUJ5SWQgPSBmdW5jdGlvbihyZXF1ZXN0SWQpCiB7CiB9CisKKy8qKgor ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51CisgKiBAcGFy YW0ge05vZGV9IGNvbnRleHROb2RlCisgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICovCitXZWJJ bnNwZWN0b3IucG9wdWxhdGVIcmVmQ29udGV4dE1lbnUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwg Y29udGV4dE5vZGUsIGV2ZW50KQoreworfQorCisvKioKKyAqIEByZXR1cm4ge2Jvb2xlYW59Cisg Ki8KK1dlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzID0gZnVuY3Rpb24oKQorewor fQorCitXZWJJbnNwZWN0b3IucGFuZWxzID0ge307CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisg Ki8KK1dlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCit7CisgICAgLyoqIEBw YXJhbSB7Li4uKn0gdmFyX2FyZ3MgKi8gICAgIAorICAgIHRoaXMuZXZhbHVhdGVJblNlbGVjdGVk Q2FsbEZyYW1lID0gZnVuY3Rpb24odmFyX2FyZ3MpIHt9CisgICAgLyoqIEBwYXJhbSB7Li4uKn0g dmFyX2FyZ3MgKi8gICAgIAorICAgIHRoaXMuZ2V0U2VsZWN0ZWRDYWxsRnJhbWVWYXJpYWJsZXMg PSBmdW5jdGlvbih2YXJfYXJncykge30KKyAgICB0aGlzLnBhdXNlZCA9IGZhbHNlOworfQorCisv KioKKyAqIEB0eXBlIHs/V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0KKyAqLworV2ViSW5zcGVj dG9yLnBhbmVscy5zY3JpcHRzID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggOWI4ZmJlNWYzMzNkNDQ4NDY2NWNlYTEyNmEz M2EyMTIxNjY0MmE5Yy4uOGMyNzFlODFiNTI3ZWY1NDQ5NmViNTQ1MTBjNmQ0N2FiMWZkMjc4ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK QEAgLTUxMCw3ICs1MTAsNyBAQCBXZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24o KQogICAgIHRoaXMuY29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db25zb2xl TW9kZWwuRXZlbnRzLlJlcGVhdENvdW50VXBkYXRlZCwgdGhpcy5fdXBkYXRlRXJyb3JBbmRXYXJu aW5nQ291bnRzLCB0aGlzKTsKIAogICAgIHRoaXMuZHJhd2VyID0gbmV3IFdlYkluc3BlY3Rvci5E cmF3ZXIoKTsKLSAgICB0aGlzLmNvbnNvbGVWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xl VmlldygpOworICAgIHRoaXMuY29uc29sZVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVW aWV3KFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLmlzV29ya2VyRnJvbnRlbmQoKSk7CiAKICAg ICB0aGlzLm5ldHdvcmtNYW5hZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlcigp OwogICAgIHRoaXMucmVzb3VyY2VUcmVlTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL3V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRp bGl0aWVzLmpzCmluZGV4IGM5YmJkYzJhNzkzYTkwMWY2MTU4ODc5ZDA2ZjJjYzlkZDkxMDQzYTku LmEzYmQwZDk3OTc0MDMzNzQ3NGY5NTQ5ZjBjZjQ2MmJiN2Q1ZDQ3YTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCkBAIC0yNTAsNiArMjUw LDkgQEAgRWxlbWVudC5wcm90b3R5cGUuaXNJbnNlcnRpb25DYXJldEluc2lkZSA9IGZ1bmN0aW9u KCkKICAgICByZXR1cm4gc2VsZWN0aW9uUmFuZ2Uuc3RhcnRDb250YWluZXIgPT09IHRoaXMgfHwg c2VsZWN0aW9uUmFuZ2Uuc3RhcnRDb250YWluZXIuaXNEZXNjZW5kYW50KHRoaXMpOwogfQogCisv KioKKyAqIEBwYXJhbSB7c3RyaW5nPX0gY2xhc3NOYW1lCisgKi8KIEVsZW1lbnQucHJvdG90eXBl LmNyZWF0ZUNoaWxkID0gZnVuY3Rpb24oZWxlbWVudE5hbWUsIGNsYXNzTmFtZSkKIHsKICAgICB2 YXIgZWxlbWVudCA9IHRoaXMub3duZXJEb2N1bWVudC5jcmVhdGVFbGVtZW50KGVsZW1lbnROYW1l KTsK