48261 2010-10-25 13:01:22 -0700 Web Inspector: continue making resources panel optional. 2010-10-26 10:33:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 48332 1 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 299052 0 pfeldman 2010-10-25 13:01:22 -0700 This refactoring makes console, audits and extensions tests pass while taking data from resource / network panels depending on the flag. 299082 1 71790 pfeldman 2010-10-25 13:28:32 -0700 Created attachment 71790 [PATCH] Proposed change. 299411 2 pfeldman 2010-10-26 06:53:20 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/http/tests/inspector/inspector-test2.js M LayoutTests/http/tests/inspector/resource-parameters.html M LayoutTests/inspector/audits-panel-functional.html M LayoutTests/inspector/styles-source-offsets.html M WebCore/ChangeLog M WebCore/inspector/front-end/AuditLauncherView.js M WebCore/inspector/front-end/AuditsPanel.js M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/CookieItemsView.js M WebCore/inspector/front-end/ExtensionServer.js M WebCore/inspector/front-end/HAREntry.js M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourceCategory.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/StylesSidebarPane.js M WebCore/inspector/front-end/inspector.js Committed r70518 299431 3 webkit.review.bot 2010-10-26 07:29:47 -0700 http://trac.webkit.org/changeset/70518 might have broken Qt Linux Release The following tests are not passing: inspector/audits-panel-functional.html 299548 4 pfeldman 2010-10-26 10:08:13 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/http/tests/inspector/inspector-test2.js M LayoutTests/http/tests/inspector/resource-parameters.html M LayoutTests/inspector/audits-panel-functional.html M LayoutTests/inspector/styles-source-offsets.html M WebCore/ChangeLog M WebCore/inspector/front-end/AuditLauncherView.js M WebCore/inspector/front-end/AuditsPanel.js M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/CookieItemsView.js M WebCore/inspector/front-end/ExtensionServer.js M WebCore/inspector/front-end/HAREntry.js M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourceCategory.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/StylesSidebarPane.js M WebCore/inspector/front-end/inspector.js Committed r70532 299566 5 webkit.review.bot 2010-10-26 10:33:25 -0700 http://trac.webkit.org/changeset/70532 might have broken Qt Linux Release The following tests are not passing: inspector/audits-panel-functional.html 71790 2010-10-25 13:28:32 -0700 2010-10-25 13:34:57 -0700 [PATCH] Proposed change. resources_optional_2 text/plain 27573 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NThmMjI2Li45MzliMTVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MjUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY29udGlu dWUgbWFraW5nIHJlc291cmNlcyBwYW5lbCBvcHRpb25hbC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MjYxCisKKyAgICAgICAgVGhpcyByZWZhY3Rv cmluZyBtYWtlcyBjb25zb2xlLCBhdWRpdHMgYW5kIGV4dGVuc2lvbnMgdGVzdHMgcGFzcyB3aGls ZSB0YWtpbmcgZGF0YSBmcm9tIAorICAgICAgICByZXNvdXJjZXMgcGFuZWwuIE5ldHdvcmsgcGFu ZWwgYXMgYSBzb3VyY2UgaXMgdG8gZm9sbG93LgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvcmVzb3VyY2UtcGFyYW1ldGVycy5odG1sOgorCiAyMDEwLTEwLTI1ICBBZGFtIFJvYmVu ICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBMYW5kIG5ldyBYUCByZXN1bHRzIGZvciBi YWNrc2xhc2gtdG8teWVuLXNpZ24tZXVjLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbCBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbAppbmRleCAxYjI4 YmYyLi4xNmZiNGRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9yZXNvdXJjZS1wYXJhbWV0ZXJzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvcmVzb3VyY2UtcGFyYW1ldGVycy5odG1sCkBAIC00MSw3ICs0MSw3IEBAIGZ1bmN0 aW9uIGZyb250ZW5kX2VuYWJsZVJlc291cmNlVHJhY2tpbmcodGVzdENvbnRyb2xsZXIpCiAKIGZ1 bmN0aW9uIGZyb250ZW5kX2R1bXBGb3JtRGF0YSh0ZXN0Q29udHJvbGxlcikKIHsKLSAgICB2YXIg cmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXBbImh0dHA6Ly9sb2NhbGhvc3Q6 ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2VzL3Bvc3QtdGFyZ2V0LmNnaT9xdWVyeVBhcmFtMT1xdWVy eVZhbHVlMSZxdWVyeVBhcmFtMj0iXTsKKyAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VGb3JVUkwoImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2Vz L3Bvc3QtdGFyZ2V0LmNnaT9xdWVyeVBhcmFtMT1xdWVyeVZhbHVlMSZxdWVyeVBhcmFtMj0iKTsK IAogICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNr aW5nKCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggZTA5YzA5ZC4uMGQxZjRmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw3MyBAQAogMjAxMC0xMC0yNSAgUGF2 ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBjb250aW51ZSBtYWtp bmcgcmVzb3VyY2VzIHBhbmVsIG9wdGlvbmFsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgyNjEKKworICAgICAgICBUaGlzIHJlZmFjdG9yaW5nIG1h a2VzIGNvbnNvbGUsIGF1ZGl0cyBhbmQgZXh0ZW5zaW9ucyB0ZXN0cyBwYXNzIHdoaWxlIHRha2lu ZyBkYXRhIGZyb20KKyAgICAgICAgcmVzb3VyY2VzIHBhbmVsLiBOZXR3b3JrIHBhbmVsIGFzIGEg c291cmNlIGlzIHRvIGZvbGxvdy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVk aXRzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuYWRkTWVzc2Fn ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5fZmlsdGVyQ29v a2llc0ZvckRvbWFpbi5wb3B1bGF0ZVJlc291cmNlc0ZvckRvY3VtZW50cyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5fZmlsdGVyQ29va2llc0ZvckRv bWFpbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZS5fb25SZXZl YWxBbmRTZWxlY3RSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2Vy dmVyLnByb3RvdHlwZS5fb25HZXRSZXNvdXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4 dGVuc2lvblNlcnZlci5wcm90b3R5cGUuX29uR2V0UmVzb3VyY2VDb250ZW50KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkhBUkxvZy5wcm90b3R5cGUuYnVpbGQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhBUkxvZy5w cm90b3R5cGUuYnVpbGRNYWluUmVzb3VyY2VUaW1pbmdzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5IQVJMb2cucHJvdG90eXBlLl9jb252ZXJ0UmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5f cmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuZ2V0 IHJlc291cmNlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlw ZS5hZGRSZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IGNhdGVnb3J5 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlQ2F0ZWdvcnkuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRlZ29yeSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VDYXRlZ29yeS5wcm90b3R5cGUudG9TdHJpbmcpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuaWRlbnRpZmllckZvckluaXRpYWxSZXF1ZXN0 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLndpbGxT ZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3Rv dHlwZS5kaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1h bmFnZXIucHJvdG90eXBlLmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5S ZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5zZXRPdmVy cmlkZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnBy b3RvdHlwZS5fY2FsbEZvckZyYW1lUmVzb3VyY2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl c1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUu cmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5h ZGRSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90 eXBlLnJlbW92ZVJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5l bC5wcm90b3R5cGUuX3RvZ2dsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUuYWRkU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLl9icmVha3BvaW50QWRkZWQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRhdGVUaXRsZS5saW5raWZ5VVJM KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5fdXBkYXRlRm9jdXNlZE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LmdldCBuZXR3b3JrUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5mb3JBbGxSZXNv dXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9t Q29udGVudEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZW1vdmVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJM KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxGb3JSZWxhdGVkTm9kZS5jYWxsYmFjayk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxGb3JSZWxhdGVkTm9kZSk6CisKKzIwMTAt MTAtMjUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNs b3dseSBtYWtlIG9sZCByZXNvdXJjZXMgcGFuZWwgb3B0aW9uYWwgKGNvbnRpbnVlZCkuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMKaW5kZXggODJiZTU4Zi4uODk0 N2YyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1BhbmVs LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwpAQCAt MTMwLDggKzEzMCw4IEBAIFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgX2V4ZWN1dGVBdWRpdDogZnVuY3Rpb24oY2F0ZWdvcmllcywgcmVzdWx0Q2FsbGJhY2spCiAg ICAgewogICAgICAgICB2YXIgcmVzb3VyY2VzID0gW107Ci0gICAgICAgIGZvciAodmFyIGlkIGlu IFdlYkluc3BlY3Rvci5yZXNvdXJjZXMpCi0gICAgICAgICAgICByZXNvdXJjZXMucHVzaChXZWJJ bnNwZWN0b3IucmVzb3VyY2VzW2lkXSk7CisgICAgICAgIGZvciAodmFyIGlkIGluIFdlYkluc3Bl Y3Rvci5uZXR3b3JrUmVzb3VyY2VzKQorICAgICAgICAgICAgcmVzb3VyY2VzLnB1c2goV2ViSW5z cGVjdG9yLm5ldHdvcmtSZXNvdXJjZXNbaWRdKTsKIAogICAgICAgICB2YXIgcnVsZXNSZW1haW5p bmcgPSAwOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhdGVnb3JpZXMubGVuZ3RoOyAr K2kpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggMTA2 MjUwNy4uM2IzYjk3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmll dy5qcwpAQCAtMjI1LDEyICsyMjUsMTQgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2luY3JlbWVudEVycm9yV2FybmluZ0NvdW50KG1z Zyk7CiAKICAgICAgICAgICAgIC8vIEFkZCBtZXNzYWdlIHRvIHRoZSByZXNvdXJjZSBwYW5lbAot ICAgICAgICAgICAgaWYgKG1zZy51cmwgaW4gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMTWFwKSB7 Ci0gICAgICAgICAgICAgICAgbXNnLnJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJM TWFwW21zZy51cmxdOwotICAgICAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnJl c291cmNlcykKLSAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJj ZXMuYWRkTWVzc2FnZVRvUmVzb3VyY2UobXNnLnJlc291cmNlLCBtc2cpOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5yZXNvdXJjZU1hbmFnZXIpCisgICAgICAg ICAgICBpZiAoIVByZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQpIHsKKyAgICAgICAgICAg ICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwobXNnLnVybCk7 CisgICAgICAgICAgICAgICAgaWYgKHJlc291cmNlKSB7CisgICAgICAgICAgICAgICAgICAgIG1z Zy5yZXNvdXJjZSA9IHJlc291cmNlOworICAgICAgICAgICAgICAgICAgICBpZiAoV2ViSW5zcGVj dG9yLnBhbmVscy5yZXNvdXJjZXMpCisgICAgICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IucGFuZWxzLnJlc291cmNlcy5hZGRNZXNzYWdlVG9SZXNvdXJjZShtc2cucmVzb3VyY2UsIG1z Zyk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLnJlc291cmNlTWFuYWdlci5hZGRDb25zb2xlTWVzc2FnZShtc2cpOwog CiAgICAgICAgICAgICB0aGlzLmNvbW1hbmRTaW5jZVByZXZpb3VzTWVzc2FnZSA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKaW5kZXgg MGIwNWYyYS4uYmVkZWZjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0Nvb2tpZUl0ZW1zVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29v a2llSXRlbXNWaWV3LmpzCkBAIC0xMjAsMTIgKzEyMCwxMyBAQCBXZWJJbnNwZWN0b3IuQ29va2ll SXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHJlc291cmNlVVJMc0ZvckRvY3Vt ZW50VVJMID0gW107CiAgICAgICAgIHRoaXMuX3RvdGFsU2l6ZSA9IDA7CiAKLSAgICAgICAgZm9y ICh2YXIgaWQgaW4gV2ViSW5zcGVjdG9yLnJlc291cmNlcykgewotICAgICAgICAgICAgdmFyIHJl c291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlc1tpZF07CisgICAgICAgIGZ1bmN0aW9uIHBv cHVsYXRlUmVzb3VyY2VzRm9yRG9jdW1lbnRzKHJlc291cmNlKQorICAgICAgICB7CiAgICAgICAg ICAgICB2YXIgdXJsID0gcmVzb3VyY2UuZG9jdW1lbnRVUkwuYXNQYXJzZWRVUkwoKTsKICAgICAg ICAgICAgIGlmICh1cmwgJiYgdXJsLmhvc3QgPT0gdGhpcy5fY29va2llRG9tYWluKQogICAgICAg ICAgICAgICAgIHJlc291cmNlVVJMc0ZvckRvY3VtZW50VVJMLnB1c2gocmVzb3VyY2UudXJsKTsK ICAgICAgICAgfQorICAgICAgICBXZWJJbnNwZWN0b3IuZm9yQWxsUmVzb3VyY2VzKHBvcHVsYXRl UmVzb3VyY2VzRm9yRG9jdW1lbnRzKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFs bENvb2tpZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBwdXNoZWQgPSBmYWxzZTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCmluZGV4 IDRmZDY5Y2YuLjc1MzYxYTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4 dGVuc2lvblNlcnZlci5qcwpAQCAtMjQwLDcgKzI0MCw3IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNp b25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgaWQgPSBtZXNzYWdlLmlkOwogICAg ICAgICB2YXIgcmVzb3VyY2UgPSBudWxsOwogCi0gICAgICAgIHJlc291cmNlID0gV2ViSW5zcGVj dG9yLnJlc291cmNlc1tpZF0gfHwgV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGlkKTsKKyAg ICAgICAgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291cmNlc1tpZF0gfHwgV2Vi SW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGlkKTsKICAgICAgICAgaWYgKCFyZXNvdXJjZSkKICAg ICAgICAgICAgIHJldHVybiB0aGlzLl9zdGF0dXMuRV9OT1RGT1VORCh0eXBlb2YgaWQgKyAiOiAi ICsgaWQpOwogICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmV0d29ya1BhbmVsRW5hYmxlZCkgewpA QCAtMjYxLDE0ICsyNjEsMTQgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5 cGUgPSB7CiAgICAgewogICAgICAgICBmdW5jdGlvbiByZXNvdXJjZVdyYXBwZXIoaWQpCiAgICAg ICAgIHsKLSAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyLl9j b252ZXJ0UmVzb3VyY2UoV2ViSW5zcGVjdG9yLnJlc291cmNlc1tpZF0pOworICAgICAgICAgICAg cmV0dXJuIFdlYkluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIuX2NvbnZlcnRSZXNvdXJjZShXZWJJ bnNwZWN0b3IubmV0d29ya1Jlc291cmNlc1tpZF0pOwogICAgICAgICB9CiAKICAgICAgICAgdmFy IHJlc3BvbnNlOwogICAgICAgICBpZiAocmVxdWVzdC5pZCkKLSAgICAgICAgICAgIHJlc3BvbnNl ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlc1tyZXF1ZXN0LmlkXSA/IHJlc291cmNlV3JhcHBlcihy ZXF1ZXN0LmlkKSA6IHRoaXMuX3N0YXR1cy5FX05PVEZPVU5EKHJlcXVlc3QuaWQpOworICAgICAg ICAgICAgcmVzcG9uc2UgPSBXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291cmNlc1tyZXF1ZXN0Lmlk XSA/IHJlc291cmNlV3JhcHBlcihyZXF1ZXN0LmlkKSA6IHRoaXMuX3N0YXR1cy5FX05PVEZPVU5E KHJlcXVlc3QuaWQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXNwb25zZSA9IE9iamVj dC5rZXlzKFdlYkluc3BlY3Rvci5yZXNvdXJjZXMpLm1hcChyZXNvdXJjZVdyYXBwZXIpOworICAg ICAgICAgICAgcmVzcG9uc2UgPSBPYmplY3Qua2V5cyhXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291 cmNlcykubWFwKHJlc291cmNlV3JhcHBlcik7CiAgICAgICAgIHJldHVybiByZXNwb25zZTsKICAg ICB9LAogCkBAIC0yOTgsNyArMjk4LDcgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBpZHMubGVuZ3RoOyAr K2kpIHsKICAgICAgICAgICAgIHZhciBpZCA9IGlkc1tpXTsKLSAgICAgICAgICAgIHZhciByZXNv dXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZXNbaWRdOworICAgICAgICAgICAgdmFyIHJlc291 cmNlID0gV2ViSW5zcGVjdG9yLm5ldHdvcmtSZXNvdXJjZXNbaWRdOwogICAgICAgICAgICAgaWYg KCFyZXNvdXJjZSkKICAgICAgICAgICAgICAgICByZXNwb25zZS5wdXNoKHRoaXMuX3N0YXR1cy5F X05PVEZPVU5EKGlkKSk7CiAgICAgICAgICAgICBlbHNlIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9IQVJFbnRyeS5qcwppbmRleCAyYjhmNDFiLi5mM2JmYjA2IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzCkBAIC0xODAsNyArMTgwLDcgQEAgV2ViSW5zcGVjdG9y LkhBUkVudHJ5LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHN0YXJ0VGltZSA9IHRpbWluZ1tz dGFydF07CiAgICAgICAgIHJldHVybiB0eXBlb2Ygc3RhcnRUaW1lICE9PSAibnVtYmVyIiB8fCBz dGFydFRpbWUgPT09IC0xID8gLTEgOiBNYXRoLnJvdW5kKHRpbWluZ1tlbmRdIC0gc3RhcnRUaW1l KTsKICAgICB9Ci19OworfQogCiBXZWJJbnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRz ID0gZnVuY3Rpb24odGltZSkKIHsKQEAgLTIwMyw3ICsyMDMsNyBAQCBXZWJJbnNwZWN0b3IuSEFS TG9nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2ZXJzaW9uOiB3ZWJLaXRWZXJzaW9u ID8gd2ViS2l0VmVyc2lvblsxXSA6ICJuL2EiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg cGFnZXM6IHRoaXMuX2J1aWxkUGFnZXMoKSwKLSAgICAgICAgICAgIGVudHJpZXM6IE9iamVjdC5r ZXlzKFdlYkluc3BlY3Rvci5yZXNvdXJjZXMpLm1hcCh0aGlzLl9jb252ZXJ0UmVzb3VyY2UpCisg ICAgICAgICAgICBlbnRyaWVzOiBPYmplY3Qua2V5cyhXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291 cmNlcykubWFwKHRoaXMuX2NvbnZlcnRSZXNvdXJjZSkKICAgICAgICAgfQogICAgIH0sCiAKQEAg LTIyMSwxNyArMjIxLDE1IEBAIFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlID0gewogCiAg ICAgYnVpbGRNYWluUmVzb3VyY2VUaW1pbmdzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2 YXIgcmVzb3VyY2VzUGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlczsKLSAgICAg ICAgdmFyIHN0YXJ0VGltZSA9IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uuc3RhcnRUaW1lOwog ICAgICAgICByZXR1cm4gewotICAgICAgICAgICAgIG9uQ29udGVudExvYWQ6IHRoaXMuX3BhZ2VF dmVudFRpbWUocmVzb3VyY2VzUGFuZWwubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUpLAotICAg ICAgICAgICAgIG9uTG9hZDogdGhpcy5fcGFnZUV2ZW50VGltZShyZXNvdXJjZXNQYW5lbC5tYWlu UmVzb3VyY2VMb2FkVGltZSksCisgICAgICAgICAgICAgb25Db250ZW50TG9hZDogdGhpcy5fcGFn ZUV2ZW50VGltZShXZWJJbnNwZWN0b3IubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUpLAorICAg ICAgICAgICAgIG9uTG9hZDogdGhpcy5fcGFnZUV2ZW50VGltZShXZWJJbnNwZWN0b3IubWFpblJl c291cmNlTG9hZFRpbWUpLAogICAgICAgICB9CiAgICAgfSwKIAogICAgIF9jb252ZXJ0UmVzb3Vy Y2U6IGZ1bmN0aW9uKGlkKQogICAgIHsKLSAgICAgICAgcmV0dXJuIChuZXcgV2ViSW5zcGVjdG9y LkhBUkVudHJ5KFdlYkluc3BlY3Rvci5yZXNvdXJjZXNbaWRdKSkuYnVpbGQoKTsKKyAgICAgICAg cmV0dXJuIChuZXcgV2ViSW5zcGVjdG9yLkhBUkVudHJ5KFdlYkluc3BlY3Rvci5uZXR3b3JrUmVz b3VyY2VzW2lkXSkpLmJ1aWxkKCk7CiAgICAgfSwKIAogICAgIF9wYWdlRXZlbnRUaW1lOiBmdW5j dGlvbih0aW1lKQpAQCAtMjQxLDQgKzIzOSw0IEBAIFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90 eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIC0xOwogICAgICAgICByZXR1cm4gV2ViSW5zcGVj dG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyh0aW1lIC0gc3RhcnRUaW1lKTsKICAgICB9Ci19 OworfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXgg N2NiYWQ1Yi4uMzkwZjU2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1BhbmVsLmpzCkBAIC0zNiw2ICszNiw4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwgPSBm dW5jdGlvbigpCiAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5jbGFzc05hbWUgPSAibmV0d29yay1z aWRlYmFyIjsKIAogICAgIHRoaXMuX3Jlc291cmNlcyA9IFtdOworICAgIHRoaXMuX3Jlc291cmNl c0J5SWQgPSBbXTsKKyAgICB0aGlzLl9sYXN0SWRlbnRpZmllciA9IDA7CiAgICAgdGhpcy5fc3Rh bGVSZXNvdXJjZXMgPSBbXTsKICAgICB0aGlzLl9yZXNvdXJjZUdyaWROb2RlcyA9IHt9OwogICAg IHRoaXMuX21haW5SZXNvdXJjZUxvYWRUaW1lID0gLTE7CkBAIC03NTgsNiArNzYwLDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9j YWxjdWxhdG9yLnJlc2V0KCk7CiAKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzID0gW107CisgICAg ICAgIHRoaXMuX3Jlc291cmNlc0J5SWQgPSBbXTsKICAgICAgICAgdGhpcy5fc3RhbGVSZXNvdXJj ZXMgPSBbXTsKICAgICAgICAgdGhpcy5fcmVzb3VyY2VHcmlkTm9kZXMgPSB7fTsKIApAQCAtNzcz LDkgKzc3NiwxNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5fcmVzZXRTdW1tYXJ5QmFyKCk7CiAgICAgfSwKIAorICAgIGdldCByZXNvdXJj ZXMoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlc0J5SWQ7CisgICAgfSwK KwogICAgIGFkZFJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7CiAgICAgICAgIHRo aXMuX3Jlc291cmNlcy5wdXNoKHJlc291cmNlKTsKKyAgICAgICAgaWYgKCFyZXNvdXJjZS5pZGVu dGlmaWVyKQorICAgICAgICAgICAgcmVzb3VyY2UuaWRlbnRpZmllciA9ICJuZXR3b3JrOiIgKyB0 aGlzLl9sYXN0SWRlbnRpZmllcisrOworICAgICAgICB0aGlzLl9yZXNvdXJjZXNCeUlkW3Jlc291 cmNlLmlkZW50aWZpZXJdID0gcmVzb3VyY2U7CiAgICAgICAgIHRoaXMucmVmcmVzaFJlc291cmNl KHJlc291cmNlKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2UuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anMKaW5kZXggNzE2YjVkNy4uODE3YWYwZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZS5qcwpAQCAtMjc0LDE3ICsyNzQsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJv dG90eXBlID0gewogCiAgICAgc2V0IGNhdGVnb3J5KHgpCiAgICAgewotICAgICAgICBpZiAodGhp cy5fY2F0ZWdvcnkgPT09IHgpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIG9s ZENhdGVnb3J5ID0gdGhpcy5fY2F0ZWdvcnk7Ci0gICAgICAgIGlmIChvbGRDYXRlZ29yeSkKLSAg ICAgICAgICAgIG9sZENhdGVnb3J5LnJlbW92ZVJlc291cmNlKHRoaXMpOwotCiAgICAgICAgIHRo aXMuX2NhdGVnb3J5ID0geDsKLQotICAgICAgICBpZiAodGhpcy5fY2F0ZWdvcnkpCi0gICAgICAg ICAgICB0aGlzLl9jYXRlZ29yeS5hZGRSZXNvdXJjZSh0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0 IGNhY2hlZCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VDYXRlZ29yeS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUNhdGVn b3J5LmpzCmluZGV4IDdkOTVhMWYuLjQzYzdjMmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZUNhdGVnb3J5LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZUNhdGVnb3J5LmpzCkBAIC0zMSw0MCArMzEsMTEgQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlQ2F0ZWdvcnkgPSBmdW5jdGlvbihuYW1lLCB0aXRsZSwgY29sb3IpCiAg ICAgdGhpcy5uYW1lID0gbmFtZTsKICAgICB0aGlzLnRpdGxlID0gdGl0bGU7CiAgICAgdGhpcy5j b2xvciA9IGNvbG9yOwotICAgIHRoaXMucmVzb3VyY2VzID0gW107CiB9CiAKIFdlYkluc3BlY3Rv ci5SZXNvdXJjZUNhdGVnb3J5LnByb3RvdHlwZSA9IHsKLQogICAgIHRvU3RyaW5nOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy50aXRsZTsKLSAgICB9LAotCi0gICAgYWRk UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQotICAgIHsKLSAgICAgICAgdmFyIGEgPSByZXNv dXJjZTsKLSAgICAgICAgdmFyIHJlc291cmNlc0xlbmd0aCA9IHRoaXMucmVzb3VyY2VzLmxlbmd0 aDsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNvdXJjZXNMZW5ndGg7ICsraSkgewot ICAgICAgICAgICAgdmFyIGIgPSB0aGlzLnJlc291cmNlc1tpXTsKLSAgICAgICAgICAgIGlmIChh Lmxhc3RQYXRoQ29tcG9uZW50TG93ZXJDYXNlICYmIGIubGFzdFBhdGhDb21wb25lbnRMb3dlckNh c2UpCi0gICAgICAgICAgICAgICAgaWYgKGEubGFzdFBhdGhDb21wb25lbnRMb3dlckNhc2UgPCBi Lmxhc3RQYXRoQ29tcG9uZW50TG93ZXJDYXNlKQotICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIGVsc2UgaWYgKGEubmFtZSAmJiBiLm5hbWUpCi0gICAgICAgICAgICAgICAg aWYgKGEubmFtZSA8IGIubmFtZSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IH0KLQotICAgICAgICB0aGlzLnJlc291cmNlcy5zcGxpY2UoaSwgMCwgcmVzb3VyY2UpOwotICAg IH0sCi0KLSAgICByZW1vdmVSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UpCi0gICAgewotICAg ICAgICB0aGlzLnJlc291cmNlcy5yZW1vdmUocmVzb3VyY2UsIHRydWUpOwotICAgIH0sCi0KLSAg ICByZW1vdmVBbGxSZXNvdXJjZXM6IGZ1bmN0aW9uKHJlc291cmNlKQotICAgIHsKLSAgICAgICAg dGhpcy5yZXNvdXJjZXMgPSBbXTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCA1Y2E1NTMyLi44ZWI3ZjA0IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanMKQEAgLTY4LDYg KzY4LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KIAogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuYWRkUmVzb3VyY2Uo cmVzb3VyY2UpOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmF1ZGl0cy5yZXNvdXJjZVN0 YXJ0ZWQocmVzb3VyY2UpOwogICAgIH0sCiAKICAgICBfY3JlYXRlUmVzb3VyY2U6IGZ1bmN0aW9u KGlkZW50aWZpZXIsIHVybCwgbG9hZGVyKQpAQCAtOTksOSArMTAwLDEwIEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICByZXNvdXJjZS5yZXF1ZXN0 Rm9ybURhdGEgPSByZXF1ZXN0LnJlcXVlc3RGb3JtRGF0YTsKICAgICAgICAgcmVzb3VyY2Uuc3Rh cnRUaW1lID0gdGltZTsKIAotICAgICAgICBpZiAoaXNSZWRpcmVjdCkKKyAgICAgICAgaWYgKGlz UmVkaXJlY3QpIHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5hZGRS ZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5wYW5lbHMuYXVkaXRzLnJlc291cmNlU3RhcnRlZChyZXNvdXJjZSk7CisgICAgICAgIH0gZWxz ZSAKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZWZyZXNoUmVzb3Vy Y2UocmVzb3VyY2UpOwogICAgIH0sCiAKQEAgLTE4Niw2ICsxODgsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3VyY2UuZW5kVGltZSA9 IGZpbmlzaFRpbWU7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLnJlZnJl c2hSZXNvdXJjZShyZXNvdXJjZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuYXVkaXRz LnJlc291cmNlRmluaXNoZWQocmVzb3VyY2UpOwogICAgICAgICBkZWxldGUgdGhpcy5fcmVzb3Vy Y2VzQnlJZFtpZGVudGlmaWVyXTsKICAgICB9LAogCkBAIC0xOTksNiArMjAyLDcgQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJlc291cmNlLmVu ZFRpbWUgPSB0aW1lOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZWZy ZXNoUmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmF1ZGl0 cy5yZXNvdXJjZUZpbmlzaGVkKHJlc291cmNlKTsKICAgICAgICAgZGVsZXRlIHRoaXMuX3Jlc291 cmNlc0J5SWRbaWRlbnRpZmllcl07CiAgICAgfSwKIApAQCAtMjEwLDYgKzIxNCw4IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICByZXNvdXJjZS5z dGFydFRpbWUgPSByZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSA9IHJlc291cmNlLmVuZFRp bWUgPSB0aW1lOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5hZGRSZXNv dXJjZShyZXNvdXJjZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuYXVkaXRzLnJlc291 cmNlU3RhcnRlZChyZXNvdXJjZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuYXVkaXRz LnJlc291cmNlRmluaXNoZWQocmVzb3VyY2UpOwogICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVN b2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQsIHJlc291cmNl KTsKICAgICB9LAogCkBAIC0yMjksNyArMjM1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFu YWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJlc291cmNlLnR5cGUgPSBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UuVHlwZVt0eXBlXTsKICAgICAgICAgcmVzb3VyY2Uub3ZlcnJpZGVuQ29udGVudCA9 IHNvdXJjZVN0cmluZzsKIAotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuYWRk UmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsu cmVmcmVzaFJlc291cmNlKHJlc291cmNlKTsKICAgICB9LAogCiAgICAgZGlkQ29tbWl0TG9hZEZv ckZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBsb2FkZXIpCkBAIC01NDYsMTMgKzU1Miwx OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlID0gewogICAgIF9j YWxsRm9yRnJhbWVSZXNvdXJjZXM6IGZ1bmN0aW9uKGZyYW1lSWQsIGNhbGxiYWNrKQogICAgIHsK ICAgICAgICAgdmFyIHJlc291cmNlcyA9IHRoaXMuX3Jlc291cmNlc0J5RnJhbWVJZFtmcmFtZUlk XTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IHJlc291cmNlcyAmJiBpIDwgcmVzb3VyY2VzLmxl bmd0aDsgKytpKQotICAgICAgICAgICAgY2FsbGJhY2socmVzb3VyY2VzW2ldKTsKKyAgICAgICAg Zm9yICh2YXIgaSA9IDA7IHJlc291cmNlcyAmJiBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgKytpKSB7 CisgICAgICAgICAgICBpZiAoY2FsbGJhY2socmVzb3VyY2VzW2ldKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgdmFyIGZyYW1lcyA9 IHRoaXMuX3N1YmZyYW1lc1tmcmFtZUlkXTsKICAgICAgICAgaWYgKGZyYW1lcykgewotICAgICAg ICAgICAgZm9yICh2YXIgaWQgaW4gZnJhbWVzKQotICAgICAgICAgICAgICAgIHRoaXMuX2NhbGxG b3JGcmFtZVJlc291cmNlcyhpZCwgY2FsbGJhY2spOworICAgICAgICAgICAgZm9yICh2YXIgaWQg aW4gZnJhbWVzKSB7CisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2NhbGxGb3JGcmFtZVJlc291 cmNlcyhpZCwgY2FsbGJhY2spKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogfQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDJj YjM5OWIuLmNiYTBjYWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VzUGFuZWwuanMKQEAgLTMwLDcgKzMwLDcgQEAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5l bCA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3IuUGFuZWwuY2FsbCh0aGlzLCAicmVz b3VyY2VzIik7Ci0KKyAgICB0aGlzLnJlc291cmNlVVJMTWFwID0ge307CiAgICAgdGhpcy5faXRl bXMgPSBbXTsKICAgICB0aGlzLl9zdGFsZUl0ZW1zID0gW107CiAKQEAgLTc1MiwxMCArNzUyLDEy IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAg ICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9 CisgICAgICAgIHRoaXMucmVzb3VyY2VVUkxNYXAgPSB7fTsKICAgICB9LAogCiAgICAgYWRkUmVz b3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKKyAgICAgICAgdGhpcy5yZXNvdXJjZVVS TE1hcFtyZXNvdXJjZS51cmxdID0gcmVzb3VyY2U7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlcy5w dXNoKHJlc291cmNlKTsKICAgICB9LAogCkBAIC03NzAsNiArNzcyLDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3VyY2UuZXJyb3JzID0g MDsKIAogICAgICAgICBkZWxldGUgcmVzb3VyY2UuX3Jlc291cmNlc1ZpZXc7CisgICAgICAgIGRl bGV0ZSB0aGlzLnJlc291cmNlVVJMTWFwW3Jlc291cmNlLnVybF07CiAgICAgfSwKIAogICAgIGFk ZE1lc3NhZ2VUb1Jlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSwgbXNnKQpAQCAtMTA4Miw3ICsx MDg1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnZpc2libGUgPSBmYWxzZTsKICAgICAg ICAgICAgIHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnQudmlzaWJsZSA9IGZhbHNlOwogICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlcyA9IHt9OwotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnJlc291cmNlVVJMTWFwID0ge307CisgICAgICAgICAgICB0aGlzLnJlc291cmNlVVJMTWFw ID0ge307CiAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnNldFJlc291cmNlVHJhY2tpbmdF bmFibGVkKGZhbHNlLCB0cnVlLCBjYWxsYmFjayk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52aXNpYmxlID0gdHJ1ZTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGQ2Zjg2YjYuLmI3OWE4 OGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAt MjQxLDcgKzI0MSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoc291cmNlSUQsIHNv dXJjZVVSTCwgc291cmNlLCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlLCBz Y3JpcHRXb3JsZFR5cGUpOwogICAgICAgICB0aGlzLl9zb3VyY2VJRE1hcFtzb3VyY2VJRF0gPSBz Y3JpcHQ7CiAKLSAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJM TWFwW3NvdXJjZVVSTF07CisgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNv dXJjZUZvclVSTChzb3VyY2VVUkwpOwogICAgICAgICBpZiAocmVzb3VyY2UpIHsKICAgICAgICAg ICAgIGlmIChyZXNvdXJjZS5maW5pc2hlZCkgewogICAgICAgICAgICAgICAgIC8vIFJlc291cmNl IGlzIGZpbmlzaGVkLCBiaW5kIHRoZSBzY3JpcHQgcmlnaHQgYXdheS4KQEAgLTI4OSw3ICsyODks NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2 YXIgc291cmNlRnJhbWU7CiAgICAgICAgIGlmIChicmVha3BvaW50LnVybCkgewotICAgICAgICAg ICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMTWFwW2JyZWFrcG9pbnQu dXJsXTsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZv clVSTChicmVha3BvaW50LnVybCk7CiAgICAgICAgICAgICBpZiAocmVzb3VyY2UgJiYgcmVzb3Vy Y2UuZmluaXNoZWQpCiAgICAgICAgICAgICAgICAgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VG cmFtZUZvclNjcmlwdE9yUmVzb3VyY2UocmVzb3VyY2UpOwogICAgICAgICB9CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggMzZkODU0 Yy4uMTM4ZmJmYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcwpAQCAtMTE4Niw3ICsxMTg2LDggQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJv cGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgdmFyIGNvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsK ICAgICAgICAgICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4 dE5vZGUoInVybCgiKSk7Ci0gICAgICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKFdl Ykluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHVybCwgdXJsLCBudWxsLCAodXJsIGluIFdlYklu c3BlY3Rvci5yZXNvdXJjZVVSTE1hcCkpKTsKKyAgICAgICAgICAgICAgICB2YXIgaGFzUmVzb3Vy Y2UgPSAhIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICAgICAgICAg IGNvbnRhaW5lci5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSh1cmws IHVybCwgbnVsbCwgaGFzUmVzb3VyY2UpKTsKICAgICAgICAgICAgICAgICBjb250YWluZXIuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIikiKSk7CiAgICAgICAgICAgICAgICAg cmV0dXJuIGNvbnRhaW5lcjsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzCmluZGV4IDg5MzY3NDEuLjQ0NTZhMjEgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNTAsNyArNTAsNiBAQAogCiB2YXIgV2ViSW5z cGVjdG9yID0gewogICAgIHJlc291cmNlczoge30sCi0gICAgcmVzb3VyY2VVUkxNYXA6IHt9LAog ICAgIGNvb2tpZURvbWFpbnM6IHt9LAogICAgIGFwcGxpY2F0aW9uQ2FjaGVEb21haW5zOiB7fSwK ICAgICBtaXNzaW5nTG9jYWxpemVkU3RyaW5nczoge30sCkBAIC00NTIsNiArNDUxLDMzIEBAIHZh ciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgewogICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRo aXMucGFuZWxzLmVsZW1lbnRzOwogICAgICAgICB0aGlzLnBhbmVscy5lbGVtZW50cy51cGRhdGVG b2N1c2VkTm9kZShub2RlSWQpOworICAgIH0sCisKKyAgICBnZXQgbmV0d29ya1Jlc291cmNlcygp CisgICAgeworICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmV0d29ya1BhbmVsRW5hYmxlZCkKKyAg ICAgICAgICAgIHJldHVybiB0aGlzLnBhbmVscy5uZXR3b3JrLnJlc291cmNlczsKKyAgICAgICAg ZWxzZQorICAgICAgICAgICAgcmV0dXJuIHRoaXMucmVzb3VyY2VzOworICAgIH0sCisKKyAgICBm b3JBbGxSZXNvdXJjZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgaWYgKFBy ZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VNYW5hZ2VyLmZvckFsbFJlc291cmNlcyhjYWxsYmFjayk7CisgICAgICAgIGVsc2Ug eworICAgICAgICAgICAgZm9yICh2YXIgaWQgaW4gV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJj ZXMucmVzb3VyY2VzKSB7CisgICAgICAgICAgICAgICAgaWYgKGNhbGxiYWNrKFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNlc1tpZF0pKQorICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9LAorCisgICAgcmVzb3VyY2VG b3JVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAgICAgIGlmIChQcmVmZXJlbmNlcy5uZXR3 b3JrUGFuZWxFbmFibGVkKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMucmVzb3VyY2VNYW5hZ2Vy LnJlc291cmNlRm9yVVJMKHVybCk7CisgICAgICAgIHJldHVybiB0aGlzLnBhbmVscy5yZXNvdXJj ZXMucmVzb3VyY2VVUkxNYXBbdXJsXTsKICAgICB9CiB9CiAKQEAgLTEyNDUsNyArMTI3MSw2IEBA IFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9IGZ1bmN0aW9uKHBheWxvYWQpCiAgICAgaWYg KCFyZXNvdXJjZSkgewogICAgICAgICByZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UoaWRlbnRpZmllciwgcGF5bG9hZC51cmwpOwogICAgICAgICB0aGlzLnJlc291cmNlc1tpZGVu dGlmaWVyXSA9IHJlc291cmNlOwotICAgICAgICB0aGlzLnJlc291cmNlVVJMTWFwW3Jlc291cmNl LnVybF0gPSByZXNvdXJjZTsKICAgICAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLmFkZFJlc291 cmNlKHJlc291cmNlKTsKICAgICAgICAgdGhpcy5wYW5lbHMuYXVkaXRzLnJlc291cmNlU3RhcnRl ZChyZXNvdXJjZSk7CiAgICAgfQpAQCAtMTMxNyw2ICsxMzQyLDcgQEAgV2ViSW5zcGVjdG9yLmRv bUNvbnRlbnRFdmVudEZpcmVkID0gZnVuY3Rpb24odGltZSkKICAgICB0aGlzLnBhbmVscy5hdWRp dHMubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSB0aW1lOwogICAgIGlmICh0aGlzLnBhbmVs cy5uZXR3b3JrKQogICAgICAgICB0aGlzLnBhbmVscy5uZXR3b3JrLm1haW5SZXNvdXJjZURPTUNv bnRlbnRUaW1lID0gdGltZTsKKyAgICB0aGlzLm1haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0g dGltZTsKIH0KIAogV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVkID0gZnVuY3Rpb24odGltZSkK QEAgLTEzMjYsNiArMTM1Miw3IEBAIFdlYkluc3BlY3Rvci5sb2FkRXZlbnRGaXJlZCA9IGZ1bmN0 aW9uKHRpbWUpCiAgICAgdGhpcy5wYW5lbHMuYXVkaXRzLm1haW5SZXNvdXJjZUxvYWRUaW1lID0g dGltZTsKICAgICBpZiAodGhpcy5wYW5lbHMubmV0d29yaykKICAgICAgICAgdGhpcy5wYW5lbHMu bmV0d29yay5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHRpbWU7CisgICAgdGhpcy5tYWluUmVzb3Vy Y2VMb2FkVGltZSA9IHRpbWU7CiB9CiAKIFdlYkluc3BlY3Rvci5yZW1vdmVSZXNvdXJjZSA9IGZ1 bmN0aW9uKGlkZW50aWZpZXIpCkBAIC0xMzM3LDggKzEzNjQsNiBAQCBXZWJJbnNwZWN0b3IucmVt b3ZlUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyKQogICAgIGlmICghcmVzb3VyY2UpCiAg ICAgICAgIHJldHVybjsKIAotICAgIHJlc291cmNlLmNhdGVnb3J5LnJlbW92ZVJlc291cmNlKHJl c291cmNlKTsKLSAgICBkZWxldGUgdGhpcy5yZXNvdXJjZVVSTE1hcFtyZXNvdXJjZS51cmxdOwog ICAgIGRlbGV0ZSB0aGlzLnJlc291cmNlc1tpZGVudGlmaWVyXTsKIAogICAgIGlmICh0aGlzLnBh bmVscy5yZXNvdXJjZXMpCkBAIC0xNDgyLDExICsxNTA3LDcgQEAgV2ViSW5zcGVjdG9yLnJlc2V0 ID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5zZXNzaW9uU2V0dGluZ3MucmVzZXQoKTsKIAotICAg IGZvciAodmFyIGNhdGVnb3J5IGluIHRoaXMucmVzb3VyY2VDYXRlZ29yaWVzKQotICAgICAgICB0 aGlzLnJlc291cmNlQ2F0ZWdvcmllc1tjYXRlZ29yeV0ucmVtb3ZlQWxsUmVzb3VyY2VzKCk7Ci0K ICAgICB0aGlzLnJlc291cmNlcyA9IHt9OwotICAgIHRoaXMucmVzb3VyY2VVUkxNYXAgPSB7fTsK ICAgICB0aGlzLmNvb2tpZURvbWFpbnMgPSB7fTsKICAgICB0aGlzLmFwcGxpY2F0aW9uQ2FjaGVE b21haW5zID0ge307CiAgICAgdGhpcy5oaWdobGlnaHRET01Ob2RlKDApOwpAQCAtMTcwMSwxMyAr MTcyMiw3IEBAIFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkK ICAgICBpZiAoIXVybCkKICAgICAgICAgcmV0dXJuICIiOwogCi0gICAgaWYgKFdlYkluc3BlY3Rv ci5yZXNvdXJjZU1hbmFnZXIpIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9y LnJlc291cmNlTWFuYWdlci5yZXNvdXJjZUZvclVSTCh1cmwpOwotICAgICAgICBpZiAocmVzb3Vy Y2UpCi0gICAgICAgICAgICByZXR1cm4gcmVzb3VyY2UuZGlzcGxheU5hbWU7Ci0gICAgfQotCi0g ICAgdmFyIHJlc291cmNlID0gdGhpcy5yZXNvdXJjZVVSTE1hcFt1cmxdOworICAgIHZhciByZXNv dXJjZSA9IHRoaXMucmVzb3VyY2VGb3JVUkwodXJsKTsKICAgICBpZiAocmVzb3VyY2UpCiAgICAg ICAgIHJldHVybiByZXNvdXJjZS5kaXNwbGF5TmFtZTsKIApAQCAtMTcyNSwyMSArMTc0MCw2IEBA IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkKICAgICByZXR1 cm4gdXJsLnRyaW1VUkwoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5kb21haW4pOwogfQogCi1X ZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwgPSBmdW5jdGlvbih1cmwpCi17Ci0gICAgaWYgKHVy bCBpbiB0aGlzLnJlc291cmNlVVJMTWFwKQotICAgICAgICByZXR1cm4gdGhpcy5yZXNvdXJjZVVS TE1hcFt1cmxdOwotCi0gICAgLy8gTm8gZGlyZWN0IG1hdGNoIGZvdW5kLiBTZWFyY2ggZm9yIHJl c291cmNlcyB0aGF0IGNvbnRhaW4KLSAgICAvLyBhIHN1YnN0cmluZyBvZiB0aGUgVVJMLgotICAg IGZvciAodmFyIHJlc291cmNlVVJMIGluIHRoaXMucmVzb3VyY2VVUkxNYXApIHsKLSAgICAgICAg aWYgKHJlc291cmNlVVJMLmhhc1N1YnN0cmluZyh1cmwpKQotICAgICAgICAgICAgcmV0dXJuIHRo aXMucmVzb3VyY2VVUkxNYXBbcmVzb3VyY2VVUkxdOwotICAgIH0KLQotICAgIHJldHVybiBudWxs OwotfQotCiBXZWJJbnNwZWN0b3IuX2Nob29zZVBhbmVsVG9TaG93U291cmNlTGluZSA9IGZ1bmN0 aW9uKHVybCwgbGluZSwgcHJlZmVycmVkUGFuZWwpCiB7CiAgICAgcHJlZmVycmVkUGFuZWwgPSBw cmVmZXJyZWRQYW5lbCB8fCAicmVzb3VyY2VzIjsKQEAgLTE3ODgsNyArMTc4OCw4IEBAIFdlYklu c3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudCA9IGZ1bmN0aW9uKHN0cmluZykKICAgICAg ICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLnBhbmVscy5wcm9maWxlcy5kaXNwbGF5VGl0bGVG b3JQcm9maWxlTGluayhwcm9maWxlU3RyaW5nTWF0Y2hlc1syXSwgcHJvZmlsZVN0cmluZ01hdGNo ZXNbMV0pOwogCiAgICAgICAgIHZhciByZWFsVVJMID0gKGxpbmtTdHJpbmcuaW5kZXhPZigid3d3 LiIpID09PSAwID8gImh0dHA6Ly8iICsgbGlua1N0cmluZyA6IGxpbmtTdHJpbmcpOwotICAgICAg ICBjb250YWluZXIuYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkxBc05vZGUocmVh bFVSTCwgdGl0bGUsIG51bGwsIChyZWFsVVJMIGluIFdlYkluc3BlY3Rvci5yZXNvdXJjZVVSTE1h cCkpKTsKKyAgICAgICAgdmFyIGhhc1Jlc291cmNlV2l0aFVSTCA9ICEhV2ViSW5zcGVjdG9yLnJl c291cmNlRm9yVVJMKHJlYWxVUkwpOworICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQoV2Vi SW5zcGVjdG9yLmxpbmtpZnlVUkxBc05vZGUocmVhbFVSTCwgdGl0bGUsIG51bGwsIGhhc1Jlc291 cmNlV2l0aFVSTCkpOwogICAgICAgICBzdHJpbmcgPSBzdHJpbmcuc3Vic3RyaW5nKGxpbmtJbmRl eCArIGxpbmtTdHJpbmcubGVuZ3RoLCBzdHJpbmcubGVuZ3RoKTsKICAgICB9CiAKQEAgLTE4NTYs MTMgKzE4NTcsMTcgQEAgV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMRm9yUmVsYXRlZE5vZGUgPSBm dW5jdGlvbihub2RlLCB1cmwpCiAgICAgfQogCiAgICAgLy8gZG9jdW1lbnRVUkwgbm90IGZvdW5k IG9yIGhhcyBiYWQgdmFsdWUKLSAgICBmb3IgKHZhciByZXNvdXJjZVVSTCBpbiBXZWJJbnNwZWN0 b3IucmVzb3VyY2VVUkxNYXApIHsKLSAgICAgICAgdmFyIHBhcnNlZFVSTCA9IHJlc291cmNlVVJM LmFzUGFyc2VkVVJMKCk7Ci0gICAgICAgIGlmIChwYXJzZWRVUkwgJiYgcGFyc2VkVVJMLnBhdGgg PT09IHVybCkKLSAgICAgICAgICAgIHJldHVybiByZXNvdXJjZVVSTDsKKyAgICB2YXIgcmVzb3Vy Y2VVUkwgPSB1cmw7CisgICAgZnVuY3Rpb24gY2FsbGJhY2socmVzb3VyY2UpCisgICAgeworICAg ICAgICBpZiAocmVzb3VyY2UucGF0aCA9PT0gdXJsKSB7CisgICAgICAgICAgICByZXNvdXJjZVVS TCA9IHJlc291cmNlLnVybDsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAg ICAgfQotICAgIHJldHVybiB1cmw7Ci19LAorICAgIFdlYkluc3BlY3Rvci5mb3JBbGxSZXNvdXJj ZXMoY2FsbGJhY2spOworICAgIHJldHVybiByZXNvdXJjZVVSTDsKK30KIAogV2ViSW5zcGVjdG9y LmNvbXBsZXRlVVJMID0gZnVuY3Rpb24oYmFzZVVSTCwgaHJlZikKIHsK