69623 2011-10-07 06:40:30 -0700 Web Inspector: make ScriptsPanel compile 2011-10-07 06:54:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 479967 0 pfeldman 2011-10-07 06:40:30 -0700 Patch to follow. 479968 1 110136 pfeldman 2011-10-07 06:43:12 -0700 Created attachment 110136 Patch 479970 2 110136 yurys 2011-10-07 06:50:04 -0700 Comment on attachment 110136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110136&action=review > Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js:-112 > - WebInspector.ObjectPropertiesSection.call(this); There may be some indirect dependencies on the order of these two lines, please make sure you didn't break watches pane. 479972 3 pfeldman 2011-10-07 06:54:53 -0700 Committed r96932: <http://trac.webkit.org/changeset/96932> 110136 2011-10-07 06:43:12 -0700 2011-10-07 06:50:04 -0700 Patch bug-69623-20111007174310.patch text/plain 36999 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY5MjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYzM0Y2UyYzQyMmYzN2Iy NDgzNjkyMDQyYzU2MjQ3YzQwOGUxN2I5Li5kMjQ5ODdkYmIwMTE3MzBkNzRjOTY3M2M3ZDViMjM2 NTZmMzRjYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTkgQEAKIDIwMTEtMTAtMDcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG1ha2UgU2NyaXB0c1BhbmVsIGNvbXBpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY5NjIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUuX3Bs YWNhcmRTZWxlY3RlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1v ZGVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZy YW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NvcGVDaGFpblNpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3NldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2NyZWF0ZVNvdXJj ZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl90 b2dnbGVCcmVha3BvaW50c0NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5kZWJ1Z2dpbmdTdXBwb3J0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLnNldEJyZWFrcG9pbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFu ZWwucHJvdG90eXBlLnVwZGF0ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLnJlbW92ZUJyZWFrcG9p bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRz UGFuZWwucHJvdG90eXBlLmZpbmRCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5jb250aW51ZVRvTGlu ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQ YW5lbC5wcm90b3R5cGUuY2FuRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2V0U2NyaXB0 U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2Ny aXB0c1BhbmVsLnByb3RvdHlwZS5zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5kZWJ1Z2dlclBhdXNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZy YW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5yZWxlYXNlRXZhbHVhdGlvblJlc3VsdCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc3Vn Z2VzdGVkRmlsZU5hbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFy QnV0dG9uLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9u c1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNT ZWN0aW9uLnByb3RvdHlwZS51cGRhdGUuYXBwZW5kUmVzdWx0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5XYXRjaEV4cHJlc3Npb25zU2VjdGlvbi5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25UcmVlRWxlbWVudC5wcm90b3R5cGUuc3RhcnRF ZGl0aW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlck1hbmFnZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5wcm90b3R5cGUuX29wZW5JbnNw ZWN0b3JXaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIucHJvdG90 eXBlLl9wYWdlSW5zcGVjdG9yQ2xvc2luZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVkaWNh dGVkV29ya2VyTWVzc2FnZUZvcndhcmRlci5wcm90b3R5cGUuX3JlY2VpdmVNZXNzYWdlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlcnNTaWRlYmFyUGFuZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJzU2lkZWJhclBhbmUucHJvdG90eXBlLnJlbW92ZVdvcmtl cik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLmxpbmtpZnlVUkwpOgorICAgICAgICAoSW5qZWN0ZWRGYWtlV29ya2VyKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKworMjAxMS0xMC0w NyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkIFJlc291cmNlc1BhbmVsIHRvIHRoZSBjb21waWxhdGlvbi4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NjEyCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCBkNzM3MWZjMWZl NmE3YTFhYjM3ZjYzMzRlNzVkOWNjNzg3MzdiMjE0Li45Nzg5NGMwNTlmYzkzNjhjNWM2NzAwY2Fh NGM5ZGFlMDA4MzA1MWFhIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29t cGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUt ZnJvbnQtZW5kLnNoCkBAIC03Miw3ICs3Miw3IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGls ZXIuamFyIC0tY29tcGlsYXRpb25fbGV2ZWwgU0lNUExFX09QVElNSVpBVElPTlMgLS13YXJuCiAg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrTWFuYWdlci5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9VSVNvdXJjZUNvZGUuanMgXAotICAgIC0tbW9kdWxlIGpzbW9kdWxlX3VpOjM3Ompz bW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfdWk6MzU6anNtb2R1bGVfY29t bW9uIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0No ZWNrYm94LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbG9yLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbnRleHRNZW51LmpzIFwKQEAgLTEwOCwyNyArMTA4LDMwIEBAIGphdmEgLWphciB+ L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tY29tcGlsYXRpb25fbGV2ZWwgU0lNUExFX09QVElNSVpB VElPTlMgLS13YXJuCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVV0aWxzLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1ZpZXcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2VsY29tZVZpZXcuanMgXAotICAgIC0tbW9kdWxlIGpzbW9kdWxlX2luc3Bl Y3Rvcl92aWV3czozMTpqc21vZHVsZV9zZGssanNtb2R1bGVfdWkgXAotICAgICAgICAtLWpzIFNv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmll dy5qcyBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfaW5zcGVjdG9yX3ZpZXdzOjE1OmpzbW9kdWxl X3Nkayxqc21vZHVsZV91aSBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBcCi0gICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMgXAotICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVy eVZpZXcuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGF0YWJhc2VUYWJsZVZpZXcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBcCiAgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01CcmVha3BvaW50c1NpZGVi YXJQYW5lLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTVByZXNlbnRhdGlvblV0aWxzLmpzIFwKLSAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMgXAogICAgICAgICAt LWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F dmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzIFwKLSAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZvbnRWaWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0dvVG9MaW5lRGlhbG9nLmpzIFwKLSAgICAgICAg LS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qcyBcCiAg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0 Q29udGV4dE1hbmFnZXIuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTWV0cmljc1NpZGViYXJQYW5lLmpzIFwKLSAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtJdGVtVmlldy5qcyBcCiAgICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3BvdmVySGVs cGVyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIFwKKyAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMgXAorICAgICAg ICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpz IFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lTWFuYWdlci5qcyBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfZWxlbWVudHM6Mzpqc21vZHVs ZV9pbnNwZWN0b3Jfdmlld3MgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWV0cmljc1NpZGViYXJQYW5lLmpzIFwKKyAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxlX25ldHdvcms6MTI6anNtb2R1bGVfaW5zcGVjdG9y X3ZpZXdzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0ZvbnRWaWV3LmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0ltYWdlVmlldy5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrSXRlbVZpZXcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDb29raWVzVmlldy5qcyBcCiAgICAg ICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUhlYWRl cnNWaWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlSFRNTFZpZXcuanMgXApAQCAtMTM3LDI2ICsxNDAsMjQgQEAgamF2YSAtamFy IH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BUSU1J WkFUSU9OUyAtLXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlUmVzcG9uc2VWaWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVGltaW5nVmlldy5qcyBcCiAgICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMg XAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzU2lkZWJhclBhbmUuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcyBcCi0gICAgICAgIC0tanMgU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUdyaWQuanMgXAotICAgICAgICAt LWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVNYW5hZ2VyLmpz IFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9pbnNwZWN0b3JfcGFuZWxzOjM6anNtb2R1bGVfaW5z cGVjdG9yX3ZpZXdzIFwKLSAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIFwKLSAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisgICAgLS1tb2R1 bGUganNtb2R1bGVfcmVzb3VyY2VzOjY6anNtb2R1bGVfaW5zcGVjdG9yX3ZpZXdzIFwKKyAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2Fj aGVJdGVtc1ZpZXcuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzIFwKKyAgICAgICAgLS1q cyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlVGFibGVWaWV3Lmpz IFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0 b3JhZ2VJdGVtc1ZpZXcuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxlX3Nj cmlwdHM6Nzpqc21vZHVsZV9pbnNwZWN0b3Jfdmlld3MgXAorICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMgXAorICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NvcGVDaGFpblNp ZGViYXJQYW5lLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgXAorICAgICAgICAtLWpz IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGVi YXJQYW5lLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1dvcmtlck1hbmFnZXIuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV29ya2Vyc1NpZGViYXJQYW5lLmpzICAgICAKIAogIyBUbyBiZSBjb21w aWxlZC4uLgotIyBbU2NyaXB0c10KLSMgSmF2YVNjcmlwdEZvcm1hdHRlcgotIyBKYXZhU2NyaXB0 U291cmNlRnJhbWUKLSMgU2NvcGVDaGFpblNpZGViYXJQYW5lCi0jIFNjcmlwdEZvcm1hdHRlcldv cmtlcgotIyBTY3JpcHRzUGFuZWwKLSMgV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lCi0jIENh bGxTdGFja1NpZGViYXJQYW5lCi0jCiAjIFtUaW1lbGluZV0KICMgVGltZWxpbmVPdmVydmlld1Bh bmUKICMgVGltZWxpbmVQYW5lbApAQCAtMTk5LDggKzIwMCw1IEBAIGphdmEgLWphciB+L2Nsb3N1 cmUvY29tcGlsZXIuamFyIC0tY29tcGlsYXRpb25fbGV2ZWwgU0lNUExFX09QVElNSVpBVElPTlMg LS13YXJuCiAjIFNvdXJjZUhUTUxUb2tlbml6ZXIKICMgU291cmNlSmF2YVNjcmlwdFRva2VuaXpl cgogIyBUZXN0Q29udHJvbGxlcgotIwotIyBbV29ya2Vyc10KLSMgSW5qZWN0ZWRGYWtlV29ya2Vy Ci0jIFdvcmtlck1hbmFnZXIKLSMgV29ya2Vyc1NpZGViYXJQYW5lCisjIEphdmFTY3JpcHRGb3Jt YXR0ZXIKKyMgU2NyaXB0Rm9ybWF0dGVyV29ya2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcwppbmRleCA1 M2ZmOWFjYmZlMzgyNDFjOGQwNjkwM2UzZTQzZTY1YzkxM2M3OTI1Li5hY2M4MDIzZTg3Y2RiZWRl NzIxODQwNTY4Y2RjNzkzNjQyOTQwNGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMKQEAgLTIzLDYg KzIzLDEwIEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisg KiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lfQorICovCiBXZWJJbnNwZWN0b3Iu Q2FsbFN0YWNrU2lkZWJhclBhbmUgPSBmdW5jdGlvbihtb2RlbCkKIHsKICAgICBXZWJJbnNwZWN0 b3IuU2lkZWJhclBhbmUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwgU3Rh Y2siKSk7CkBAIC0zMiw3ICszNiw3IEBAIFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFu ZSA9IGZ1bmN0aW9uKG1vZGVsKQogfQogCiBXZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBh bmUucHJvdG90eXBlID0gewotICAgIHVwZGF0ZTogZnVuY3Rpb24oY2FsbEZyYW1lcywgZGV0YWls cykKKyAgICB1cGRhdGU6IGZ1bmN0aW9uKGNhbGxGcmFtZXMpCiAgICAgewogICAgICAgICB0aGlz LmJvZHlFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAKQEAgLTk5LDcgKzEwMyw3IEBAIFdlYklu c3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biAtMTsKICAgICB9LAogCi0gICAgX3BsYWNhcmRTZWxlY3RlZDogZnVuY3Rpb24ocGxhY2FyZCwg ZXZlbnQpCisgICAgX3BsYWNhcmRTZWxlY3RlZDogZnVuY3Rpb24ocGxhY2FyZCkKICAgICB7CiAg ICAgICAgIHRoaXMuX21vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lID0gcGxhY2FyZC5jYWxsRnJhbWU7 CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJNb2RlbC5qcwppbmRleCA3OTVjOGMwZmJjZjNjOGI4ZDEwOTM0ZDU0YmZkOGExMDI1ZTM2 NTA3Li5mYjdlODQ3NjYwMjAzMmQ2MjliMzk2OWUxNWZiOTJkNGI2NTBmZjExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBA IC01OSw2ICs1OSwxMyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMgPSB7CiAg ICAgUmVzZXQ6ICJyZXNldCIKIH0KIAorV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuQnJlYWtS ZWFzb24gPSB7CisgICAgRE9NOiAiRE9NIiwKKyAgICBFdmVudExpc3RlbmVyOiAiRXZlbnRMaXN0 ZW5lciIsCisgICAgWEhSOiAiWEhSIiwKKyAgICBFeGNlcHRpb246ICJleGNlcHRpb24iCit9CisK IFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICBlbmFibGVEZWJ1 Z2dlcjogZnVuY3Rpb24oKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKaW5kZXggMTFjMmY1 ZGQxYmI1NGQyODE2ZmYyYzg1M2NmNTQxMmRlYjMyZDE4My4uNTczMTg2YjBkNWEwNjk4Y2I0NTRh Nzc4YjBhNWZiYjk2N2M2MDU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKQEAgLTMxLDEwMyAr MzEsMTQgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lfQorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0 ZX0gZGVsZWdhdGUKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3Vy Y2VDb2RlCiAgKi8KLVdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlv bihtb2RlbCwgdWlTb3VyY2VDb2RlKQorV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFt ZSA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUpCiB7CiAgICAgLy8gRklYTUU6IG1v dmUgYWxsIFNvdXJjZUZyYW1lIG1ldGhvZHMgcmVsYXRlZCB0byBKYXZhU2NyaXB0IGRlYnVnZ2lu ZyBoZXJlIGFuZAogICAgIC8vIGdldCByaWQgb2YgU291cmNlRnJhbWUuX2RlbGVnYXRlLgotICAg IHZhciBkZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNj cmlwdHNQYW5lbChtb2RlbCwgdWlTb3VyY2VDb2RlKTsKICAgICBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUuY2FsbCh0aGlzLCBkZWxlZ2F0ZSwgdWlTb3VyY2VDb2RlLnVybCk7CiB9CiAKIFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGU7Ci0KLS8qKgotICogQGNvbnN0cnVjdG9yCi0g KiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGV9Ci0gKi8KLVdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24o bW9kZWwsIHVpU291cmNlQ29kZSkKLXsKLSAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZS5jYWxsKHRoaXMpOwotICAgIHRoaXMuX21vZGVsID0gbW9kZWw7Ci0gICAgdGhpcy5fdWlT b3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwotICAgIHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCA9 ICJwb3BvdmVyIjsKLX0KLQotV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxs YmFjaykKLSAgICB7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZXF1ZXN0Q29udGVudChj YWxsYmFjayk7Ci0gICAgfSwKLQotICAgIGRlYnVnZ2luZ1N1cHBvcnRlZDogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSwKLQotICAgIHNldEJyZWFrcG9pbnQ6 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKLSAgICB7Ci0gICAgICAg IHRoaXMuX21vZGVsLnNldEJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVy LCBjb25kaXRpb24sIGVuYWJsZWQpOwotCi0gICAgICAgIGlmICghV2ViSW5zcGVjdG9yLnBhbmVs cy5zY3JpcHRzLmJyZWFrcG9pbnRzQWN0aXZhdGVkKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnBhbmVscy5zY3JpcHRzLnRvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCgpOwotICAgIH0sCi0KLSAg ICB1cGRhdGVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJs ZWQpCi0gICAgewotICAgICAgICB0aGlzLl9tb2RlbC51cGRhdGVCcmVha3BvaW50KHRoaXMuX3Vp U291cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKLSAgICB9LAotCi0g ICAgcmVtb3ZlQnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlcikKLSAgICB7Ci0gICAgICAg IHRoaXMuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVt YmVyKTsKLSAgICB9LAotCi0gICAgZmluZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIp Ci0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fbW9kZWwuZmluZEJyZWFrcG9pbnQodGhpcy5f dWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKTsKLSAgICB9LAotCi0gICAgY29udGludWVUb0xpbmU6 IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCi0gICAgewotICAgICAgICB0aGlzLl9tb2RlbC5jb250aW51 ZVRvTGluZSh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOwotICAgIH0sCi0KLSAgICBj YW5FZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fbW9kZWwuY2FuRWRpdFNjcmlwdFNvdXJjZSh0aGlzLl91aVNvdXJjZUNvZGUpOwotICAgIH0s Ci0KLSAgICBzZXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKQotICAgIHsK LSAgICAgICAgdGhpcy5fbW9kZWwuc2V0U2NyaXB0U291cmNlKHRoaXMuX3VpU291cmNlQ29kZSwg dGV4dCwgY2FsbGJhY2spOwotICAgIH0sCi0KLSAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRp dGVkOiBmdW5jdGlvbihpbkVkaXRNb2RlKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQodGhpcy5fdWlTb3VyY2VD b2RlLCBpbkVkaXRNb2RlKTsKLSAgICB9LAotCi0gICAgZGVidWdnZXJQYXVzZWQ6IGZ1bmN0aW9u KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMucGF1 c2VkOwotICAgIH0sCi0KLSAgICBldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWU6IGZ1bmN0aW9u KHN0cmluZywgY2FsbGJhY2spCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNj cmlwdHMuZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lKHN0cmluZywgdGhpcy5fcG9wb3Zlck9i amVjdEdyb3VwLCBmYWxzZSwgZmFsc2UsIGNhbGxiYWNrKTsKLSAgICB9LAotCi0gICAgcmVsZWFz ZUV2YWx1YXRpb25SZXN1bHQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIFJ1bnRpbWVBZ2Vu dC5yZWxlYXNlT2JqZWN0R3JvdXAodGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwKTsKLSAgICB9LAot Ci0gICAgc3VnZ2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciBu YW1lcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fZm9sZGVyQW5kRGlzcGxheU5hbWVG b3JTY3JpcHRVUkwodGhpcy5fdWlTb3VyY2VDb2RlLnVybCk7Ci0gICAgICAgIHJldHVybiBuYW1l cy5kaXNwbGF5TmFtZSB8fCAidW50aXRsZWQuanMiOwotICAgIH0KLX0KLQotV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9 IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwpp bmRleCBiMTNlOGRhNDU1YTYxZThiMjY1YmFjMDQzYTI5YmY5ZWJkZTU4YTE5Li45ZDZlMDg4MzI5 YWIwZTE1MWEyMWMwODRkZjFlZjhkNGVmNDM5YmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCkBAIC0xMTcsNiAr MTE3LDkgQEAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudCA9 IGZ1bmN0aW9uKGtleWJvYXJkRXZlbnQpCiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0Ll9tYWtlS2V5RnJvbUNvZGVBbmRNb2RpZmllcnMoa2V5Ym9hcmRFdmVudC5rZXlD b2RlLCBtb2RpZmllcnMpOwogfQogCisvKioKKyAqIEBwYXJhbSB7bnVtYmVyPX0gbW9kaWZpZXJz CisgKi8KIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yID0gZnVu Y3Rpb24oa2V5LCBtb2RpZmllcnMpCiB7CiAgICAgcmV0dXJuIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMKaW5kZXggMTQ3NWQxODMxMmNjOWYyOWQzNmY3 ZTI3YmM1OTJiMzc1ZjU5YzE5OC4uN2IwNzk1ZTM0NTUyNWMzNDBmYTU3NDZkYWNmM2FkNTExYTA3 ZjcyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmpl Y3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMK QEAgLTEwMSwzICsxMDEsNSBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZSA9IHsKICAg ICAgICAgcmV0dXJuIGV2ZW50LmRlZmF1bHRQcmV2ZW50ZWQ7CiAgICAgfQogfQorCitXZWJJbnNw ZWN0b3Iubm90aWZpY2F0aW9ucyA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5qcwppbmRleCBlNDdjZjU0ODU4ZTQyMjhmYjY2ZTM5ZDBmZGYyZTg1NDZi ZjhmMDFmLi4wODc1YjA0YTgxMzIwZjlhMjA2ZTI1YTkyMTA1YzhjZWVjZTA4ZTlhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0 UHJvcGVydGllc1NlY3Rpb24uanMKQEAgLTMxLDcgKzMxLDcgQEAKICAqIEBwYXJhbSB7c3RyaW5n PX0gdGl0bGUKICAqIEBwYXJhbSB7c3RyaW5nPX0gc3VidGl0bGUKICAqIEBwYXJhbSB7c3RyaW5n PX0gZW1wdHlQbGFjZWhvbGRlcgotICogQHBhcmFtIHtzdHJpbmc9fSBpZ25vcmVIYXNPd25Qcm9w ZXJ0eQorICogQHBhcmFtIHtib29sZWFuPX0gaWdub3JlSGFzT3duUHJvcGVydHkKICAqIEBwYXJh bSB7QXJyYXkuPFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eT49fSBleHRyYVByb3Bl cnRpZXMKICAqIEBwYXJhbSB7ZnVuY3Rpb24oKT19IHRyZWVFbGVtZW50Q29uc3RydWN0b3IKICAq LwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY29wZUNo YWluU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj b3BlQ2hhaW5TaWRlYmFyUGFuZS5qcwppbmRleCA3NjlmZTEwMDI3NmE5NGNhNDI5M2I1NGViMDc3 ZmExZGZmODdmMDUyLi44YzQwNWI5ZTkwMGE4MDQ2YTU1ZTc0YzYxY2M5OWVjOTk5YjBlZTc2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njb3BlQ2hhaW5T aWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj b3BlQ2hhaW5TaWRlYmFyUGFuZS5qcwpAQCAtMjQsNiArMjQsMTAgQEAKICAqIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAgKi8KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3Iu U2lkZWJhclBhbmV9CisgKi8KIFdlYkluc3BlY3Rvci5TY29wZUNoYWluU2lkZWJhclBhbmUgPSBm dW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLmNhbGwodGhpcywgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTY29wZSBWYXJpYWJsZXMiKSk7CkBAIC03Niw3ICs4MCw3IEBA IFdlYkluc3BlY3Rvci5TY29wZUNoYWluU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgICAgICAgICAgZXh0cmFQcm9wZXJ0aWVzID0gWyBuZXcgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdFByb3BlcnR5KCJ0aGlzIiwgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9t UGF5bG9hZChjYWxsRnJhbWUudGhpcykpIF07CiAgICAgICAgICAgICAgICAgICAgIGlmIChpID09 IDApIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBkZXRhaWxzID0gV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTW9kZWwuZGVidWdnZXJQYXVzZWREZXRhaWxzOwotICAgICAgICAgICAgICAgICAg ICAgICAgdmFyIGV4Y2VwdGlvbiA9IGRldGFpbHMucmVhc29uID09PSBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLkJyZWFrUmVhc29uLkV4Y2VwdGlvbiA/IGRldGFpbHMuYXV4RGF0YSA6IDA7Cisg ICAgICAgICAgICAgICAgICAgICAgICB2YXIgZXhjZXB0aW9uID0gZGV0YWlscy5yZWFzb24gPT09 IFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkJyZWFrUmVhc29uLkV4Y2VwdGlvbiA/IGRldGFp bHMuYXV4RGF0YSA6IDA7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZXhjZXB0aW9uKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXh0cmFQcm9wZXJ0aWVzID0gZXh0cmFQcm9w ZXJ0aWVzIHx8IFtdOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJhUHJvcGVydGll cy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkoIjxleGNlcHRpb24+ IiwgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChleGNlcHRpb24pKSk7CkBA IC0xMTcsNiArMTIxLDEwIEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpblNpZGViYXJQYW5lLnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHJvdG90eXBlOwogCisvKioK KyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 eVRyZWVFbGVtZW50fQorICovCiBXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVFbGVtZW50 ID0gZnVuY3Rpb24ocHJvcGVydHkpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5 VHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBwcm9wZXJ0eSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDYwNzA2NGUxZWExZDYz M2FkZTgxYzk3MWZlM2ZiY2U4ZjRmZTQ3MDUuLjYzNzA3OWRiZThmNTI1MTU3ZTVkNzUxNTkxMzZk MmZlMDI4Y2EzODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0yNCw2ICsyNCwxMCBAQAogICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5QYW5l bH0KKyAqLwogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlv bk1vZGVsKQogewogICAgIFdlYkluc3BlY3Rvci5QYW5lbC5jYWxsKHRoaXMsICJzY3JpcHRzIik7 CkBAIC03OSw3ICs4Myw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihw cmVzZW50YXRpb25Nb2RlbCkKIAogICAgIHRoaXMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24gPSBu ZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRl YWN0aXZhdGUgYWxsIGJyZWFrcG9pbnRzLiIpLCAidG9nZ2xlLWJyZWFrcG9pbnRzIik7CiAgICAg dGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dnbGVkID0gdHJ1ZTsKLSAgICB0aGlzLnRv Z2dsZUJyZWFrcG9pbnRzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dn bGVCcmVha3BvaW50c0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRoaXMudG9nZ2xl QnJlYWtwb2ludHNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dnbGVC cmVha3BvaW50c0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuc2lkZWJhckJ1 dHRvbnNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24uZWxl bWVudCk7CiAKICAgICB0aGlzLmRlYnVnZ2VyU3RhdHVzRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOwpAQCAtMTkwLDEzICsxOTQsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLlBhdXNlT25FeGNlcHRpb25zU3RhdGUgPSB7CiAgICAgUGF1c2VPblVuY2F1Z2h0RXhj ZXB0aW9uczogInVuY2F1Z2h0IgogfTsKIAotV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5CcmVh a1JlYXNvbiA9IHsKLSAgICBET006ICJET00iLAotICAgIEV2ZW50TGlzdGVuZXI6ICJFdmVudExp c3RlbmVyIiwKLSAgICBYSFI6ICJYSFIiLAotICAgIEV4Y2VwdGlvbjogImV4Y2VwdGlvbiIKLX0K LQogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHRvb2xi YXJJdGVtTGFiZWwoKQogICAgIHsKQEAgLTM5MCw3ICszODcsNyBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHsgZG9tYWluOiAocGFyc2Vk VVJMID8gcGFyc2VkVVJMLmhvc3QgOiAiIiksIGZvbGRlck5hbWU6IGZvbGRlck5hbWUsIGRpc3Bs YXlOYW1lOiBkaXNwbGF5TmFtZSB9OwogICAgIH0sCiAKLSAgICBzZXRTY3JpcHRTb3VyY2VJc0Jl aW5nRWRpdGVkOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpCisgICAgX3NldFNj cmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgaW5FZGl0TW9k ZSkKICAgICB7CiAgICAgICAgIHZhciBvcHRpb24gPSB1aVNvdXJjZUNvZGUuX29wdGlvbjsKICAg ICAgICAgaWYgKCFvcHRpb24pCkBAIC00OTIsMjUgKzQ4OSwyNSBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVu dFBhbmVsKHRoaXMpOwogCi0gICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmNhbGxzdGFjay51cGRh dGUoY2FsbEZyYW1lcywgZGV0YWlscyk7CisgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmNhbGxz dGFjay51cGRhdGUoY2FsbEZyYW1lcyk7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmNhbGxz dGFjay5zZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNlbGVjdGVk Q2FsbEZyYW1lOwogCi0gICAgICAgIGlmIChkZXRhaWxzLnJlYXNvbiA9PT0gV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5CcmVha1JlYXNvbi5ET00pIHsKKyAgICAgICAgaWYgKGRldGFpbHMucmVh c29uID09PSBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5CcmVha1JlYXNvbi5ET00pIHsKICAg ICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9pbnRzLmhpZ2hsaWdodEJyZWFr cG9pbnQoZGV0YWlscy5hdXhEYXRhKTsKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZUJy ZWFrcG9pbnRIaXRTdGF0dXNNZXNzYWdlKGVsZW1lbnQpCiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNldFN0YXR1cyhlbGVtZW50KTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9p bnRzLmNyZWF0ZUJyZWFrcG9pbnRIaXRTdGF0dXNNZXNzYWdlKGRldGFpbHMuYXV4RGF0YSwgZGlk Q3JlYXRlQnJlYWtwb2ludEhpdFN0YXR1c01lc3NhZ2UuYmluZCh0aGlzKSk7Ci0gICAgICAgIH0g ZWxzZSBpZiAoZGV0YWlscy5yZWFzb24gPT09IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQnJl YWtSZWFzb24uRXZlbnRMaXN0ZW5lcikgeworICAgICAgICB9IGVsc2UgaWYgKGRldGFpbHMucmVh c29uID09PSBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5CcmVha1JlYXNvbi5FdmVudExpc3Rl bmVyKSB7CiAgICAgICAgICAgICB2YXIgZXZlbnROYW1lID0gZGV0YWlscy5hdXhEYXRhLmV2ZW50 TmFtZTsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmV2ZW50TGlzdGVuZXJCcmVha3Bv aW50cy5oaWdobGlnaHRCcmVha3BvaW50KGRldGFpbHMuYXV4RGF0YS5ldmVudE5hbWUpOwogICAg ICAgICAgICAgdmFyIGV2ZW50TmFtZUZvclVJID0gV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJC cmVha3BvaW50c1NpZGViYXJQYW5lLmV2ZW50TmFtZUZvclVJKGV2ZW50TmFtZSk7CiAgICAgICAg ICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2suc2V0U3RhdHVzKFdlYkluc3BlY3Rvci5V SVN0cmluZygiUGF1c2VkIG9uIGEgXCIlc1wiIEV2ZW50IExpc3RlbmVyLiIsIGV2ZW50TmFtZUZv clVJKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAoZGV0YWlscy5yZWFzb24gPT09IFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwuQnJlYWtSZWFzb24uWEhSKSB7Ci0gICAgICAgICAgICB0aGlzLnNpZGVi YXJQYW5lcy54aHJCcmVha3BvaW50cy5oaWdobGlnaHRCcmVha3BvaW50KGRldGFpbHMuYXV4RGF0 YS5icmVha3BvaW50VVJMKTsKKyAgICAgICAgfSBlbHNlIGlmIChkZXRhaWxzLnJlYXNvbiA9PT0g V2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuQnJlYWtSZWFzb24uWEhSKSB7CisgICAgICAgICAg ICB0aGlzLnNpZGViYXJQYW5lcy54aHJCcmVha3BvaW50cy5oaWdobGlnaHRCcmVha3BvaW50KGRl dGFpbHMuYXV4RGF0YVsiYnJlYWtwb2ludFVSTCJdKTsKICAgICAgICAgICAgIHRoaXMuc2lkZWJh clBhbmVzLmNhbGxzdGFjay5zZXRTdGF0dXMoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZWQg b24gYSBYTUxIdHRwUmVxdWVzdC4iKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAoZGV0YWlscy5yZWFz b24gPT09IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQnJlYWtSZWFzb24uRXhjZXB0aW9uKSB7 CisgICAgICAgIH0gZWxzZSBpZiAoZGV0YWlscy5yZWFzb24gPT09IFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1vZGVsLkJyZWFrUmVhc29uLkV4Y2VwdGlvbikgewogICAgICAgICAgICAgdGhpcy5zaWRl YmFyUGFuZXMuY2FsbHN0YWNrLnNldFN0YXR1cyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNl ZCBvbiBleGNlcHRpb246ICclcycuIiwgZGV0YWlscy5hdXhEYXRhLmRlc2NyaXB0aW9uKSk7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBmdW5jdGlvbiBkaWRHZXRVSUxvY2F0aW9uKHVp TG9jYXRpb24pCkBAIC02NjksNyArNjY2LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICBfY3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHVpU291cmNl Q29kZSkKICAgICB7Ci0gICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdFNvdXJjZUZyYW1lKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLCB1aVNvdXJjZUNv ZGUpOworICAgICAgICB2YXIgZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l RGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwodGhpcywgdWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdmFy IHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUoZGVs ZWdhdGUsIHVpU291cmNlQ29kZSk7CisKICAgICAgICAgdGhpcy5hZGRDaGlsZFZpZXcoc291cmNl RnJhbWUpOwogICAgICAgICBzb3VyY2VGcmFtZS5fdWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2Rl OwogICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFtZUxvYWRlZCwgdGhpcyk7CkBA IC05OTQsNyArOTkzLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIERlYnVnZ2VyQWdlbnQuc3RlcE91dCgpOwogICAgIH0sCiAKLSAgICB0b2dnbGVC cmVha3BvaW50c0NsaWNrZWQ6IGZ1bmN0aW9uKCkKKyAgICBfdG9nZ2xlQnJlYWtwb2ludHNDbGlj a2VkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0 dG9uLnRvZ2dsZWQgPSAhdGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dnbGVkOwogICAg ICAgICBpZiAodGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dnbGVkKSB7CkBAIC0xMTgy LDMgKzExODEsOTcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiB9 CiAKIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAaW1w bGVtZW50cyB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGV9CisgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWx9IHNjcmlwdHNQYW5lbAorICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAqLworV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihzY3JpcHRzUGFuZWwsIHVp U291cmNlQ29kZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5jYWxs KHRoaXMpOworCisgICAgdGhpcy5fc2NyaXB0c1BhbmVsID0gc2NyaXB0c1BhbmVsOworICAgIHRo aXMuX21vZGVsID0gdGhpcy5fc2NyaXB0c1BhbmVsLl9wcmVzZW50YXRpb25Nb2RlbDsKKyAgICB0 aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CisgICAgdGhpcy5fcG9wb3Zlck9iamVj dEdyb3VwID0gInBvcG92ZXIiOworfQorCitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0 ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CisgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0 aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLnJlcXVlc3RD b250ZW50KGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgZGVidWdnaW5nU3VwcG9ydGVkOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9LAorCisgICAgc2V0QnJl YWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKQorICAgIHsK KyAgICAgICAgdGhpcy5fbW9kZWwuc2V0QnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxp bmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7CisKKyAgICAgICAgaWYgKCF0aGlzLl9zY3Jp cHRzUGFuZWwuYnJlYWtwb2ludHNBY3RpdmF0ZWQpCisgICAgICAgICAgICB0aGlzLl9zY3JpcHRz UGFuZWwuX3RvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCgpOworICAgIH0sCisKKyAgICB1cGRhdGVC cmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCisgICAg eworICAgICAgICB0aGlzLl9tb2RlbC51cGRhdGVCcmVha3BvaW50KHRoaXMuX3VpU291cmNlQ29k ZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKKyAgICB9LAorCisgICAgcmVtb3Zl QnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICB7CisgICAgICAgIHRoaXMuX21v ZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKTsKKyAg ICB9LAorCisgICAgZmluZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fbW9kZWwuZmluZEJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VD b2RlLCBsaW5lTnVtYmVyKTsKKyAgICB9LAorCisgICAgY29udGludWVUb0xpbmU6IGZ1bmN0aW9u KGxpbmVOdW1iZXIpCisgICAgeworICAgICAgICB0aGlzLl9tb2RlbC5jb250aW51ZVRvTGluZSh0 aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOworICAgIH0sCisKKyAgICBjYW5FZGl0U2Ny aXB0U291cmNlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbW9kZWwu Y2FuRWRpdFNjcmlwdFNvdXJjZSh0aGlzLl91aVNvdXJjZUNvZGUpOworICAgIH0sCisKKyAgICBz ZXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg dGhpcy5fbW9kZWwuc2V0U2NyaXB0U291cmNlKHRoaXMuX3VpU291cmNlQ29kZSwgdGV4dCwgY2Fs bGJhY2spOworICAgIH0sCisKKyAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5j dGlvbihpbkVkaXRNb2RlKQorICAgIHsKKyAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLl9zZXRT Y3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKHRoaXMuX3VpU291cmNlQ29kZSwgaW5FZGl0TW9kZSk7 CisgICAgfSwKKworICAgIGRlYnVnZ2VyUGF1c2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICByZXR1cm4gV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZDsKKyAgICB9LAorCisg ICAgZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lOiBmdW5jdGlvbihzdHJpbmcsIGNhbGxiYWNr KQorICAgIHsKKyAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLmV2YWx1YXRlSW5TZWxlY3RlZENh bGxGcmFtZShzdHJpbmcsIHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCwgZmFsc2UsIGZhbHNlLCBj YWxsYmFjayk7CisgICAgfSwKKworICAgIHJlbGVhc2VFdmFsdWF0aW9uUmVzdWx0OiBmdW5jdGlv bigpCisgICAgeworICAgICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKHRoaXMu X3BvcG92ZXJPYmplY3RHcm91cCk7CisgICAgfSwKKworICAgIHN1Z2dlc3RlZEZpbGVOYW1lOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgbmFtZXMgPSB0aGlzLl9zY3JpcHRzUGFuZWwu X2ZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHRoaXMuX3VpU291cmNlQ29kZS51cmwp OworICAgICAgICByZXR1cm4gbmFtZXMuZGlzcGxheU5hbWUgfHwgInVudGl0bGVkLmpzIjsKKyAg ICB9Cit9CisKK1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5w cm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0YXR1c0JhckJ1dHRvbi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3RhdHVzQmFyQnV0dG9uLmpzCmluZGV4IGY4ZTcwNzU2ZWVmY2U5NGVlYzk4OGY3ZDlkYmJjMjU0 YTMxYmRhNjcuLjllZjAwNjJkYTA4MWI5M2RkN2JhNTg5NzYwMDZhN2FhNTExYzkyOGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9u LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0 dG9uLmpzCkBAIC0zMSw3ICszMSw3IEBACiAvKioKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3Iu T2JqZWN0fQogICogQGNvbnN0cnVjdG9yCi0gKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+PX0gc3Rh dGVzCisgKiBAcGFyYW0ge251bWJlcj19IHN0YXRlcwogICovCiBXZWJJbnNwZWN0b3IuU3RhdHVz QmFyQnV0dG9uID0gZnVuY3Rpb24odGl0bGUsIGNsYXNzTmFtZSwgc3RhdGVzKQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25z U2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNo RXhwcmVzc2lvbnNTaWRlYmFyUGFuZS5qcwppbmRleCA3YzNkNDMyYWRjYmMxYjg4NmQzMGNiMjk0 Mzg0MjFjMmNmNTI0ZWU2Li5iZTI1YTViNTk2MTA2YzY2YzNjM2FlYjYxODQ4ZGY5YzUxZWUxM2U5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhw cmVzc2lvbnNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZS5qcwpAQCAtMjgsNiArMjgsMTAgQEAK ICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRz IHtXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmV9CisgKi8KIFdlYkluc3BlY3Rvci5XYXRjaEV4cHJl c3Npb25zU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNpZGVi YXJQYW5lLmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXYXRjaCBFeHByZXNzaW9u cyIpKTsKQEAgLTEwNSwxMSArMTA5LDE2IEBAIFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25z U2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9u c1NpZGViYXJQYW5lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2lkZWJhclBh bmUucHJvdG90eXBlOwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYklu c3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbn0KKyAqLwogV2ViSW5zcGVjdG9yLldhdGNo RXhwcmVzc2lvbnNTZWN0aW9uID0gZnVuY3Rpb24oKQogeworICAgIFdlYkluc3BlY3Rvci5PYmpl Y3RQcm9wZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMpOworCiAgICAgdGhpcy5fd2F0Y2hPYmplY3RH cm91cElkID0gIndhdGNoLWdyb3VwIjsKIAotICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbi5jYWxsKHRoaXMpOwogICAgIHRoaXMuZW1wdHlFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5lbXB0eUVsZW1lbnQuY2xhc3NOYW1lID0g ImluZm8iOwogICAgIHRoaXMuZW1wdHlFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJObyBXYXRjaCBFeHByZXNzaW9ucyIpOwpAQCAtMTU5LDcgKzE2OCw3IEBAIFdl Ykluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25zU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgaWYgKHRoaXMuX25ld0V4cHJlc3Npb25BZGRlZCkgewogICAgICAgICAgICAgICAg ICAgICBkZWxldGUgdGhpcy5fbmV3RXhwcmVzc2lvbkFkZGVkOwogCi0gICAgICAgICAgICAgICAg ICAgIHRyZWVFbGVtZW50ID0gdGhpcy5maW5kQWRkZWRUcmVlRWxlbWVudCgpOworICAgICAgICAg ICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLmZpbmRBZGRlZFRyZWVFbGVtZW50KCk7 CiAgICAgICAgICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICAg ICAgICAgIHRyZWVFbGVtZW50LnN0YXJ0RWRpdGluZygpOwogICAgICAgICAgICAgICAgIH0KQEAg LTI4NSw2ICsyOTQsMTAgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLkNv bXBhcmVQcm9wZXJ0aWVzID0gZnVuY3Rpb24ocHJvcGVydHlBLCBwcm8KICAgICAgICAgcmV0dXJu IDE7CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9y Lk9iamVjdFByb3BlcnR5VHJlZUVsZW1lbnR9CisgKi8KIFdlYkluc3BlY3Rvci5XYXRjaEV4cHJl c3Npb25UcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHByb3BlcnR5KQogewogICAgIFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LmNhbGwodGhpcywgcHJvcGVydHkpOwpAQCAtMzI2 LDExICszMzksNyBAQCBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9uVHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogCiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ImVkaXRpbmctc3ViLXBhcnQiKTsKIAotICAgICAgICBXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5n KHRoaXMubmFtZUVsZW1lbnQsIHsKLSAgICAgICAgICAgIGNvbnRleHQ6IGNvbnRleHQsCi0gICAg ICAgICAgICBjb21taXRIYW5kbGVyOiB0aGlzLmVkaXRpbmdDb21taXR0ZWQuYmluZCh0aGlzKSwK LSAgICAgICAgICAgIGNhbmNlbEhhbmRsZXI6IHRoaXMuZWRpdGluZ0NhbmNlbGxlZC5iaW5kKHRo aXMpCi0gICAgICAgIH0pOworICAgICAgICBXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nKHRoaXMu bmFtZUVsZW1lbnQsIG5ldyBXZWJJbnNwZWN0b3IuRWRpdGluZ0NvbmZpZyh0aGlzLmVkaXRpbmdD b21taXR0ZWQuYmluZCh0aGlzKSwgdGhpcy5lZGl0aW5nQ2FuY2VsbGVkLmJpbmQodGhpcyksIGNv bnRleHQpKTsKICAgICB9LAogCiAgICAgZWRpdGluZ0NhbmNlbGxlZDogZnVuY3Rpb24oZWxlbWVu dCwgY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvV29ya2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv V29ya2VyTWFuYWdlci5qcwppbmRleCBmOTQ5MGMwMDNlN2JlZjQyOGI1NDYzZDljYzNkNDBkZjIw MWQ4ODFiLi5mZTIyY2FhYTU3NmM2NDlmMzNkMDJlY2RiNTAyNzEzZmI2MTI0NWY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlck1hbmFnZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpz CkBAIC0yOCw2ICsyOCwxMCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CisgKi8KIFdlYkluc3Bl Y3Rvci5Xb3JrZXJNYW5hZ2VyID0gZnVuY3Rpb24oKQogewogICAgIHRoaXMuX3dvcmtlcklkVG9X aW5kb3cgPSB7fTsKQEAgLTEwMyw3ICsxMDcsNyBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdl ci5wcm90b3R5cGUgPSB7CiAKICAgICBfb3Blbkluc3BlY3RvcldpbmRvdzogZnVuY3Rpb24od29y a2VySWQpCiAgICAgewotICAgICAgICB2YXIgdXJsID0gbG9jYXRpb24uaHJlZiArICImZGVkaWNh dGVkV29ya2VySWQ9IiArIHdvcmtlcklkOworICAgICAgICB2YXIgdXJsID0gd2luZG93LmxvY2F0 aW9uLmhyZWYgKyAiJmRlZGljYXRlZFdvcmtlcklkPSIgKyB3b3JrZXJJZDsKICAgICAgICAgdXJs ID0gdXJsLnJlcGxhY2UoImRvY2tlZD10cnVlJiIsICIiKTsKICAgICAgICAgLy8gU2V0IGxvY2F0 aW9uPTAganVzdCB0byBtYWtlIHN1cmUgdGhlIGZyb250LWVuZCB3aWxsIGJlIG9wZW5lZCBpbiBh IHNlcGFyYXRlIHdpbmRvdywgbm90IGluIG5ldyB0YWIuCiAgICAgICAgIHZhciB3b3JrZXJJbnNw ZWN0b3JXaW5kb3cgPSB3aW5kb3cub3Blbih1cmwsIHVuZGVmaW5lZCwgImxvY2F0aW9uPTAiKTsK QEAgLTEzNCw3ICsxMzgsNyBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2lnbm9yZVdvcmtlckluc3BlY3RvckNsb3NpbmcgPSB0cnVlOwog ICAgICAgICBmb3IgKHZhciB3b3JrZXJJZCBpbiB0aGlzLl93b3JrZXJJZFRvV2luZG93KSB7CiAg ICAgICAgICAgICB0aGlzLl93b3JrZXJJZFRvV2luZG93W3dvcmtlcklkXS5jbG9zZSgpOwotICAg ICAgICAgICAgV29ya2VyQWdlbnQuZGlzY29ubmVjdEZyb21Xb3JrZXIod29ya2VySWQpOworICAg ICAgICAgICAgV29ya2VyQWdlbnQuZGlzY29ubmVjdEZyb21Xb3JrZXIocGFyc2VJbnQod29ya2Vy SWQsIDEwKSk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC0xNTAsNiArMTU0LDEwIEBAIFdlYklu c3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLldvcmtl ck1hbmFnZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90 eXBlOwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGltcGxlbWVudHMge1dvcmtlckFnZW50 LkRpc3BhdGNoZXJ9CisgKi8KIFdlYkluc3BlY3Rvci5EZWRpY2F0ZWRXb3JrZXJNZXNzYWdlRm9y d2FyZGVyID0gZnVuY3Rpb24od29ya2VyTWFuYWdlcikKIHsKICAgICB0aGlzLl93b3JrZXJNYW5h Z2VyID0gd29ya2VyTWFuYWdlcjsKQEAgLTE1OSw4ICsxNjcsOCBAQCBXZWJJbnNwZWN0b3IuRGVk aWNhdGVkV29ya2VyTWVzc2FnZUZvcndhcmRlciA9IGZ1bmN0aW9uKHdvcmtlck1hbmFnZXIpCiBX ZWJJbnNwZWN0b3IuRGVkaWNhdGVkV29ya2VyTWVzc2FnZUZvcndhcmRlci5wcm90b3R5cGUgPSB7 CiAgICAgX3JlY2VpdmVNZXNzYWdlOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZh ciB3b3JrZXJJZCA9IGV2ZW50LmRhdGEud29ya2VySWQ7Ci0gICAgICAgIHdvcmtlcklkID0gcGFy c2VJbnQod29ya2VySWQpOworICAgICAgICB2YXIgd29ya2VySWQgPSBldmVudC5kYXRhWyJ3b3Jr ZXJJZCJdOworICAgICAgICB3b3JrZXJJZCA9IHBhcnNlSW50KHdvcmtlcklkLCAxMCk7CiAgICAg ICAgIHZhciBjb21tYW5kID0gZXZlbnQuZGF0YS5jb21tYW5kOwogICAgICAgICB2YXIgbWVzc2Fn ZSA9IGV2ZW50LmRhdGEubWVzc2FnZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlcnNTaWRlYmFyUGFuZS5qcwppbmRleCA3NzE4NTRkYzFj YzEwMTljMDZhYWEyN2JlZDc1ZTA2ZTU2YzU1MWVhLi4yNDY0ZTdiMzNjYTEzN2VhNTFjNTk1Yzg2 NDQyOGY0ODg2OTg0MWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dvcmtlcnNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1dvcmtlcnNTaWRlYmFyUGFuZS5qcwpAQCAtMjgsNiArMjgsMTAgQEAKICAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtX ZWJJbnNwZWN0b3IuU2lkZWJhclBhbmV9CisgKi8KIFdlYkluc3BlY3Rvci5Xb3JrZXJzU2lkZWJh clBhbmUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLmNhbGwo dGhpcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXb3JrZXJzIikpOwpAQCAtNjcsNyArNzEsNyBA QCBXZWJJbnNwZWN0b3IuV29ya2Vyc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICByZW1v dmVXb3JrZXI6IGZ1bmN0aW9uKGlkKQogICAgIHsKICAgICAgICAgaWYgKGlkIGluIHRoaXMuX3dv cmtlcnMpIHsKLSAgICAgICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lLnJlbW92ZUNoaWxkKHRoaXMu X3RyZWVPdXRsaW5lLmZpbmRUcmVlRWxlbWVudCh0aGlzLl93b3JrZXJzW2lkXSkpOworICAgICAg ICAgICAgdGhpcy5fdHJlZU91dGxpbmUucmVtb3ZlQ2hpbGQodGhpcy5fdHJlZU91dGxpbmUuZ2V0 Q2FjaGVkVHJlZUVsZW1lbnQodGhpcy5fd29ya2Vyc1tpZF0pKTsKICAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl93b3JrZXJzW2lkXTsKICAgICAgICAgfQogICAgIH0sCkBAIC05NCw2ICs5OCw5IEBA IFdlYkluc3BlY3Rvci5Xb3JrZXJzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiBXZWJJbnNw ZWN0b3IuV29ya2Vyc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuU2lkZWJhclBhbmUucHJvdG90eXBlOwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCiBX ZWJJbnNwZWN0b3IuV29ya2VyID0gZnVuY3Rpb24oaWQsIHVybCwgc2hhcmVkKQogewogICAgIHRo aXMuaWQgPSBpZDsKQEAgLTEwMSw4ICsxMDgsMTAgQEAgV2ViSW5zcGVjdG9yLldvcmtlciA9IGZ1 bmN0aW9uKGlkLCB1cmwsIHNoYXJlZCkKICAgICB0aGlzLnNoYXJlZCA9IHNoYXJlZDsKIH0KIAot Ci0KKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNpZGVi YXJQYW5lfQorICovCiBXZWJJbnNwZWN0b3IuV29ya2VyTGlzdFNpZGViYXJQYW5lID0gZnVuY3Rp b24od29ya2VyTWFuYWdlcikKIHsKICAgICBXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUuY2FsbCh0 aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtlciBpbnNwZWN0b3JzIikpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCmluZGV4IGZjOTI0YTAz MWRlZjk5NGY0MDBjOWMxYTk5MTk1NDRjMjg2Y2U3OTcuLjliZmViMDk3OTQ2YTFmNzY2MzMxYTVk NWQwYmIwZWM5NmZkN2NmY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvZXh0ZXJucy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2V4dGVybnMuanMKQEAgLTQ0LDYgKzQ0LDE1IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7fQog ICovCiBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSA9IGZ1bmN0aW9uKHVybCwgbGlua1Rl eHQsIGNsYXNzZXMsIGlzRXh0ZXJuYWwsIHRvb2x0aXBUZXh0KSB7fQogCisvKioKKyAqIEBwYXJh bSB7c3RyaW5nfSB1cmwKKyAqIEBwYXJhbSB7c3RyaW5nPX0gbGlua1RleHQKKyAqIEBwYXJhbSB7 c3RyaW5nPX0gY2xhc3NlcworICogQHBhcmFtIHtib29sZWFuPX0gaXNFeHRlcm5hbAorICogQHBh cmFtIHtzdHJpbmc9fSB0b29sdGlwVGV4dAorICovCitXZWJJbnNwZWN0b3IubGlua2lmeVVSTCA9 IGZ1bmN0aW9uKHVybCwgbGlua1RleHQsIGNsYXNzZXMsIGlzRXh0ZXJuYWwsIHRvb2x0aXBUZXh0 KSB7fQorCiAvKiogQHBhcmFtIHtzdHJpbmd9IHVybCAqLwogV2ViSW5zcGVjdG9yLmxpbmtpZnlT dHJpbmdBc0ZyYWdtZW50ID0gZnVuY3Rpb24odXJsKSB7fQogLyoqIEBwYXJhbSB7c3RyaW5nfSB1 cmwgKi8KQEAgLTE0OCwxOSArMTU3LDcgQEAgV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVU aXRsZXMgPSBmdW5jdGlvbigpCiBXZWJJbnNwZWN0b3IucGFuZWxzID0ge307CiAKIC8qKgotICog QGNvbnN0cnVjdG9yCi0gKi8KLVdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigp Ci17Ci0gICAgLyoqIEBwYXJhbSB7Li4uKn0gdmFyX2FyZ3MgKi8gICAgIAotICAgIHRoaXMuZXZh bHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lID0gZnVuY3Rpb24odmFyX2FyZ3MpIHt9Ci0gICAgLyoq IEBwYXJhbSB7Li4uKn0gdmFyX2FyZ3MgKi8gICAgIAotICAgIHRoaXMuZ2V0U2VsZWN0ZWRDYWxs RnJhbWVWYXJpYWJsZXMgPSBmdW5jdGlvbih2YXJfYXJncykge30KLSAgICB0aGlzLnBhdXNlZCA9 IGZhbHNlOwotfQotCi0vKioKLSAqIEB0eXBlIHs/V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0K KyAqIEB0eXBlIHtXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsfQogICovCiBXZWJJbnNwZWN0b3Iu cGFuZWxzLnNjcmlwdHMgPSBudWxsOwogCkBAIC0yMjIsMyArMjE5LDExIEBAIERPTUFwcGxpY2F0 aW9uQ2FjaGUucHJvdG90eXBlLlVQREFURVJFQURZID0gNDsKIERPTUFwcGxpY2F0aW9uQ2FjaGUu cHJvdG90eXBlLk9CU09MRVRFID0gNTsKIAogV2ViSW5zcGVjdG9yLm9wZW5SZXF1ZXN0SW5OZXR3 b3JrUGFuZWwgPSBmdW5jdGlvbihyZXF1ZXN0KSB7fQorCit2YXIgSW5qZWN0ZWRGYWtlV29ya2Vy ID0gZnVuY3Rpb24oKSB7fQorCitXZWJJbnNwZWN0b3IucXVlcnlQYXJhbXNPYmplY3QgPSB7fQor CitXZWJJbnNwZWN0b3IuRXZlbnRzID0geworICAgIEluc3BlY3RvckNsb3Npbmc6ICJJbnNwZWN0 b3JDbG9zaW5nIgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwppbmRleCA1NTZhMmY1YmRkNDhkMTBkZjUxMzA1MzEzZjhmOGViNjk1OTRlY2Vk Li4yY2E4ZTJjYWY3ODhkOTBhNTEyMTk3ZDc2ZjE5MWUzOWEwODAyOTlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNDE5LDggKzQx OSw2IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiB7CiAgICAgSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmxvYWRlZCgpOwogCi0gICAgdGhpcy5ub3RpZmljYXRpb25zID0g bmV3IFdlYkluc3BlY3Rvci5PYmplY3QoKTsKLQogICAgIHZhciBwbGF0Zm9ybSA9IFdlYkluc3Bl Y3Rvci5wbGF0Zm9ybTsKICAgICBkb2N1bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoInBsYXRmb3Jt LSIgKyBwbGF0Zm9ybSk7CiAgICAgdmFyIGZsYXZvciA9IFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZs YXZvcjsK