73411 2011-11-30 01:34:57 -0800 Web Inspector: do not report worker-related events unless inspector agent is enabled. 2011-11-30 02:14:28 -0800 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 511510 0 pfeldman 2011-11-30 01:34:57 -0800 Backend should not generate messages until the client requests that they are sent. 511515 1 117140 pfeldman 2011-11-30 01:38:30 -0800 Created attachment 117140 Patch 511540 2 117140 yurys 2011-11-30 02:07:14 -0800 Comment on attachment 117140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117140&action=review > Source/WebCore/inspector/front-end/WorkerManager.js:248 > + disconnectedFromWorker: function() You should rename DedicatedWorkerMessageForwarder to WorkerMessageHandler as now it handles shared worker messages as well. 511547 3 pfeldman 2011-11-30 02:14:28 -0800 Committed r101469: <http://trac.webkit.org/changeset/101469> 117140 2011-11-30 01:38:30 -0800 2011-11-30 02:11:27 -0800 Patch bug-73411-20111130133827.patch text/plain 18582 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JkMjgwZjgwMjI2MjM2 ZTNhOTkwYjdkNDdjZmE0ZDMyMjAzYmRhMy4uZWFlZTkxMTc5MTZjMDM4YWJmYjI1NzNlMjFlMTc1 YWEwOTIzODEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDExLTExLTMwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBkbyBub3QgcmVwb3J0IHdvcmtlci1yZWxhdGVkIGV2ZW50cyB1bmxlc3MgaW5zcGVjdG9yIGFn ZW50IGlzIGVuYWJsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03MzQxMQorCisgICAgICAgIEJhY2tlbmQgc2hvdWxkIG5vdCBnZW5lcmF0ZSBtZXNz YWdlcyB1bnRpbCB0aGUgY2xpZW50IHJlcXVlc3RzIHRoYXQgdGhleSBhcmUgc2VudC4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckFnZW50OjplbmFibGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y QWdlbnQ6OmRpc2FibGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6OnBvc3RX b3JrZXJOb3RpZmljYXRpb25Ub0Zyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckFnZW50OjpkaWRDcmVhdGVXb3JrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdl bnQ6OmRpZERlc3Ryb3lXb3JrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6 OmRldmVsb3BlckV4dHJhc0VuYWJsZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JB Z2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmVuYWJsZWQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2Fj aGVJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk Q29tbWl0TG9hZEltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRPcGVuRGF0YWJhc2VJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkVXNlRE9NU3RvcmFnZUltcGwpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDcmVhdGVXZWJTb2NrZXRJbXBsKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvUGFnZUNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ29uc29sZUFn ZW50OjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1dvcmtlck1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdl ci5wcm90b3R5cGUuX3dvcmtlckluc3BlY3RvckNsb3NpbmcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlck1hbmFnZXIucHJvdG90eXBlLl9kaXNjb25uZWN0ZWRGcm9tV29ya2VyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWRpY2F0ZWRXb3JrZXJNZXNzYWdlRm9yd2FyZGVyLnByb3Rv dHlwZS5kaXNwYXRjaE1lc3NhZ2VGcm9tV29ya2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWRpY2F0ZWRXb3JrZXJNZXNzYWdlRm9yd2FyZGVyLnByb3RvdHlwZS5kaXNjb25uZWN0ZWRGcm9t V29ya2VyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwog MjAxMS0xMS0zMCAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAKICAg ICAgICAgRmlsdGVyT3BlcmF0aW9uKiBzaG91bGQgc3RheSBpbiByZW5kZXJpbmcvc3R5bGUsIGJl Y2F1c2UgaXQgaXMgZGlyZWN0bHkgcmVmZXJlbmNlZCBmcm9tIFJlbmRlclN0eWxlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IDI2MzA2MWFkYzFkNTkwYjYzMjZlNWE0MGU2YTQ3MTE4N2Q4 NzJmMDEuLmMxOGEyNzhjZjcwMmFlN2YyZTU1MzUxMDllMzNkYjM0MzM1ODk0YzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMzAgIFBhdmVsIEZl bGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRv IG5vdCByZXBvcnQgd29ya2VyLXJlbGF0ZWQgZXZlbnRzIHVubGVzcyBpbnNwZWN0b3IgYWdlbnQg aXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTczNDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJE ZXZUb29sc0FnZW50OjpkaXNjb25uZWN0RXZlbnRBc1RleHQpOgorCiAyMDExLTExLTI5ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggY2xh bmcgYnVpbGQgYnkgdXNpbmcgcmF3IHBvaW50ZXJzIGluc3RlYWQgb2Ygc3RhdGljIE93blB0cnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCAxNWU3MWY5MDUyNzQw Y2Y1ZWRmMGRjNDM3ZjRkYjdkOGQ0MTkzMmFmLi41YWI5MTA4NjdmZTc0NDc4OWRiNTFhMzQ0ODM5 NTgwNzJiNjI1ZDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBA IC01LDEyICs1LDE3IEBACiAgICAgICAgICJoaWRkZW4iOiB0cnVlLAogICAgICAgICAidHlwZXMi OiBbXSwKICAgICAgICAgImNvbW1hbmRzIjogWwotICAgICAgICBdLAotICAgICAgICAiZXZlbnRz IjogWwogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImRpc2Nvbm5lY3RG cm9tV29ya2VyIgorICAgICAgICAgICAgICAgICJuYW1lIjogImVuYWJsZSIsCisgICAgICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaW5zcGVjdG9yIGRvbWFpbiBub3RpZmljYXRp b25zLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5h bWUiOiAiZGlzYWJsZSIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVz IGluc3BlY3RvciBkb21haW4gbm90aWZpY2F0aW9ucy4iCisgICAgICAgICAgICB9CisgICAgICAg IF0sCisgICAgICAgICJldmVudHMiOiBbCisgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg Im5hbWUiOiAiZXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZCIsCiAgICAgICAgICAgICAgICAgInBh cmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGVzdENhbGxJZCIs ICJ0eXBlIjogImludGVnZXIiIH0sCkBAIC0yMjQ4LDYgKzIyNTMsOSBAQAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogIndvcmtlcklkIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtZXNzYWdlIiwgInR5cGUiOiAib2JqZWN0IiB9CiAg ICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICAibmFtZSI6ICJkaXNjb25uZWN0ZWRGcm9tV29ya2VyIgogICAgICAgICAgICAgfQog ICAgICAgICBdCiAgICAgfV0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdl bnQuY3BwCmluZGV4IDViZGY4YzYxZWViYmMwZDAzNWU3ZTQ2MGEwNWMyODFmNDM0MTVlZWUuLjMz NTJkOWQxNjhhNWFmYjc0MTA2MTBhMDAyYjc1NWMwZTA1YjUzNDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcApAQCAtNDIsNiArNDIsNyBAQAogI2luY2x1 ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5o IgogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgorI2luY2x1ZGUgIkluc3Bl Y3RvclN0YXRlLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yVmFsdWVzLmgiCiAjaW5jbHVkZSAiSW5z cGVjdG9yV29ya2VyUmVzb3VyY2UuaCIKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgi CkBAIC01Nyw5ICs1OCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotc3RhdGljIGNvbnN0IGNoYXIgc2NyaXB0c1BhbmVsTmFtZVtdID0gInNjcmlwdHMi Owotc3RhdGljIGNvbnN0IGNoYXIgY29uc29sZVBhbmVsTmFtZVtdID0gImNvbnNvbGUiOwotc3Rh dGljIGNvbnN0IGNoYXIgcHJvZmlsZXNQYW5lbE5hbWVbXSA9ICJwcm9maWxlcyI7CituYW1lc3Bh Y2UgSW5zcGVjdG9yQWdlbnRTdGF0ZSB7CitzdGF0aWMgY29uc3QgY2hhciBpbnNwZWN0b3JBZ2Vu dEVuYWJsZWRbXSA9ICJpbnNwZWN0b3JBZ2VudEVuYWJsZWQiOworfQogCiBJbnNwZWN0b3JBZ2Vu dDo6SW5zcGVjdG9yQWdlbnQoUGFnZSogcGFnZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmpl Y3RlZFNjcmlwdE1hbmFnZXIsIEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2Vu dHMsIEluc3BlY3RvclN0YXRlKiBzdGF0ZSkKICAgICA6IEluc3BlY3RvckJhc2VBZ2VudDxJbnNw ZWN0b3JBZ2VudD4oIkluc3BlY3RvciIsIGluc3RydW1lbnRpbmdBZ2VudHMsIHN0YXRlKQpAQCAt OTcsMTQgKzk4LDYgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9y RnJvbnRlbmQqIGluc3BlY3RvckZyb250ZW5kKQogewogICAgIG1fZnJvbnRlbmQgPSBpbnNwZWN0 b3JGcm9udGVuZDsKIAotI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKSAmJiBFTkFCTEUo V09SS0VSUykKLSAgICBXb3JrZXJzTWFwOjppdGVyYXRvciB3b3JrZXJzRW5kID0gbV93b3JrZXJz LmVuZCgpOwotICAgIGZvciAoV29ya2Vyc01hcDo6aXRlcmF0b3IgaXQgPSBtX3dvcmtlcnMuYmVn aW4oKTsgaXQgIT0gd29ya2Vyc0VuZDsgKytpdCkgewotICAgICAgICBJbnNwZWN0b3JXb3JrZXJS ZXNvdXJjZSogd29ya2VyID0gaXQtPnNlY29uZC5nZXQoKTsKLSAgICAgICAgbV9mcm9udGVuZC0+ aW5zcGVjdG9yKCktPmRpZENyZWF0ZVdvcmtlcih3b3JrZXItPmlkKCksIHdvcmtlci0+dXJsKCks IHdvcmtlci0+aXNTaGFyZWRXb3JrZXIoKSk7Ci0gICAgfQotI2VuZGlmCi0KICAgICAvLyBEaXNw YXRjaCBwZW5kaW5nIGZyb250ZW5kIGNvbW1hbmRzCiAgICAgaXNzdWVFdmFsdWF0ZUZvclRlc3RD b21tYW5kcygpOwogfQpAQCAtMTE2LDYgKzEwOSw4IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmNs ZWFyRnJvbnRlbmQoKQogICAgIG1fZnJvbnRlbmQgPSAwOwogICAgIG1fZGlkQ29tbWl0TG9hZEZp cmVkID0gZmFsc2U7CiAgICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmRpc2NhcmRJbmplY3Rl ZFNjcmlwdHMoKTsKKyAgICBFcnJvclN0cmluZyBlcnJvcjsKKyAgICBkaXNhYmxlKCZlcnJvcik7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmRpZENvbW1pdExvYWQoKQpAQCAtMTI3LDYgKzEy MiwyNCBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpkaWRDb21taXRMb2FkKCkKICNlbmRpZgogfQog Cit2b2lkIEluc3BlY3RvckFnZW50OjplbmFibGUoRXJyb3JTdHJpbmcqKQoreworICAgIG1fc3Rh dGUtPnNldEJvb2xlYW4oSW5zcGVjdG9yQWdlbnRTdGF0ZTo6aW5zcGVjdG9yQWdlbnRFbmFibGVk LCB0cnVlKTsKKworI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKSAmJiBFTkFCTEUoV09S S0VSUykKKyAgICBXb3JrZXJzTWFwOjppdGVyYXRvciB3b3JrZXJzRW5kID0gbV93b3JrZXJzLmVu ZCgpOworICAgIGZvciAoV29ya2Vyc01hcDo6aXRlcmF0b3IgaXQgPSBtX3dvcmtlcnMuYmVnaW4o KTsgaXQgIT0gd29ya2Vyc0VuZDsgKytpdCkgeworICAgICAgICBJbnNwZWN0b3JXb3JrZXJSZXNv dXJjZSogd29ya2VyID0gaXQtPnNlY29uZC5nZXQoKTsKKyAgICAgICAgbV9mcm9udGVuZC0+aW5z cGVjdG9yKCktPmRpZENyZWF0ZVdvcmtlcih3b3JrZXItPmlkKCksIHdvcmtlci0+dXJsKCksIHdv cmtlci0+aXNTaGFyZWRXb3JrZXIoKSk7CisgICAgfQorI2VuZGlmCit9CisKK3ZvaWQgSW5zcGVj dG9yQWdlbnQ6OmRpc2FibGUoRXJyb3JTdHJpbmcqKQoreworICAgIG1fc3RhdGUtPnNldEJvb2xl YW4oSW5zcGVjdG9yQWdlbnRTdGF0ZTo6aW5zcGVjdG9yQWdlbnRFbmFibGVkLCBmYWxzZSk7Cit9 CisKIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmRvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkKCkKIHsK ICAgICBtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+aW5qZWN0ZWRTY3JpcHRIb3N0KCktPmNsZWFy SW5zcGVjdGVkTm9kZXMoKTsKQEAgLTE2Nyw4ICsxODAsOSBAQCBwcml2YXRlOgogCiB2b2lkIElu c3BlY3RvckFnZW50Ojpwb3N0V29ya2VyTm90aWZpY2F0aW9uVG9Gcm9udGVuZChjb25zdCBJbnNw ZWN0b3JXb3JrZXJSZXNvdXJjZSYgd29ya2VyLCBJbnNwZWN0b3JBZ2VudDo6V29ya2VyQWN0aW9u IGFjdGlvbikKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgaWYgKCFtX2Zyb250ZW5kIHx8 ICFtX3N0YXRlLT5nZXRCb29sZWFuKEluc3BlY3RvckFnZW50U3RhdGU6Omluc3BlY3RvckFnZW50 RW5hYmxlZCkpCiAgICAgICAgIHJldHVybjsKKwogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVH R0VSKQogICAgIHN3aXRjaCAoYWN0aW9uKSB7CiAgICAgY2FzZSBJbnNwZWN0b3JBZ2VudDo6V29y a2VyQ3JlYXRlZDoKQEAgLTE4MywyNCArMTk3LDI0IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnBv c3RXb3JrZXJOb3RpZmljYXRpb25Ub0Zyb250ZW5kKGNvbnN0IEluc3BlY3RvcldvcmtlclJlc291 CiAKIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmRpZENyZWF0ZVdvcmtlcihpbnRwdHJfdCBpZCwgY29u c3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNTaGFyZWRXb3JrZXIpCiB7Ci0gICAgaWYgKCFlbmFibGVk KCkpCisgICAgaWYgKCFkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsK IAogICAgIFJlZlB0cjxJbnNwZWN0b3JXb3JrZXJSZXNvdXJjZT4gd29ya2VyUmVzb3VyY2UoSW5z cGVjdG9yV29ya2VyUmVzb3VyY2U6OmNyZWF0ZShpZCwgdXJsLCBpc1NoYXJlZFdvcmtlcikpOwog ICAgIG1fd29ya2Vycy5zZXQoaWQsIHdvcmtlclJlc291cmNlKTsKLSAgICBpZiAobV9pbnNwZWN0 ZWRQYWdlICYmIG1fZnJvbnRlbmQpCisgICAgaWYgKG1faW5zcGVjdGVkUGFnZSAmJiBtX2Zyb250 ZW5kICYmIG1fc3RhdGUtPmdldEJvb2xlYW4oSW5zcGVjdG9yQWdlbnRTdGF0ZTo6aW5zcGVjdG9y QWdlbnRFbmFibGVkKSkKICAgICAgICAgbV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9j dW1lbnQoKS0+cG9zdFRhc2soUG9zdFdvcmtlck5vdGlmaWNhdGlvblRvRnJvbnRlbmRUYXNrOjpj cmVhdGUod29ya2VyUmVzb3VyY2UsIEluc3BlY3RvckFnZW50OjpXb3JrZXJDcmVhdGVkKSk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmRpZERlc3Ryb3lXb3JrZXIoaW50cHRyX3QgaWQpCiB7 Ci0gICAgaWYgKCFlbmFibGVkKCkpCisgICAgaWYgKCFkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIFdvcmtlcnNNYXA6Oml0ZXJhdG9yIHdvcmtlclJlc291 cmNlID0gbV93b3JrZXJzLmZpbmQoaWQpOwogICAgIGlmICh3b3JrZXJSZXNvdXJjZSA9PSBtX3dv cmtlcnMuZW5kKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAobV9pbnNwZWN0ZWRQYWdlICYm IG1fZnJvbnRlbmQpCisgICAgaWYgKG1faW5zcGVjdGVkUGFnZSAmJiBtX2Zyb250ZW5kICYmIG1f c3RhdGUtPmdldEJvb2xlYW4oSW5zcGVjdG9yQWdlbnRTdGF0ZTo6aW5zcGVjdG9yQWdlbnRFbmFi bGVkKSkKICAgICAgICAgbV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+ cG9zdFRhc2soUG9zdFdvcmtlck5vdGlmaWNhdGlvblRvRnJvbnRlbmRUYXNrOjpjcmVhdGUod29y a2VyUmVzb3VyY2UtPnNlY29uZCwgSW5zcGVjdG9yQWdlbnQ6OldvcmtlckRlc3Ryb3llZCkpOwog ICAgIG1fd29ya2Vycy5yZW1vdmUod29ya2VyUmVzb3VyY2UpOwogfQpAQCAtMjMwLDcgKzI0NCw3 IEBAIEtVUkwgSW5zcGVjdG9yQWdlbnQ6Omluc3BlY3RlZFVSTFdpdGhvdXRGcmFnbWVudCgpIGNv bnN0CiAgICAgcmV0dXJuIHVybDsKIH0KIAotYm9vbCBJbnNwZWN0b3JBZ2VudDo6ZW5hYmxlZCgp IGNvbnN0Citib29sIEluc3BlY3RvckFnZW50OjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkgY29u c3QKIHsKICAgICBpZiAoIW1faW5zcGVjdGVkUGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaAppbmRleCBjNWNmMTYxYmZh NGZmYjJiNTg3MjBlYWUwM2Y5N2Y5YjIwNWE1ZTA5Li4yZDE3NzU3ZjdlNTc4MGE1Y2Q5MDcwMDY0 NTcyMzAwYjAyNjIyNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdl bnQuaApAQCAtNjIsNyArNjIsMTEgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+SW5zcGVjdG9y QWdlbnQoKTsKIAotICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0OworICAgIGJvb2wgZGV2ZWxvcGVy RXh0cmFzRW5hYmxlZCgpIGNvbnN0OworCisgICAgLy8gSW5zcGVjdG9yIGZyb250LWVuZCBBUEku CisgICAgdm9pZCBlbmFibGUoRXJyb3JTdHJpbmcqKTsKKyAgICB2b2lkIGRpc2FibGUoRXJyb3JT dHJpbmcqKTsKIAogICAgIEtVUkwgaW5zcGVjdGVkVVJMKCkgY29uc3Q7CiAgICAgS1VSTCBpbnNw ZWN0ZWRVUkxXaXRob3V0RnJhZ21lbnQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA4ZjAyZTQ5OWI2Yzg4N2Q3MDc2 NzJmNTQyNDAxMDkyZTkwODYyYzQ5Li5mZDM0YjMyNWViNzZjY2YwZmUwOTFhNGQ3NzczNDVmN2E3 NWY4ZjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuY3BwCkBAIC0yOTcsNyArMjk3LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpp bnNwZWN0KE5vZGUqIG5vZGUpCiAKIGJvb2wgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5hYmxlZCgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1faW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKTsKKyAgICBy ZXR1cm4gbV9pbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpOwogfQogCiBQ YWdlKiBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNwZWN0ZWRQYWdlKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAK aW5kZXggY2QzMDMzYmVkMTBmNmIwMzllMjk1MjgxOTc3ZmIwZmM0ZDc2ZWE0My4uZjY0ZWQwMzY4 MWE1M2ExZWM3OTFhODg4MjIyMmM2ODVhODk5NzliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTQ1OCw3ICs0 NTgsNyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bWFya1Jlc291cmNlQXNDYWNo ZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGlucwogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZUltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgQ2FjaGVk UmVzb3VyY2UqIGNhY2hlZFJlc291cmNlKQogewogICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0 b3JBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYg KCFpbnNwZWN0b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKKyAgICBpZiAo IWluc3BlY3RvckFnZW50IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxl ZCgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJl c291cmNlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JSZXNvdXJjZUFnZW50 KCkpCiAgICAgICAgIHJlc291cmNlQWdlbnQtPmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNo ZShsb2FkZXIsIGNhY2hlZFJlc291cmNlKTsKQEAgLTYzMSw3ICs2MzEsNyBAQCB2b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZnJhbWVEZXRhY2hlZEZyb21QYXJlbnRJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMqCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ29tbWl0TG9h ZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFn ZSwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKICAgICBJbnNwZWN0b3JBZ2VudCogaW5zcGVj dG9yQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JBZ2VudCgpOwotICAgIGlm ICghaW5zcGVjdG9yQWdlbnQgfHwgIWluc3BlY3RvckFnZW50LT5lbmFibGVkKCkpCisgICAgaWYg KCFpbnNwZWN0b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmRldmVsb3BlckV4dHJhc0VuYWJs ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgRnJhbWUqIG1haW5GcmFtZSA9IHBhZ2UtPm1h aW5GcmFtZSgpOwpAQCAtNzU3LDcgKzc1Nyw3IEBAIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpwcm9maWxlckVuYWJsZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lCiB2 b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkT3BlbkRhdGFiYXNlSW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQYXNzUmVmUHRyPERhdGFiYXNlPiBk YXRhYmFzZSwgY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3Qg U3RyaW5nJiB2ZXJzaW9uKQogewogICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9 IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYgKCFpbnNwZWN0 b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKKyAgICBpZiAoIWluc3BlY3Rv ckFnZW50IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAg ICAgICByZXR1cm47CiAgICAgaWYgKEluc3BlY3RvckRhdGFiYXNlQWdlbnQqIGRiQWdlbnQgPSBp bnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JEYXRhYmFzZUFnZW50KCkpCiAgICAgICAgIGRi QWdlbnQtPmRpZE9wZW5EYXRhYmFzZShkYXRhYmFzZSwgZG9tYWluLCBuYW1lLCB2ZXJzaW9uKTsK QEAgLTc3NSw3ICs3NzUsNyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkT3Bl bkZpbGVTeXN0ZW1JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydQogdm9pZCBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZFVzZURPTVN0b3JhZ2VJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIFN0b3JhZ2VBcmVhKiBzdG9yYWdlQXJlYSwgYm9vbCBp c0xvY2FsU3RvcmFnZSwgRnJhbWUqIGZyYW1lKQogewogICAgIEluc3BlY3RvckFnZW50KiBpbnNw ZWN0b3JBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAg aWYgKCFpbnNwZWN0b3JBZ2VudCB8fCAhaW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKKyAgICBp ZiAoIWluc3BlY3RvckFnZW50IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5h YmxlZCgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKEluc3BlY3RvckRPTVN0b3JhZ2VBZ2Vu dCogZG9tU3RvcmFnZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50KCkpCiAgICAgICAgIGRvbVN0b3JhZ2VBZ2VudC0+ZGlkVXNlRE9NU3RvcmFnZShz dG9yYWdlQXJlYSwgaXNMb2NhbFN0b3JhZ2UsIGZyYW1lKTsKQEAgLTgzMSw3ICs4MzEsNyBAQCB2 b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWRJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMqCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk Q3JlYXRlV2ViU29ja2V0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdl bnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwsIGNv bnN0IEtVUkwmKQogewogICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3Ry dW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCk7Ci0gICAgaWYgKCFpbnNwZWN0b3JBZ2Vu dCB8fCAhaW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKKyAgICBpZiAoIWluc3BlY3RvckFnZW50 IHx8ICFpbnNwZWN0b3JBZ2VudC0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAgICAgICBy ZXR1cm47CiAgICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBp bnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JSZXNvdXJjZUFnZW50KCkpCiAgICAgICAgIHJl c291cmNlQWdlbnQtPmRpZENyZWF0ZVdlYlNvY2tldChpZGVudGlmaWVyLCByZXF1ZXN0VVJMKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5k ZXggY2M4MGI4YjY1ODI2MzMyM2ZjNDU3ZWIzMTk0ZmIxNzVjYjhmZjhhNC4uMmRlNGQxNWZkNDBh MDg4MzQzNGQ0N2I5MjQ1NTE0Zjk0NDg5YTNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTcyLDcgKzcyLDcgQEAgdXNpbmcgbmFt ZXNwYWNlIHN0ZDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNwYWNlIFBhZ2VBZ2VudFN0 YXRlIHsKLXN0YXRpYyBjb25zdCBjaGFyIHBhZ2VBZ2VudEVuYWJsZWRbXSA9ICJyZXNvdXJjZUFn ZW50RW5hYmxlZCI7CitzdGF0aWMgY29uc3QgY2hhciBwYWdlQWdlbnRFbmFibGVkW10gPSAicGFn ZUFnZW50RW5hYmxlZCI7CiBzdGF0aWMgY29uc3QgY2hhciBwYWdlQWdlbnRTY3JpcHRzVG9FdmFs dWF0ZU9uTG9hZFtdID0gInBhZ2VBZ2VudFNjcmlwdHNUb0V2YWx1YXRlT25Mb2FkIjsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VDb25zb2xlQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VDb25zb2xlQWdlbnQuY3BwCmluZGV4IDVi NTUxOGRjYTE5ZmEzYTdhMGFkN2RiZmIwZjEyMzgyODFmZjA2ZWEuLmVlZTRiZmFiZmExOGU4ZGUx YmY1NjlmMjM4NmVlYmExZGEwY2NmNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9QYWdlQ29uc29sZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv UGFnZUNvbnNvbGVBZ2VudC5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgdm9pZCBQYWdlQ29uc29sZUFn ZW50OjphZGRJbnNwZWN0ZWROb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCkKIAogYm9vbCBQ YWdlQ29uc29sZUFnZW50OjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkKIHsKLSAgICByZXR1cm4g bV9pbnNwZWN0b3JBZ2VudC0+ZW5hYmxlZCgpOworICAgIHJldHVybiBtX2luc3BlY3RvckFnZW50 LT5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpzCmluZGV4IGI2OWQ3MTU0ZGI0 M2E3MmMyNTdmOWM2YmZhNTQ0YWVhYzc4MTcwMWYuLmVhOGViZmM5NjM0OWVmMGJjZWJjM2RjOGM2 MGUyOWY1NjdiYTY4OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV29ya2VyTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dvcmtlck1hbmFnZXIuanMKQEAgLTEwOCwxNyArMTA4LDYgQEAgV2ViSW5zcGVjdG9y Lldvcmtlck1hbmFnZXIuX2NhbGN1bGF0ZVdvcmtlckluc3BlY3RvclRpdGxlID0gZnVuY3Rpb24o KQogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIuc2hvd1dvcmtlclRlcm1p bmF0ZWRTY3JlZW4gPSBmdW5jdGlvbigpCi17Ci0gICAgZnVuY3Rpb24gb25IaWRlKCkKLSAgICB7 Ci0gICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnJlbW92ZUV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHNj cmVlbi5oaWRlLCBzY3JlZW4pOwotICAgIH0KLSAgICB2YXIgc2NyZWVuID0gbmV3IFdlYkluc3Bl Y3Rvci5Xb3JrZXJUZXJtaW5hdGVkU2NyZWVuKCk7Ci0gICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMu R2xvYmFsT2JqZWN0Q2xlYXJlZCwgc2NyZWVuLmhpZGUsIHNjcmVlbik7Ci0gICAgc2NyZWVuLnNo b3cob25IaWRlLmJpbmQodGhpcykpOwotfQotCiBXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5F dmVudHMgPSB7CiAgICAgV29ya2VyQWRkZWQ6ICJ3b3JrZXItYWRkZWQiLAogICAgIFdvcmtlclJl bW92ZWQ6ICJ3b3JrZXItcmVtb3ZlZCIsCkBAIC0yMDMsNiArMTkyLDE3IEBAIFdlYkluc3BlY3Rv ci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgZGVsZXRlIHRoaXMuX3dvcmtlcklkVG9XaW5kb3dbd29ya2VySWRdOwogICAgICAgICBXb3Jr ZXJBZ2VudC5kaXNjb25uZWN0RnJvbVdvcmtlcih3b3JrZXJJZCk7CisgICAgfSwKKworICAgIF9k aXNjb25uZWN0ZWRGcm9tV29ya2VyOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmdW5jdGlv biBvbkhpZGUoKQorICAgICAgICB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJN b2RlbC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50 cy5HbG9iYWxPYmplY3RDbGVhcmVkLCBzY3JlZW4uaGlkZSwgc2NyZWVuKTsKKyAgICAgICAgfQor ICAgICAgICB2YXIgc2NyZWVuID0gbmV3IFdlYkluc3BlY3Rvci5Xb3JrZXJUZXJtaW5hdGVkU2Ny ZWVuKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQs IHNjcmVlbi5oaWRlLCBzY3JlZW4pOworICAgICAgICBzY3JlZW4uc2hvdyhvbkhpZGUuYmluZCh0 aGlzKSk7CiAgICAgfQogfQogCkBAIC0yNDMsNiArMjQzLDExIEBAIFdlYkluc3BlY3Rvci5EZWRp Y2F0ZWRXb3JrZXJNZXNzYWdlRm9yd2FyZGVyLnByb3RvdHlwZSA9IHsKICAgICBkaXNwYXRjaE1l c3NhZ2VGcm9tV29ya2VyOiBmdW5jdGlvbih3b3JrZXJJZCwgbWVzc2FnZSkKICAgICB7CiAgICAg ICAgIHRoaXMuX3dvcmtlck1hbmFnZXIuX3NlbmRNZXNzYWdlVG9Xb3JrZXJJbnNwZWN0b3Iod29y a2VySWQsIG1lc3NhZ2UpOworICAgIH0sCisKKyAgICBkaXNjb25uZWN0ZWRGcm9tV29ya2VyOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl93b3JrZXJNYW5hZ2VyLl9kaXNjb25uZWN0 ZWRGcm9tV29ya2VyKCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDlkNTI5ZGM1NjIxOWEyZGMyZGY2Y2RmYmE5 YTNhNzg4NjkxNzZmMDIuLjlhYzRjYzZhOGIzNDFlYjg4ODJhMzQ1NzE3NDcyZjVhNWFhN2MyYzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CkBAIC0zODYsNiArMzg2LDggQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9u KCkKICAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5pbml0RXh0ZW5zaW9ucygpOwogCiAgICAgdGhp cy5jb25zb2xlLmVuYWJsZUFnZW50KCk7CisKKyAgICBJbnNwZWN0b3JBZ2VudC5lbmFibGUoKTsK ICAgICBEYXRhYmFzZUFnZW50LmVuYWJsZSgpOwogICAgIERPTVN0b3JhZ2VBZ2VudC5lbmFibGUo KTsKIApAQCAtNDY2LDExICs0NjgsNiBAQCBXZWJJbnNwZWN0b3IuY2xvc2UgPSBmdW5jdGlvbihl dmVudCkKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2xvc2VXaW5kb3coKTsKIH0KIAotV2Vi SW5zcGVjdG9yLmRpc2Nvbm5lY3RGcm9tV29ya2VyID0gZnVuY3Rpb24oKQotewotICAgIFdlYklu c3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnNob3dXb3JrZXJUZXJtaW5hdGVkU2NyZWVuKCk7Ci19Ci0K IFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgdmFy IGFuY2hvciA9IGV2ZW50LnRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5vZGVOYW1lKCJh Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Fn ZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50 SW1wbC5jcHAKaW5kZXggNjk5MGVmNzQwODk1NWQ2NWRhMzA1M2QyOTBmMzZiMjQ2MThhMzU4ZC4u YjZmZTc5ODcyMzUwNTYxZWRhNzNkOWEzZDA0MGY5OGY5NTQ5ZjQwMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcApAQCAtMzg0 LDggKzM4NCw4IEBAIFdlYlN0cmluZyBXZWJEZXZUb29sc0FnZW50OjpkaXNjb25uZWN0RXZlbnRB c1RleHQoKQogICAgICAgICB9CiAgICAgICAgIFN0cmluZyBtX21lc3NhZ2U7CiAgICAgfSBjaGFu bmVsOwotICAgIEluc3BlY3RvckZyb250ZW5kOjpJbnNwZWN0b3IgaW5zcGVjdG9yKCZjaGFubmVs KTsKLSAgICBpbnNwZWN0b3IuZGlzY29ubmVjdEZyb21Xb3JrZXIoKTsKKyAgICBJbnNwZWN0b3JG cm9udGVuZDo6V29ya2VyIGluc3BlY3RvcigmY2hhbm5lbCk7CisgICAgaW5zcGVjdG9yLmRpc2Nv bm5lY3RlZEZyb21Xb3JrZXIoKTsKICAgICByZXR1cm4gY2hhbm5lbC5tX21lc3NhZ2U7CiB9CiAK