59939 2011-05-02 09:29:53 -0700 Web Inspector: revision history storage is too slow. 2011-05-03 02:01: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 396411 0 pfeldman 2011-05-02 09:29:53 -0700 It turns out that iterating localStorage keys is very expensive (results in slow inspector start), refactor revision history in order not to rely upon that operation. 396412 1 91929 pfeldman 2011-05-02 09:34:29 -0700 Created attachment 91929 Patch 397004 2 91929 yurys 2011-05-03 01:25:37 -0700 Comment on attachment 91929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91929&action=review > Source/WebCore/inspector/front-end/Resource.js:140 > + if (resource && historyItem.loaderId === resource.loaderId) { Can we make sure there is no collision between loaderIds? > Source/WebCore/inspector/front-end/ResourceTreeModel.js:71 > WebInspector.mainResource = this._addFramesRecursively(mainFramePayload); Let's remove this: if (error) 6868 return; 397008 3 pfeldman 2011-05-03 01:52:16 -0700 (In reply to comment #2) > (From update of attachment 91929 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91929&action=review > > > Source/WebCore/inspector/front-end/Resource.js:140 > > + if (resource && historyItem.loaderId === resource.loaderId) { > > Can we make sure there is no collision between loaderIds? > We don't have unique session id yet. > > Source/WebCore/inspector/front-end/ResourceTreeModel.js:71 > > WebInspector.mainResource = this._addFramesRecursively(mainFramePayload); > > Let's remove this: > if (error) > 6868 return; I'll put console.error here. 397010 4 pfeldman 2011-05-03 02:01:53 -0700 Committed r85591: <http://trac.webkit.org/changeset/85591> 91929 2011-05-02 09:34:29 -0700 2011-05-03 01:49:39 -0700 Patch bug-59939-20110502203427.patch text/plain 7910 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODU0MDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NzYwMjc1Mjc3OGNmODc3 MGMzYzU1ZTdmNDcyZGFhNGYwYTEwZGVhLi4wN2I0MDBhN2M4MmRmZjExMGZlZjZiYTFjN2QyZGY5 ZDhmZGExN2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjggQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXZpc2lvbiBo aXN0b3J5IHN0b3JhZ2UgaXMgdG9vIHNsb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01OTkzOQorCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGl0 ZXJhdGluZyBsb2NhbFN0b3JhZ2Uga2V5cyBpcyB2ZXJ5CisgICAgICAgIGV4cGVuc2l2ZSAocmVz dWx0cyBpbiBzbG93IGluc3BlY3RvciBzdGFydCksIHJlZmFjdG9yIHJldmlzaW9uCisgICAgICAg IGhpc3RvcnkgaW4gb3JkZXIgbm90IHRvIHJlbHkgdXBvbiB0aGF0IG9wZXJhdGlvbi4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLl9yZXNvdXJj ZVJldmlzaW9uUmVnaXN0cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnJlc3Rv cmVSZXZpc2lvbnMucGVyc2lzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucmVz dG9yZVJldmlzaW9ucyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucGVyc2lzdFJl dmlzaW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX3BlcnNp c3RSZXZpc2lvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVN b2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5 cGUuX3Byb2Nlc3NDYWNoZWRSZXNvdXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5fZnJhbWVOYXZpZ2F0ZWQpOgorCisyMDExLTA1LTAyICBQ YXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbWJpbmUgdG9v bGJhciBpY29uIGltYWdlcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU5OTMxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlLmpzCmluZGV4IGJmMDYzZTEyMDUzZmQwMDA5YTJjMzdhOGJiYmMyNDc0OWVjMzRh MzcuLjczODMyYTk5NGM0N2YyYzYzN2Y0ZjNhMGY4NjJhMzhkNjI0MWI2ZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtMzUsOCArMzUs NiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCB1cmwsIGxv YWRlcklkKQogICAgIHRoaXMuX2NhdGVnb3J5ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdv cmllcy5vdGhlcjsKICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENhbGxiYWNrcyA9IFtdOwogICAg IHRoaXMuaGlzdG9yeSA9IFtdOwotCi0gICAgdGhpcy5fcmVzdG9yZVJldmlzaW9ucygpOwogfQog CiAvLyBLZWVwIHRoZXNlIGluIHN5bmMgd2l0aCBXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6 VHlwZQpAQCAtMTExLDE1ICsxMDksODAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnJlZ2lzdGVy RG9tYWluTW9kZWxCaW5kaW5nID0gZnVuY3Rpb24odHlwZSwgYmluZGluZykKICAgICBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UuX2RvbWFpbk1vZGVsQmluZGluZ3NbdHlwZV0gPSBiaW5kaW5nOwogfQog Ci1XZWJJbnNwZWN0b3IuUmVzb3VyY2UuY2xlYXJSZXZpc2lvbkhpc3RvcnkgPSBmdW5jdGlvbigp CisKK1dlYkluc3BlY3Rvci5SZXNvdXJjZS5fcmVzb3VyY2VSZXZpc2lvblJlZ2lzdHJ5ID0gZnVu Y3Rpb24oKQoreworICAgIGlmICghV2ViSW5zcGVjdG9yLlJlc291cmNlLl9yZXNvdXJjZVJldmlz aW9uUmVnaXN0cnlPYmplY3QpIHsKKyAgICAgICAgaWYgKHdpbmRvdy5sb2NhbFN0b3JhZ2UpIHsK KyAgICAgICAgICAgIHZhciByZXNvdXJjZUhpc3RvcnkgPSB3aW5kb3cubG9jYWxTdG9yYWdlWyJy ZXNvdXJjZS1oaXN0b3J5Il07CisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5fcmVzb3VyY2VSZXZpc2lvblJlZ2lzdHJ5T2JqZWN0ID0gcmVz b3VyY2VIaXN0b3J5ID8gSlNPTi5wYXJzZShyZXNvdXJjZUhpc3RvcnkpIDoge307CisgICAgICAg ICAgICB9IGNhdGNoIChlKSB7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNl Ll9yZXNvdXJjZVJldmlzaW9uUmVnaXN0cnlPYmplY3QgPSB7fTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfSBlbHNlCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX3Jlc291cmNl UmV2aXNpb25SZWdpc3RyeU9iamVjdCA9IHt9OworICAgIH0KKyAgICByZXR1cm4gV2ViSW5zcGVj dG9yLlJlc291cmNlLl9yZXNvdXJjZVJldmlzaW9uUmVnaXN0cnlPYmplY3Q7Cit9CisKK1dlYklu c3BlY3Rvci5SZXNvdXJjZS5yZXN0b3JlUmV2aXNpb25zID0gZnVuY3Rpb24oKQoreworICAgIHZh ciByZWdpc3RyeSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5fcmVzb3VyY2VSZXZpc2lvblJlZ2lz dHJ5KCk7CisgICAgdmFyIGZpbHRlcmVkUmVnaXN0cnkgPSB7fTsKKyAgICBmb3IgKHZhciB1cmwg aW4gcmVnaXN0cnkpIHsKKyAgICAgICAgdmFyIGhpc3RvcnlJdGVtcyA9IHJlZ2lzdHJ5W3VybF07 CisgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwp OworCisgICAgICAgIHZhciBmaWx0ZXJlZEhpc3RvcnlJdGVtcyA9IFtdOworICAgICAgICBmb3Ig KHZhciBpID0gMDsgaGlzdG9yeUl0ZW1zICYmIGkgPCBoaXN0b3J5SXRlbXMubGVuZ3RoOyArK2kp IHsKKyAgICAgICAgICAgIHZhciBoaXN0b3J5SXRlbSA9IGhpc3RvcnlJdGVtc1tpXTsKKyAgICAg ICAgICAgIGlmIChyZXNvdXJjZSAmJiBoaXN0b3J5SXRlbS5sb2FkZXJJZCA9PT0gcmVzb3VyY2Uu bG9hZGVySWQpIHsKKyAgICAgICAgICAgICAgICByZXNvdXJjZS5hZGRSZXZpc2lvbih3aW5kb3cu bG9jYWxTdG9yYWdlW2hpc3RvcnlJdGVtLmtleV0sIG5ldyBEYXRlKGhpc3RvcnlJdGVtLnRpbWVz dGFtcCksIHRydWUpOworICAgICAgICAgICAgICAgIGZpbHRlcmVkSGlzdG9yeUl0ZW1zLnB1c2go aGlzdG9yeUl0ZW0pOworICAgICAgICAgICAgICAgIGZpbHRlcmVkUmVnaXN0cnlbdXJsXSA9IGZp bHRlcmVkSGlzdG9yeUl0ZW1zOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAg ZGVsZXRlIHdpbmRvdy5sb2NhbFN0b3JhZ2VbaGlzdG9yeUl0ZW0ua2V5XTsKKyAgICAgICAgfQor ICAgIH0KKyAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX3Jlc291cmNlUmV2aXNpb25SZWdpc3Ry eU9iamVjdCA9IGZpbHRlcmVkUmVnaXN0cnk7CisKKyAgICBmdW5jdGlvbiBwZXJzaXN0KCkKKyAg ICB7CisgICAgICAgIHdpbmRvdy5sb2NhbFN0b3JhZ2VbInJlc291cmNlLWhpc3RvcnkiXSA9IEpT T04uc3RyaW5naWZ5KGZpbHRlcmVkUmVnaXN0cnkpOworICAgIH0KKworICAgIC8vIFNjaGVkdWxl IGFzeW5jIHN0b3JhZ2UuCisgICAgc2V0VGltZW91dChwZXJzaXN0LCAwKTt9CisKK1dlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wZXJzaXN0UmV2aXNpb24gPSBmdW5jdGlvbihyZXNvdXJjZSkKIHsKICAg ICBpZiAoIXdpbmRvdy5sb2NhbFN0b3JhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIGZvciAo dmFyIGtleSBpbiB3aW5kb3cubG9jYWxTdG9yYWdlKSB7Ci0gICAgICAgIGlmIChrZXkuaW5kZXhP ZigicmVzb3VyY2UtaGlzdG9yeXwiKSA9PT0gMCkKLSAgICAgICAgICAgIGRlbGV0ZSB3aW5kb3cu bG9jYWxTdG9yYWdlW2tleV07CisgICAgdmFyIHVybCA9IHJlc291cmNlLnVybDsKKyAgICB2YXIg bG9hZGVySWQgPSByZXNvdXJjZS5sb2FkZXJJZDsKKyAgICB2YXIgdGltZXN0YW1wID0gcmVzb3Vy Y2UuX2NvbnRlbnRUaW1lc3RhbXAuZ2V0VGltZSgpOworICAgIHZhciBrZXkgPSAicmVzb3VyY2Ut aGlzdG9yeXwiICsgdXJsICsgInwiICsgbG9hZGVySWQgKyAifCIgKyB0aW1lc3RhbXA7CisgICAg dmFyIGNvbnRlbnQgPSByZXNvdXJjZS5fY29udGVudDsKKworICAgIHZhciByZWdpc3RyeSA9IFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5fcmVzb3VyY2VSZXZpc2lvblJlZ2lzdHJ5KCk7CisKKyAgICB2 YXIgaGlzdG9yeUl0ZW1zID0gcmVnaXN0cnlbcmVzb3VyY2UudXJsXTsKKyAgICBpZiAoIWhpc3Rv cnlJdGVtcykgeworICAgICAgICBoaXN0b3J5SXRlbXMgPSBbXTsKKyAgICAgICAgcmVnaXN0cnlb cmVzb3VyY2UudXJsXSA9IGhpc3RvcnlJdGVtczsKKyAgICB9CisgICAgaGlzdG9yeUl0ZW1zLnB1 c2goe3VybDogdXJsLCBsb2FkZXJJZDogbG9hZGVySWQsIHRpbWVzdGFtcDogdGltZXN0YW1wLCBr ZXk6IGtleX0pOworCisgICAgZnVuY3Rpb24gcGVyc2lzdCgpCisgICAgeworICAgICAgICB3aW5k b3cubG9jYWxTdG9yYWdlW2tleV0gPSBjb250ZW50OworICAgICAgICB3aW5kb3cubG9jYWxTdG9y YWdlWyJyZXNvdXJjZS1oaXN0b3J5Il0gPSBKU09OLnN0cmluZ2lmeShyZWdpc3RyeSk7CiAgICAg fQorCisgICAgLy8gU2NoZWR1bGUgYXN5bmMgc3RvcmFnZS4KKyAgICBzZXRUaW1lb3V0KHBlcnNp c3QsIDApOwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzID0gewpAQCAtNzYzLDUy ICs4MjYsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgX3Bl cnNpc3RSZXZpc2lvbjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF3aW5kb3cubG9j YWxTdG9yYWdlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHZhciB1cmwgPSB0aGlz LnVybDsKLSAgICAgICAgdmFyIGxvYWRlcklkID0gdGhpcy5sb2FkZXJJZDsKLSAgICAgICAgdmFy IHRpbWVzdGFtcCA9IHRoaXMuX2NvbnRlbnRUaW1lc3RhbXAuZ2V0VGltZSgpOwotICAgICAgICB2 YXIgY29udGVudCA9IHRoaXMuX2NvbnRlbnQ7Ci0gICAgICAgIGZ1bmN0aW9uIHBlcnNpc3QoKQot ICAgICAgICB7Ci0gICAgICAgICAgICB2YXIga2V5ID0gInJlc291cmNlLWhpc3Rvcnl8IiArIHVy bCArICJ8IiArIGxvYWRlcklkICsgInwiICsgdGltZXN0YW1wOwotICAgICAgICAgICAgd2luZG93 LmxvY2FsU3RvcmFnZVtrZXldID0gY29udGVudDsKLSAgICAgICAgfQotICAgIAotICAgICAgICAv LyBTY2hlZHVsZSBhc3luYyBzdG9yYWdlLgotICAgICAgICBzZXRUaW1lb3V0KHBlcnNpc3QsIDAp OwotICAgIH0sCi0KLSAgICBfcmVzdG9yZVJldmlzaW9uczogZnVuY3Rpb24oKQotICAgIHsKLSAg ICAgICAgaWYgKCF3aW5kb3cubG9jYWxTdG9yYWdlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0g ICAgICAgIHRyeSB7Ci0gICAgICAgICAgICB2YXIgdXJsS2V5ID0gInJlc291cmNlLWhpc3Rvcnl8 IiArIHRoaXMudXJsICsgInwiICsgdGhpcy5sb2FkZXJJZCArICJ8IjsKLQotICAgICAgICAgICAg dmFyIGNvbnRlbnQgPSB7fTsKLSAgICAgICAgICAgIHZhciB0aW1lc3RhbXBzID0gW107Ci0gICAg ICAgICAgICBmb3IgKHZhciBrZXkgaW4gd2luZG93LmxvY2FsU3RvcmFnZSkgewotICAgICAgICAg ICAgICAgIGlmIChrZXkuaW5kZXhPZih1cmxLZXkpICE9PSAwKQotICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICB2YXIgdGltZXN0YW1wID0gcGFyc2VJbnQoa2V5 LnN1YnN0cmluZyh1cmxLZXkubGVuZ3RoKSk7Ci0gICAgICAgICAgICAgICAgY29udGVudFt0aW1l c3RhbXBdID0gd2luZG93LmxvY2FsU3RvcmFnZVtrZXldOwotICAgICAgICAgICAgICAgIHRpbWVz dGFtcHMucHVzaCh0aW1lc3RhbXApOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAo IXRpbWVzdGFtcHMubGVuZ3RoKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAg ICAgdGltZXN0YW1wcy5zb3J0KCk7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRp bWVzdGFtcHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgdGltZXN0YW1wID0g dGltZXN0YW1wc1tpXTsKLSAgICAgICAgICAgICAgICB0aGlzLmFkZFJldmlzaW9uKGNvbnRlbnRb dGltZXN0YW1wXSwgbmV3IERhdGUodGltZXN0YW1wKSwgdHJ1ZSk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0gY2F0Y2goZSkgewotICAgICAgICAgICAgY29uc29sZS5lcnJvcihlLnRvU3RyaW5n KCkpOwotICAgICAgICB9CisgICAgICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wZXJzaXN0UmV2 aXNpb24odGhpcyk7CiAgICAgfSwKIAogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxs YmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VUcmVlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVHJlZU1vZGVsLmpzCmluZGV4IGRlNWFjMzdhOTliMjFkMDRjZWUzZTg5NjFiZmYzZTZh NjA5YTk2ZDAuLjFiMTVkMzAzOGU1NDY4NDJjNjU0NGIzMjBiZjZiM2M2MDhmYjE0MTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9k ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRy ZWVNb2RlbC5qcwpAQCAtNzEsNiArNzEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9k ZWwucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlID0gdGhp cy5fYWRkRnJhbWVzUmVjdXJzaXZlbHkobWFpbkZyYW1lUGF5bG9hZCk7CiAgICAgICAgIHRoaXMu X2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZChXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVy bCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCk7CisgICAg ICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5yZXN0b3JlUmV2aXNpb25zKCk7CiAKICAgICAgICAg dGhpcy5fY2FjaGVkUmVzb3VyY2VzUHJvY2Vzc2VkID0gdHJ1ZTsKICAgICB9LApAQCAtMTQyLDcg KzE0Myw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmIChpc01haW5GcmFtZSAmJiB0aGlzLnJlc291cmNlRm9yVVJMKGZyYW1lLnVybCkp IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UgPSB0aGlzLnJlc291cmNl Rm9yVVJMKGZyYW1lLnVybCk7CiAgICAgICAgICAgICB0aGlzLl9kaXNwYXRjaEluc3BlY3RlZFVS TENoYW5nZWQoZnJhbWUudXJsKTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5j bGVhclJldmlzaW9uSGlzdG9yeSgpOwogICAgICAgICB9CiAgICAgfSwKIAo=