53009 2011-01-24 07:14:22 -0800 Web Inspector: extract dispatch API from network manager. 2011-06-09 13:08:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 15849 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 338997 0 pfeldman 2011-01-24 07:14:22 -0800 Patch to follow. 338999 1 79922 pfeldman 2011-01-24 07:19:13 -0800 Created attachment 79922 [PATCH] Proposed change 339001 2 pfeldman 2011-01-24 07:28:28 -0800 Committed r76519: <http://trac.webkit.org/changeset/76519> 79922 2011-01-24 07:19:13 -0800 2011-01-24 07:25:11 -0800 [PATCH] Proposed change dispatch_api text/plain 27356 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZTU2MTFhLi4zZTU1ZDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTEtMDEtMjQgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZXh0cmFjdCBkaXNwYXRjaCBBUEkgZnJvbSBuZXR3b3JrIG1hbmFnZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzAwOQorCisgICAgICAg ICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0 d29ya01hbmFnZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3Rv dHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90 eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdl ci5wcm90b3R5cGUuX3Byb2Nlc3NDYWNoZWRSZXNvdXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtEaXNwYXRjaGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlz cGF0Y2hlci5wcm90b3R5cGUuX3VwZGF0ZVJlc291cmNlV2l0aFJlcXVlc3QpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5fdXBkYXRlUmVzb3VyY2VX aXRoUmVzcG9uc2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnBy b3RvdHlwZS5fdXBkYXRlUmVzb3VyY2VXaXRoQ2FjaGVkUmVzb3VyY2UpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5pZGVudGlmaWVyRm9ySW5pdGlh bFJlcXVlc3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3Rv dHlwZS53aWxsU2VuZFJlcXVlc3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyLnByb3RvdHlwZS5kaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5kaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5 Q2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlw ZS5kaWRDb21taXRMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtE aXNwYXRjaGVyLnByb3RvdHlwZS5kaWRDcmVhdGVXZWJTb2NrZXQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5fYXBwZW5kUmVkaXJlY3QpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5fc3RhcnRSZXNv dXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBl Ll91cGRhdGVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNo ZXIucHJvdG90eXBlLl9maW5pc2hSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0 d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl9hZGRGcmFtZXNSZWN1cnNpdmVseSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl9kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnBy b3RvdHlwZS5fY3JlYXRlUmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9p bm5lclJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUucmVz ZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS51 bmJpbmRSZXNvdXJjZVVSTCk6CisKIDIwMTEtMDEtMjQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2 aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IGZvciByNzY0OTcu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK aW5kZXggZGM0MjNkMS4uYTJhYzIxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtOTMxLDcgKzkzMSw2IEBACiAJCTQxRjA2MTc1 MEY1RjAwQUMwMEEwN0VBQyAvKiBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDFGMDYxNzMwRjVGMDBB QzAwQTA3RUFDIC8qIEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5jcHAgKi87IH07CiAJCTQx RjA2MThFMEY1RjA2OTgwMEEwN0VBQyAvKiBDb25zb2xlTWVzc2FnZS5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDFGMDYxOEMwRjVGMDY5ODAwQTA3RUFD IC8qIENvbnNvbGVNZXNzYWdlLmggKi87IH07CiAJCTQxRjA2MThGMEY1RjA2OTgwMEEwN0VBQyAv KiBDb25zb2xlTWVzc2FnZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA0MUYwNjE4RDBGNUYwNjk4MDBBMDdFQUMgLyogQ29uc29sZU1lc3NhZ2UuY3Bw ICovOyB9OwotCQlGM0Y1Q0YxMzEyRUQ4MUIzMDA4NEM1NjkgLyogSW5zcGVjdG9yRGF0YWJhc2VJ bnN0cnVtZW50YXRpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEYzRjVDRjEyMTJFRDgxQjMwMDg0QzU2OSAvKiBJbnNwZWN0b3JEYXRhYmFzZUluc3Ry dW1lbnRhdGlvbi5oICovOyB9OwogCQk0MUYwNjIxNDBGNUYxOTI2MDBBMDdFQUMgLyogSW5zcGVj dG9yRGF0YWJhc2VSZXNvdXJjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNDFGMDYyMTIwRjVGMTkyNjAwQTA3RUFDIC8qIEluc3BlY3RvckRhdGFiYXNl UmVzb3VyY2UuaCAqLzsgfTsKIAkJNDFGMDYyMTUwRjVGMTkyNjAwQTA3RUFDIC8qIEluc3BlY3Rv ckRhdGFiYXNlUmVzb3VyY2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNDFGMDYyMTMwRjVGMTkyNjAwQTA3RUFDIC8qIEluc3BlY3RvckRhdGFiYXNl UmVzb3VyY2UuY3BwICovOyB9OwogCQk0MUYwNjZFNDBGNjRCQ0Y2MDBBMDdFQUMgLyogU2NyaXB0 T2JqZWN0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0 MUYwNjZFMjBGNjRCQ0Y2MDBBMDdFQUMgLyogU2NyaXB0T2JqZWN0LmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTU2MTQsNyArNTYxMyw2IEBACiAJ CUVERUM5ODAzMEFFRDdFMTcwMDU5MTM3RiAvKiBXZWJDb3JlUHJlZml4LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFREVDOTgwMjBBRUQ3RTE3MDA1OTEz N0YgLyogV2ViQ29yZVByZWZpeC5oICovOyB9OwogCQlGMzMzNUJGODEyRTA3REMzMDBEMzMwMTEg LyogSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEYzMzM1QkY2MTJFMDdEQzMwMEQzMzAxMSAvKiBJbnNwZWN0b3JD b25zb2xlQWdlbnQuY3BwICovOyB9OwogCQlGMzMzNUJGOTEyRTA3REMzMDBEMzMwMTEgLyogSW5z cGVjdG9yQ29uc29sZUFnZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBGMzMzNUJGNzEyRTA3REMzMDBEMzMwMTEgLyogSW5zcGVjdG9yQ29uc29sZUFn ZW50LmggKi87IH07Ci0JCUYzRjVDRjExMTJFRDgxQTgwMDg0QzU2OSAvKiBJbnNwZWN0b3JDb25z b2xlSW5zdHJ1bWVudGF0aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBGM0Y1Q0YxMDEyRUQ4MUE4MDA4NEM1NjkgLyogSW5zcGVjdG9yQ29uc29sZUlu c3RydW1lbnRhdGlvbi5oICovOyB9OwogCQlGMzNGMDI4MjEyMDk0N0YyMDBFNTc0M0EgLyogU2Ny aXB0UHJvZmlsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBGMzNGMDI4MTEyMDk0N0YyMDBFNTc0M0EgLyogU2NyaXB0UHJvZmlsZS5jcHAgKi87IH07 CiAJCUYzM0YwNTNEMTIwQjBEQTUwMEU1NzQzQSAvKiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEYzM0YwNTNC MTIwQjBEQTUwMEU1NzQzQSAvKiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCAqLzsgfTsKIAkJ RjMzRjA1M0UxMjBCMERBNTAwRTU3NDNBIC8qIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEYzM0YwNTNDMTIwQjBE QTUwMEU1NzQzQSAvKiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggKi87IH07CkBAIC01NjMyLDYg KzU2MzAsOCBAQAogCQlGM0Q0NjE0OTExNjFENTMyMDBDQTBEMDkgLyogSlNFcnJvckhhbmRsZXIu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEYzRDQ2MTQ3 MTE2MUQ1MzIwMENBMEQwOSAvKiBKU0Vycm9ySGFuZGxlci5oICovOyB9OwogCQlGM0Q0QzQ3ODEy RTA3NjYzMDAzREExNTAgLyogSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjNENEM0NzYxMkUwNzY2 MzAwM0RBMTUwIC8qIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmNwcCAqLzsgfTsKIAkJ RjNENEM0NzkxMkUwNzY2MzAwM0RBMTUwIC8qIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50 LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGM0Q0QzQ3 NzEyRTA3NjYzMDAzREExNTAgLyogSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuaCAqLzsg fTsKKwkJRjNGNUNGMTExMkVEODFBODAwODRDNTY5IC8qIEluc3BlY3RvckNvbnNvbGVJbnN0cnVt ZW50YXRpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEYzRjVDRjEwMTJFRDgxQTgwMDg0QzU2OSAvKiBJbnNwZWN0b3JDb25zb2xlSW5zdHJ1bWVudGF0 aW9uLmggKi87IH07CisJCUYzRjVDRjEzMTJFRDgxQjMwMDg0QzU2OSAvKiBJbnNwZWN0b3JEYXRh YmFzZUluc3RydW1lbnRhdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gRjNGNUNGMTIxMkVEODFCMzAwODRDNTY5IC8qIEluc3BlY3RvckRhdGFiYXNl SW5zdHJ1bWVudGF0aW9uLmggKi87IH07CiAJCUY0RUFGNEFFMTBDNzQyQjEwMDkxMDBEMyAvKiBP cGVuVHlwZVNhbml0aXplci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBGNEVBRjRBQzEwQzc0MkIxMDA5MTAwRDMgLyogT3BlblR5cGVTYW5pdGl6ZXIu Y3BwICovOyB9OwogCQlGNEVBRjRBRjEwQzc0MkIxMDA5MTAwRDMgLyogT3BlblR5cGVTYW5pdGl6 ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0RUFG NEFEMTBDNzQyQjEwMDkxMDBEMyAvKiBPcGVuVHlwZVNhbml0aXplci5oICovOyB9OwogCQlGNTVC M0RBRDEyNTFGMTJEMDAzRUYyNjkgLyogQmFzZVRleHRJbnB1dFR5cGUuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjU1QjNENzkxMjUxRjEyRDAwM0VG MjY5IC8qIEJhc2VUZXh0SW5wdXRUeXBlLmNwcCAqLzsgfTsKQEAgLTgxMTEsNyArODExMSw2IEBA CiAJCTdBQTM2NUVEMTJFNzI2NTQwMERDQTI0MiAvKiBJbnNwZWN0b3JSdW50aW1lQWdlbnQuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSW5zcGVjdG9yUnVudGltZUFn ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0FCMEIxQkUxMjExQTYyMjAw QTc2OTQwIC8qIEluc3BlY3RvckRhdGFiYXNlQWdlbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTdBQjBCMUJGMTIxMUE2MjIwMEE3Njk0MCAvKiBJbnNwZWN0b3JE YXRhYmFzZUFnZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluc3BlY3Rv ckRhdGFiYXNlQWdlbnQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJRjNGNUNGMTIx MkVEODFCMzAwODRDNTY5IC8qIEluc3BlY3RvckRhdGFiYXNlSW5zdHJ1bWVudGF0aW9uLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluc3BlY3RvckRhdGFiYXNlSW5zdHJ1bWVu dGF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdBREU3MjI1MTBDQkJCOUIw MDZCM0IzQSAvKiBDb250ZXh0TWVudVByb3ZpZGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IENvbnRleHRNZW51UHJvdmlkZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJN0FGMTFBNTkxMkU3Mjc0OTAwNjFGMjNDIC8qIEluc3BlY3RvclJ1bnRpbWVBZ2VudC5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBJbnNwZWN0b3JSdW50aW1lQWdlbnQu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0FGRDRBOEExMTMxQzI3NjAwMzVCODgz IC8qIFNjcmlwdEJyZWFrcG9pbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g U2NyaXB0QnJlYWtwb2ludC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTE5Nzks NyArMTE5NzgsNiBAQAogCQlFREVDOTgwMjBBRUQ3RTE3MDA1OTEzN0YgLyogV2ViQ29yZVByZWZp eC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViQ29yZVByZWZpeC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDQ7IHVzZXNUYWJzID0gMDsgfTsKIAkJ RjMzMzVCRjYxMkUwN0RDMzAwRDMzMDExIC8qIEluc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJbnNwZWN0b3JDb25zb2xlQWdlbnQu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGMzMzNUJGNzEyRTA3REMzMDBEMzMw MTEgLyogSW5zcGVjdG9yQ29uc29sZUFnZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IEluc3BlY3RvckNvbnNvbGVBZ2VudC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwotCQlGM0Y1Q0YxMDEyRUQ4MUE4MDA4NEM1NjkgLyogSW5zcGVjdG9yQ29uc29sZUluc3RydW1l bnRhdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBJbnNwZWN0b3JDb25z b2xlSW5zdHJ1bWVudGF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUYzM0Yw MjgxMTIwOTQ3RjIwMEU1NzQzQSAvKiBTY3JpcHRQcm9maWxlLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcmlwdFByb2ZpbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlGMzNGMDUzQjEyMEIwREE1MDBFNTc0M0EgLyogSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjMzRjA1 M0MxMjBCMERBNTAwRTU3NDNBIC8qIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTE5OTcsNiArMTE5OTUsOCBAQAogCQlGM0Q0NjE0NzEx NjFENTMyMDBDQTBEMDkgLyogSlNFcnJvckhhbmRsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gSlNFcnJvckhhbmRsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJRjNENEM0NzYxMkUwNzY2MzAwM0RBMTUwIC8qIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFn ZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEluc3BlY3RvckJy b3dzZXJEZWJ1Z2dlckFnZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjNE NEM0NzcxMkUwNzY2MzAwM0RBMTUwIC8qIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50Lmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dl ckFnZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUYzRjVDRjEwMTJFRDgxQTgw MDg0QzU2OSAvKiBJbnNwZWN0b3JDb25zb2xlSW5zdHJ1bWVudGF0aW9uLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluc3BlY3RvckNvbnNvbGVJbnN0cnVtZW50YXRpb24uaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRjNGNUNGMTIxMkVEODFCMzAwODRDNTY5IC8q IEluc3BlY3RvckRhdGFiYXNlSW5zdHJ1bWVudGF0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEluc3BlY3RvckRhdGFiYXNlSW5zdHJ1bWVudGF0aW9uLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY0RUFGNEFDMTBDNzQyQjEwMDkxMDBEMyAvKiBPcGVuVHlw ZVNhbml0aXplci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBPcGVu VHlwZVNhbml0aXplci5jcHA7IHBhdGggPSBvcGVudHlwZS9PcGVuVHlwZVNhbml0aXplci5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY0RUFGNEFEMTBDNzQyQjEwMDkxMDBEMyAv KiBPcGVuVHlwZVNhbml0aXplci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBP cGVuVHlwZVNhbml0aXplci5oOyBwYXRoID0gb3BlbnR5cGUvT3BlblR5cGVTYW5pdGl6ZXIuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjUyM0QyM0IwMkRFNDM5NjAxODYzNUNBIC8q IEhUTUxEb2N1bWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gMzA7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBIVE1MRG9jdW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4IGVkNDMwOWUuLjY4 ZjAzYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrTWFuYWdlci5qcwpAQCAtMzEsODEgKzMxLDk5IEBACiBXZWJJbnNwZWN0b3IuTmV0d29y a01hbmFnZXIgPSBmdW5jdGlvbihyZXNvdXJjZVRyZWVNb2RlbCkKIHsKICAgICBXZWJJbnNwZWN0 b3IuT2JqZWN0LmNhbGwodGhpcyk7Ci0KLSAgICB0aGlzLl9pbmZsaWdodFJlc291cmNlcyA9IHt9 OwogICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsID0gcmVzb3VyY2VUcmVlTW9kZWw7Ci0gICAg dGhpcy5fbGFzdElkZW50aWZpZXJGb3JDYWNoZWRSZXNvdXJjZSA9IDA7Ci0gICAgSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIoIk5ldHdvcmsiLCB0aGlzKTsKKyAgICB0 aGlzLl9kaXNwYXRjaGVyID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlcihyZXNv dXJjZVRyZWVNb2RlbCwgdGhpcyk7CisgICAgSW5zcGVjdG9yQmFja2VuZC5jYWNoZWRSZXNvdXJj ZXModGhpcy5fcHJvY2Vzc0NhY2hlZFJlc291cmNlcy5iaW5kKHRoaXMpKTsKIH0KIAotV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnJlcXVlc3RDb250ZW50ID0gZnVuY3Rpb24ocmVzb3VyY2Us IGJhc2U2NEVuY29kZSwgY2FsbGJhY2spCi17Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5yZXNvdXJj ZUNvbnRlbnQocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQsIHJlc291cmNlLnVybCwgYmFzZTY0RW5j b2RlLCBjYWxsYmFjayk7Ci19Ci0KLVdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci51cGRhdGVS ZXNvdXJjZVdpdGhSZXF1ZXN0ID0gZnVuY3Rpb24ocmVzb3VyY2UsIHJlcXVlc3QpCi17Ci0gICAg cmVzb3VyY2UucmVxdWVzdE1ldGhvZCA9IHJlcXVlc3QuaHR0cE1ldGhvZDsKLSAgICByZXNvdXJj ZS5yZXF1ZXN0SGVhZGVycyA9IHJlcXVlc3QuaHR0cEhlYWRlckZpZWxkczsKLSAgICByZXNvdXJj ZS5yZXF1ZXN0Rm9ybURhdGEgPSByZXF1ZXN0LnJlcXVlc3RGb3JtRGF0YTsKK1dlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzID0geworICAgIFJlc291cmNlU3RhcnRlZDogIlJl c291cmNlU3RhcnRlZCIsCisgICAgUmVzb3VyY2VVcGRhdGVkOiAiUmVzb3VyY2VVcGRhdGVkIiwK KyAgICBSZXNvdXJjZUZpbmlzaGVkOiAiUmVzb3VyY2VGaW5pc2hlZCIsCisgICAgTWFpblJlc291 cmNlQ29tbWl0TG9hZDogIk1haW5SZXNvdXJjZUNvbW1pdExvYWQiCiB9CiAKLVdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci51cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25zZSA9IGZ1bmN0aW9uKHJl c291cmNlLCByZXNwb25zZSkKLXsKLSAgICBpZiAocmVzb3VyY2UuaXNOdWxsKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICByZXNvdXJjZS5taW1lVHlwZSA9IHJlc3BvbnNlLm1pbWVUeXBlOwotICAg IHJlc291cmNlLmV4cGVjdGVkQ29udGVudExlbmd0aCA9IHJlc3BvbnNlLmV4cGVjdGVkQ29udGVu dExlbmd0aDsKLSAgICByZXNvdXJjZS50ZXh0RW5jb2RpbmdOYW1lID0gcmVzcG9uc2UudGV4dEVu Y29kaW5nTmFtZTsKLSAgICByZXNvdXJjZS5zdWdnZXN0ZWRGaWxlbmFtZSA9IHJlc3BvbnNlLnN1 Z2dlc3RlZEZpbGVuYW1lOwotICAgIHJlc291cmNlLnN0YXR1c0NvZGUgPSByZXNwb25zZS5odHRw U3RhdHVzQ29kZTsKLSAgICByZXNvdXJjZS5zdGF0dXNUZXh0ID0gcmVzcG9uc2UuaHR0cFN0YXR1 c1RleHQ7CitXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlID0geworICAgIHJl c2V0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdv cmsuY2xlYXIoKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwucmVzZXQoKTsKKyAg ICAgICAgSW5zcGVjdG9yQmFja2VuZC5jYWNoZWRSZXNvdXJjZXModGhpcy5fcHJvY2Vzc0NhY2hl ZFJlc291cmNlcy5iaW5kKHRoaXMpKTsKKyAgICB9LAogCi0gICAgcmVzb3VyY2UucmVzcG9uc2VI ZWFkZXJzID0gcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkczsKLSAgICByZXNvdXJjZS5jb25uZWN0 aW9uUmV1c2VkID0gcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZDsKLSAgICByZXNvdXJjZS5jb25u ZWN0aW9uSUQgPSByZXNwb25zZS5jb25uZWN0aW9uSUQ7CisgICAgcmVxdWVzdENvbnRlbnQ6IGZ1 bmN0aW9uKHJlc291cmNlLCBiYXNlNjRFbmNvZGUsIGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg SW5zcGVjdG9yQmFja2VuZC5yZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQs IHJlc291cmNlLnVybCwgYmFzZTY0RW5jb2RlLCBjYWxsYmFjayk7CisgICAgfSwKIAotICAgIGlm IChyZXNwb25zZS53YXNDYWNoZWQpCi0gICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHRydWU7Ci0g ICAgZWxzZQotICAgICAgICByZXNvdXJjZS50aW1pbmcgPSByZXNwb25zZS50aW1pbmc7Ci0KLSAg ICBpZiAocmVzcG9uc2UubG9hZEluZm8pIHsKLSAgICAgICAgaWYgKHJlc3BvbnNlLmxvYWRJbmZv Lmh0dHBTdGF0dXNDb2RlKQotICAgICAgICAgICAgcmVzb3VyY2Uuc3RhdHVzQ29kZSA9IHJlc3Bv bnNlLmxvYWRJbmZvLmh0dHBTdGF0dXNDb2RlOwotICAgICAgICBpZiAocmVzcG9uc2UubG9hZElu Zm8uaHR0cFN0YXR1c1RleHQpCi0gICAgICAgICAgICByZXNvdXJjZS5zdGF0dXNUZXh0ID0gcmVz cG9uc2UubG9hZEluZm8uaHR0cFN0YXR1c1RleHQ7Ci0gICAgICAgIHJlc291cmNlLnJlcXVlc3RI ZWFkZXJzID0gcmVzcG9uc2UubG9hZEluZm8ucmVxdWVzdEhlYWRlcnM7Ci0gICAgICAgIHJlc291 cmNlLnJlc3BvbnNlSGVhZGVycyA9IHJlc3BvbnNlLmxvYWRJbmZvLnJlc3BvbnNlSGVhZGVyczsK KyAgICBfcHJvY2Vzc0NhY2hlZFJlc291cmNlczogZnVuY3Rpb24obWFpbkZyYW1lUGF5bG9hZCkK KyAgICB7CisgICAgICAgIHZhciBtYWluUmVzb3VyY2UgPSB0aGlzLl9kaXNwYXRjaGVyLl9hZGRG cmFtZXNSZWN1cnNpdmVseShtYWluRnJhbWVQYXlsb2FkKTsKKyAgICAgICAgV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZSA9IG1haW5SZXNvdXJjZTsKKyAgICAgICAgbWFpblJlc291cmNlLmlzTWFp blJlc291cmNlID0gdHJ1ZTsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdl ci51cGRhdGVSZXNvdXJjZVdpdGhDYWNoZWRSZXNvdXJjZSA9IGZ1bmN0aW9uKHJlc291cmNlLCBj YWNoZWRSZXNvdXJjZSkKK1dlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CisKK1dlYkluc3BlY3Rvci5O ZXR3b3JrRGlzcGF0Y2hlciA9IGZ1bmN0aW9uKHJlc291cmNlVHJlZU1vZGVsLCBtYW5hZ2VyKQog ewotICAgIHJlc291cmNlLnR5cGUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZVtjYWNoZWRS ZXNvdXJjZS50eXBlXTsKLSAgICByZXNvdXJjZS5yZXNvdXJjZVNpemUgPSBjYWNoZWRSZXNvdXJj ZS5lbmNvZGVkU2l6ZTsKLSAgICBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIudXBkYXRlUmVz b3VyY2VXaXRoUmVzcG9uc2UocmVzb3VyY2UsIGNhY2hlZFJlc291cmNlLnJlc3BvbnNlKTsKKyAg ICB0aGlzLl9tYW5hZ2VyID0gbWFuYWdlcjsKKyAgICB0aGlzLl9pbmZsaWdodFJlc291cmNlcyA9 IHt9OworICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsID0gcmVzb3VyY2VUcmVlTW9kZWw7Cisg ICAgdGhpcy5fbGFzdElkZW50aWZpZXJGb3JDYWNoZWRSZXNvdXJjZSA9IDA7CisgICAgSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIoIk5ldHdvcmsiLCB0aGlzKTsKIH0K IAotV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMgPSB7Ci0gICAgUmVzb3Vy Y2VTdGFydGVkOiAiUmVzb3VyY2VTdGFydGVkIiwKLSAgICBSZXNvdXJjZVVwZGF0ZWQ6ICJSZXNv dXJjZVVwZGF0ZWQiLAotICAgIFJlc291cmNlRmluaXNoZWQ6ICJSZXNvdXJjZUZpbmlzaGVkIiwK LSAgICBNYWluUmVzb3VyY2VDb21taXRMb2FkOiAiTWFpblJlc291cmNlQ29tbWl0TG9hZCIKLX0K K1dlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CisgICAgX3VwZGF0 ZVJlc291cmNlV2l0aFJlcXVlc3Q6IGZ1bmN0aW9uKHJlc291cmNlLCByZXF1ZXN0KQorICAgIHsK KyAgICAgICAgcmVzb3VyY2UucmVxdWVzdE1ldGhvZCA9IHJlcXVlc3QuaHR0cE1ldGhvZDsKKyAg ICAgICAgcmVzb3VyY2UucmVxdWVzdEhlYWRlcnMgPSByZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHM7 CisgICAgICAgIHJlc291cmNlLnJlcXVlc3RGb3JtRGF0YSA9IHJlcXVlc3QucmVxdWVzdEZvcm1E YXRhOworICAgIH0sCiAKLVdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7 Ci0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICBfdXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2U6 IGZ1bmN0aW9uKHJlc291cmNlLCByZXNwb25zZSkKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rv ci5wYW5lbHMubmV0d29yay5jbGVhcigpOwotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJl c291cmNlcy5jbGVhcigpOwotICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5yZWxvYWRD YWNoZWRSZXNvdXJjZXMoKTsKKyAgICAgICAgaWYgKHJlc291cmNlLmlzTnVsbCkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICByZXNvdXJjZS5taW1lVHlwZSA9IHJlc3BvbnNlLm1pbWVU eXBlOworICAgICAgICByZXNvdXJjZS5leHBlY3RlZENvbnRlbnRMZW5ndGggPSByZXNwb25zZS5l eHBlY3RlZENvbnRlbnRMZW5ndGg7CisgICAgICAgIHJlc291cmNlLnRleHRFbmNvZGluZ05hbWUg PSByZXNwb25zZS50ZXh0RW5jb2RpbmdOYW1lOworICAgICAgICByZXNvdXJjZS5zdWdnZXN0ZWRG aWxlbmFtZSA9IHJlc3BvbnNlLnN1Z2dlc3RlZEZpbGVuYW1lOworICAgICAgICByZXNvdXJjZS5z dGF0dXNDb2RlID0gcmVzcG9uc2UuaHR0cFN0YXR1c0NvZGU7CisgICAgICAgIHJlc291cmNlLnN0 YXR1c1RleHQgPSByZXNwb25zZS5odHRwU3RhdHVzVGV4dDsKKworICAgICAgICByZXNvdXJjZS5y ZXNwb25zZUhlYWRlcnMgPSByZXNwb25zZS5odHRwSGVhZGVyRmllbGRzOworICAgICAgICByZXNv dXJjZS5jb25uZWN0aW9uUmV1c2VkID0gcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZDsKKyAgICAg ICAgcmVzb3VyY2UuY29ubmVjdGlvbklEID0gcmVzcG9uc2UuY29ubmVjdGlvbklEOworCisgICAg ICAgIGlmIChyZXNwb25zZS53YXNDYWNoZWQpCisgICAgICAgICAgICByZXNvdXJjZS5jYWNoZWQg PSB0cnVlOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXNvdXJjZS50aW1pbmcgPSByZXNw b25zZS50aW1pbmc7CisKKyAgICAgICAgaWYgKHJlc3BvbnNlLmxvYWRJbmZvKSB7CisgICAgICAg ICAgICBpZiAocmVzcG9uc2UubG9hZEluZm8uaHR0cFN0YXR1c0NvZGUpCisgICAgICAgICAgICAg ICAgcmVzb3VyY2Uuc3RhdHVzQ29kZSA9IHJlc3BvbnNlLmxvYWRJbmZvLmh0dHBTdGF0dXNDb2Rl OworICAgICAgICAgICAgaWYgKHJlc3BvbnNlLmxvYWRJbmZvLmh0dHBTdGF0dXNUZXh0KQorICAg ICAgICAgICAgICAgIHJlc291cmNlLnN0YXR1c1RleHQgPSByZXNwb25zZS5sb2FkSW5mby5odHRw U3RhdHVzVGV4dDsKKyAgICAgICAgICAgIHJlc291cmNlLnJlcXVlc3RIZWFkZXJzID0gcmVzcG9u c2UubG9hZEluZm8ucmVxdWVzdEhlYWRlcnM7CisgICAgICAgICAgICByZXNvdXJjZS5yZXNwb25z ZUhlYWRlcnMgPSByZXNwb25zZS5sb2FkSW5mby5yZXNwb25zZUhlYWRlcnM7CisgICAgICAgIH0K KyAgICB9LAorCisgICAgX3VwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlOiBmdW5jdGlv bihyZXNvdXJjZSwgY2FjaGVkUmVzb3VyY2UpCisgICAgeworICAgICAgICByZXNvdXJjZS50eXBl ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGVbY2FjaGVkUmVzb3VyY2UudHlwZV07CisgICAg ICAgIHJlc291cmNlLnJlc291cmNlU2l6ZSA9IGNhY2hlZFJlc291cmNlLmVuY29kZWRTaXplOwor ICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25zZShyZXNvdXJjZSwgY2FjaGVk UmVzb3VyY2UucmVzcG9uc2UpOwogICAgIH0sCiAKICAgICBpZGVudGlmaWVyRm9ySW5pdGlhbFJl cXVlc3Q6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCwgbG9hZGVyLCBjYWxsU3RhY2spCiAgICAg ewotICAgICAgICB0aGlzLl9zdGFydFJlc291cmNlKHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmNy ZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIHVybCwgbG9hZGVyLCBjYWxsU3RhY2spKTsKKyAgICAg ICAgdGhpcy5fc3RhcnRSZXNvdXJjZSh0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCB1 cmwsIGxvYWRlciwgY2FsbFN0YWNrKSk7CiAgICAgfSwKIAogICAgIHdpbGxTZW5kUmVxdWVzdDog ZnVuY3Rpb24oaWRlbnRpZmllciwgdGltZSwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSkKQEAg LTEyMiw3ICsxNDAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlID0g ewogICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9hcHBlbmRSZWRpcmVjdChyZXNvdXJjZS5p ZGVudGlmaWVyLCB0aW1lLCByZXF1ZXN0LnVybCk7CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJ bnNwZWN0b3IuTmV0d29ya01hbmFnZXIudXBkYXRlUmVzb3VyY2VXaXRoUmVxdWVzdChyZXNvdXJj ZSwgcmVxdWVzdCk7CisgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aFJlcXVlc3QocmVz b3VyY2UsIHJlcXVlc3QpOwogICAgICAgICByZXNvdXJjZS5zdGFydFRpbWUgPSB0aW1lOwogCiAg ICAgICAgIGlmIChpc1JlZGlyZWN0KQpAQCAtMTUwLDcgKzE2OCw3IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJlc291cmNlLnJlc3BvbnNlUmVj ZWl2ZWRUaW1lID0gdGltZTsKICAgICAgICAgcmVzb3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5S ZXNvdXJjZS5UeXBlW3Jlc291cmNlVHlwZV07CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLnVwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlKHJlc291cmNlLCByZXNwb25zZSk7 CisgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlKHJlc291cmNlLCByZXNw b25zZSk7CiAKICAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2UocmVzb3VyY2UpOwogICAgICAg ICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUocmVzb3VyY2UubG9h ZGVyLmZyYW1lSWQsIHJlc291cmNlKTsKQEAgLTE5MCw4ICsyMDgsOCBAQCBXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgZGlkTG9hZFJlc291cmNlRnJvbU1l bW9yeUNhY2hlOiBmdW5jdGlvbih0aW1lLCBjYWNoZWRSZXNvdXJjZSkKICAgICB7Ci0gICAgICAg IHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmNyZWF0ZVJlc291cmNlKCJj YWNoZWQ6IiArICsrdGhpcy5fbGFzdElkZW50aWZpZXJGb3JDYWNoZWRSZXNvdXJjZSwgY2FjaGVk UmVzb3VyY2UudXJsLCBjYWNoZWRSZXNvdXJjZS5sb2FkZXIpOwotICAgICAgICBXZWJJbnNwZWN0 b3IuTmV0d29ya01hbmFnZXIudXBkYXRlUmVzb3VyY2VXaXRoQ2FjaGVkUmVzb3VyY2UocmVzb3Vy Y2UsIGNhY2hlZFJlc291cmNlKTsKKyAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRl UmVzb3VyY2UoImNhY2hlZDoiICsgKyt0aGlzLl9sYXN0SWRlbnRpZmllckZvckNhY2hlZFJlc291 cmNlLCBjYWNoZWRSZXNvdXJjZS51cmwsIGNhY2hlZFJlc291cmNlLmxvYWRlcik7CisgICAgICAg IHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBjYWNoZWRS ZXNvdXJjZSk7CiAgICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHRydWU7CiAgICAgICAgIHJlc291 cmNlLnJlcXVlc3RNZXRob2QgPSAiR0VUIjsKICAgICAgICAgdGhpcy5fc3RhcnRSZXNvdXJjZShy ZXNvdXJjZSk7CkBAIC0yMjQsMTQgKzI0MiwxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFn ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKG1haW5SZXNvdXJjZSkgewogICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UgPSBtYWluUmVzb3VyY2U7CiAgICAg ICAgICAgICAgICAgbWFpblJlc291cmNlLmlzTWFpblJlc291cmNlID0gdHJ1ZTsKLSAgICAgICAg ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTmV0d29y a01hbmFnZXIuRXZlbnRUeXBlcy5NYWluUmVzb3VyY2VDb21taXRMb2FkLCBtYWluUmVzb3VyY2Up OworICAgICAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5NYWluUmVzb3VyY2VDb21taXRMb2FkLCBt YWluUmVzb3VyY2UpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwKIAogICAgIGRp ZENyZWF0ZVdlYlNvY2tldDogZnVuY3Rpb24oaWRlbnRpZmllciwgcmVxdWVzdFVSTCkKICAgICB7 Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmNyZWF0ZVJl c291cmNlKGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpOworICAgICAgICB2YXIgcmVzb3VyY2UgPSB0 aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCByZXF1ZXN0VVJMKTsKICAgICAgICAgcmVz b3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLldlYlNvY2tldDsKICAgICAg ICAgdGhpcy5fc3RhcnRSZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfSwKQEAgLTI4Niw3ICszMDQs NyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAv LyBTY3JpcHQgZGVidWdnZXIgc2hvdWxkIGRvIGV4cGxpY2l0IGxhdGUgYmluZGluZyBvbiBpdHMg b3duLgogICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC51bmJpbmRSZXNvdXJjZVVSTChv cmlnaW5hbFJlc291cmNlKTsKICAgICAgICAgCi0gICAgICAgIHZhciBuZXdSZXNvdXJjZSA9IHRo aXMuX3Jlc291cmNlVHJlZU1vZGVsLmNyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIHJlZGlyZWN0 VVJMLCBvcmlnaW5hbFJlc291cmNlLmxvYWRlciwgb3JpZ2luYWxSZXNvdXJjZS5zdGFja1RyYWNl KTsKKyAgICAgICAgdmFyIG5ld1Jlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoaWRlbnRp ZmllciwgcmVkaXJlY3RVUkwsIG9yaWdpbmFsUmVzb3VyY2UubG9hZGVyLCBvcmlnaW5hbFJlc291 cmNlLnN0YWNrVHJhY2UpOwogICAgICAgICBuZXdSZXNvdXJjZS5yZWRpcmVjdHMgPSBwcmV2aW91 c1JlZGlyZWN0cy5jb25jYXQob3JpZ2luYWxSZXNvdXJjZSk7CiAgICAgICAgIHJldHVybiBuZXdS ZXNvdXJjZTsKICAgICB9LApAQCAtMjk0LDIxICszMTIsNjMgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICBfc3RhcnRSZXNvdXJjZTogZnVuY3Rpb24ocmVz b3VyY2UpCiAgICAgewogICAgICAgICB0aGlzLl9pbmZsaWdodFJlc291cmNlc1tyZXNvdXJjZS5p ZGVudGlmaWVyXSA9IHJlc291cmNlOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVN0YXJ0 ZWQsIHJlc291cmNlKTsKKyAgICAgICAgdGhpcy5fZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlU3RhcnRlZCwgcmVz b3VyY2UpOwogICAgIH0sCiAKICAgICBfdXBkYXRlUmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNl KQogICAgIHsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VVcGRhdGVkLCByZXNvdXJjZSk7 CisgICAgICAgIHRoaXMuX2Rpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTmV0 d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVVwZGF0ZWQsIHJlc291cmNlKTsKICAgICB9 LAogCiAgICAgX2ZpbmlzaFJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSwgZmluaXNoVGltZSkK ICAgICB7CiAgICAgICAgIHJlc291cmNlLmVuZFRpbWUgPSBmaW5pc2hUaW1lOwogICAgICAgICBy ZXNvdXJjZS5maW5pc2hlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlRmlu aXNoZWQsIHJlc291cmNlKTsKKyAgICAgICAgdGhpcy5fZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlRmluaXNoZWQs IHJlc291cmNlKTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzW3Jlc291 cmNlLmlkZW50aWZpZXJdOworICAgIH0sCisKKyAgICBfYWRkRnJhbWVzUmVjdXJzaXZlbHk6IGZ1 bmN0aW9uKGZyYW1lUGF5bG9hZCkKKyAgICB7CisgICAgICAgIHZhciBmcmFtZVJlc291cmNlID0g dGhpcy5fY3JlYXRlUmVzb3VyY2UobnVsbCwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnVybCwgZnJh bWVQYXlsb2FkLnJlc291cmNlLmxvYWRlcik7CisgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNl V2l0aFJlcXVlc3QoZnJhbWVSZXNvdXJjZSwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnJlcXVlc3Qp OworICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25zZShmcmFtZVJlc291cmNl LCBmcmFtZVBheWxvYWQucmVzb3VyY2UucmVzcG9uc2UpOworICAgICAgICBmcmFtZVJlc291cmNl LnR5cGUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZVsiRG9jdW1lbnQiXTsKKyAgICAgICAg ZnJhbWVSZXNvdXJjZS5maW5pc2hlZCA9IHRydWU7CisKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VU cmVlTW9kZWwuYWRkT3JVcGRhdGVGcmFtZShmcmFtZVBheWxvYWQpOworICAgICAgICB0aGlzLl9y ZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUoZnJhbWVQYXlsb2FkLmlkLCBmcmFt ZVJlc291cmNlKTsKKworICAgICAgICBmb3IgKHZhciBpID0gMDsgZnJhbWVQYXlsb2FkLmNoaWxk cmVuICYmIGkgPCBmcmFtZVBheWxvYWQuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICB0aGlzLl9hZGRGcmFtZXNSZWN1cnNpdmVseShmcmFtZVBheWxvYWQuY2hpbGRyZW5baV0pOwor CisgICAgICAgIGlmICghZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlcykKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGZyYW1lUGF5bG9hZC5zdWJyZXNv dXJjZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBjYWNoZWRSZXNvdXJjZSA9IGZy YW1lUGF5bG9hZC5zdWJyZXNvdXJjZXNbaV07CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0 aGlzLl9jcmVhdGVSZXNvdXJjZShudWxsLCBjYWNoZWRSZXNvdXJjZS51cmwsIGNhY2hlZFJlc291 cmNlLmxvYWRlcik7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhDYWNoZWRS ZXNvdXJjZShyZXNvdXJjZSwgY2FjaGVkUmVzb3VyY2UpOworICAgICAgICAgICAgcmVzb3VyY2Uu ZmluaXNoZWQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwuYWRk UmVzb3VyY2VUb0ZyYW1lKGZyYW1lUGF5bG9hZC5pZCwgcmVzb3VyY2UpOworICAgICAgICB9Cisg ICAgICAgIHJldHVybiBmcmFtZVJlc291cmNlOworICAgIH0sCisKKyAgICBfZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzOiBmdW5jdGlvbihldmVudFR5cGUsIHJlc291cmNlKQorICAgIHsKKyAgICAg ICAgdGhpcy5fbWFuYWdlci5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoZXZlbnRUeXBlLCByZXNv dXJjZSk7CisgICAgfSwKKworICAgIF9jcmVhdGVSZXNvdXJjZTogZnVuY3Rpb24oaWRlbnRpZmll ciwgdXJsLCBsb2FkZXIsIHN0YWNrVHJhY2UpCisgICAgeworICAgICAgICB2YXIgcmVzb3VyY2Ug PSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKGlkZW50aWZpZXIsIHVybCk7CisgICAgICAgIHJl c291cmNlLmxvYWRlciA9IGxvYWRlcjsKKyAgICAgICAgaWYgKGxvYWRlcikgeworICAgICAgICAg ICAgcmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBsb2FkZXIudXJsOworICAgICAgICAgICAgdGhpcy5f cmVzb3VyY2VUcmVlTW9kZWwuYmluZFJlc291cmNlVVJMKHJlc291cmNlKTsKKyAgICAgICAgfQor ICAgICAgICByZXNvdXJjZS5zdGFja1RyYWNlID0gc3RhY2tUcmFjZTsKKyAgICAgICAgcmV0dXJu IHJlc291cmNlOwogICAgIH0KIH0KLQotV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDAwYzFmYjku LjkxNDc2ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZS5qcwpAQCAtNzE5LDcgKzcxOSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENhbGxiYWNrcy5sZW5ndGgg PSAwOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQ7CiAgICAgICAg IH0KLSAgICAgICAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnJlcXVlc3RDb250ZW50KHRo aXMsIHRoaXMuX2NvbnRlbnRFbmNvZGVkLCBvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsK KyAgICAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLnJlcXVlc3RDb250ZW50KHRoaXMs IHRoaXMuX2NvbnRlbnRFbmNvZGVkLCBvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VUcmVlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVHJlZU1vZGVsLmpzCmluZGV4IGIxMTRiOTQuLjBhYzYzZjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2Rl bC5qcwpAQCAtMzEsMTYgKzMxLDE3IEBACiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bCA9IGZ1bmN0aW9uKCkKIHsKLSAgICB0aGlzLnJlbG9hZENhY2hlZFJlc291cmNlcygpOworICAg IHRoaXMucmVzZXQoKTsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3Rv dHlwZSA9IHsKLSAgICByZWxvYWRDYWNoZWRSZXNvdXJjZXM6IGZ1bmN0aW9uKCkKKyAgICByZXNl dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzQnlVUkwgPSB7fTsK ICAgICAgICAgdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkID0ge307CiAgICAgICAgIHRoaXMuX3N1 YmZyYW1lcyA9IHt9OwotICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmNhY2hlZFJlc291cmNlcyh0 aGlzLl9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzLmJpbmQodGhpcykpOworICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLnBhbmVscykKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3Vy Y2VzLmNsZWFyKCk7CiAgICAgfSwKIAogICAgIGFkZE9yVXBkYXRlRnJhbWU6IGZ1bmN0aW9uKGZy YW1lKQpAQCAtMjA4LDUyICsyMDksNSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgZGVsZXRlIHRoaXMuX3Jlc291cmNl c0J5VVJMW3Jlc291cmNlLnVybF07Ci0gICAgfSwKLQotICAgIF9wcm9jZXNzQ2FjaGVkUmVzb3Vy Y2VzOiBmdW5jdGlvbihtYWluRnJhbWVQYXlsb2FkKQotICAgIHsKLSAgICAgICAgdmFyIG1haW5S ZXNvdXJjZSA9IHRoaXMuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KG1haW5GcmFtZVBheWxvYWQpOwot ICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlID0gbWFpblJlc291cmNlOwotICAgICAg ICBtYWluUmVzb3VyY2UuaXNNYWluUmVzb3VyY2UgPSB0cnVlOwotICAgIH0sCi0KLSAgICBfYWRk RnJhbWVzUmVjdXJzaXZlbHk6IGZ1bmN0aW9uKGZyYW1lUGF5bG9hZCkKLSAgICB7Ci0gICAgICAg IHZhciBmcmFtZVJlc291cmNlID0gdGhpcy5jcmVhdGVSZXNvdXJjZShudWxsLCBmcmFtZVBheWxv YWQucmVzb3VyY2UudXJsLCBmcmFtZVBheWxvYWQucmVzb3VyY2UubG9hZGVyKTsKLSAgICAgICAg V2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnVwZGF0ZVJlc291cmNlV2l0aFJlcXVlc3QoZnJh bWVSZXNvdXJjZSwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnJlcXVlc3QpOwotICAgICAgICBXZWJJ bnNwZWN0b3IuTmV0d29ya01hbmFnZXIudXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UoZnJhbWVS ZXNvdXJjZSwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnJlc3BvbnNlKTsKLSAgICAgICAgZnJhbWVS ZXNvdXJjZS50eXBlID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGVbIkRvY3VtZW50Il07Ci0g ICAgICAgIGZyYW1lUmVzb3VyY2UuZmluaXNoZWQgPSB0cnVlOwotCi0gICAgICAgIHRoaXMuYWRk T3JVcGRhdGVGcmFtZShmcmFtZVBheWxvYWQpOwotICAgICAgICB0aGlzLmFkZFJlc291cmNlVG9G cmFtZShmcmFtZVBheWxvYWQuaWQsIGZyYW1lUmVzb3VyY2UpOwotCi0gICAgICAgIGZvciAodmFy IGkgPSAwOyBmcmFtZVBheWxvYWQuY2hpbGRyZW4gJiYgaSA8IGZyYW1lUGF5bG9hZC5jaGlsZHJl bi5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KGZy YW1lUGF5bG9hZC5jaGlsZHJlbltpXSk7Ci0KLSAgICAgICAgaWYgKCFmcmFtZVBheWxvYWQuc3Vi cmVzb3VyY2VzKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAg ICAgdmFyIGNhY2hlZFJlc291cmNlID0gZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlc1tpXTsKLSAg ICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuY3JlYXRlUmVzb3VyY2UobnVsbCwgY2FjaGVk UmVzb3VyY2UudXJsLCBjYWNoZWRSZXNvdXJjZS5sb2FkZXIpOwotICAgICAgICAgICAgV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnVwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJl c291cmNlLCBjYWNoZWRSZXNvdXJjZSk7Ci0gICAgICAgICAgICByZXNvdXJjZS5maW5pc2hlZCA9 IHRydWU7Ci0gICAgICAgICAgICB0aGlzLmFkZFJlc291cmNlVG9GcmFtZShmcmFtZVBheWxvYWQu aWQsIHJlc291cmNlKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZnJhbWVSZXNvdXJjZTsK LSAgICB9LAotCi0gICAgY3JlYXRlUmVzb3VyY2U6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCwg bG9hZGVyLCBzdGFja1RyYWNlKQotICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gbmV3IFdl Ykluc3BlY3Rvci5SZXNvdXJjZShpZGVudGlmaWVyLCB1cmwpOwotICAgICAgICByZXNvdXJjZS5s b2FkZXIgPSBsb2FkZXI7Ci0gICAgICAgIGlmIChsb2FkZXIpIHsKLSAgICAgICAgICAgIHJlc291 cmNlLmRvY3VtZW50VVJMID0gbG9hZGVyLnVybDsKLSAgICAgICAgICAgIHRoaXMuYmluZFJlc291 cmNlVVJMKHJlc291cmNlKTsKLSAgICAgICAgfQotICAgICAgICByZXNvdXJjZS5zdGFja1RyYWNl ID0gc3RhY2tUcmFjZTsKLQotICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAgfQogfQo=