48668 2010-10-29 13:37:57 -0700 Web Inspector: last active panel is not restored upon opening inspector. 2010-10-29 14:28:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 302011 0 pfeldman 2010-10-29 13:37:57 -0700 When I open inspector on a clean ToT build, I see no panels selected at all. It probably regressed once migrated to local store settings. I'll provide a patch with the fix. 302023 1 72386 pfeldman 2010-10-29 13:53:32 -0700 Created attachment 72386 [PATCH] Proposed fix. 302061 2 72386 commit-queue 2010-10-29 14:28:25 -0700 Comment on attachment 72386 [PATCH] Proposed fix. Clearing flags on attachment: 72386 Committed r70929: <http://trac.webkit.org/changeset/70929> 302062 3 commit-queue 2010-10-29 14:28:30 -0700 All reviewed patches have been landed. Closing bug. 72386 2010-10-29 13:53:32 -0700 2010-10-29 14:28:24 -0700 [PATCH] Proposed fix. last_active_panel text/plain 8712 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTI4ZDBjZS4uNzk2ZDM2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0xMC0yOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBsYXN0IGFjdGl2ZSBwYW5lbCBpcyBu b3QgcmVzdG9yZWQgdXBvbiBvcGVuaW5nIGluc3BlY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjY4CisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250 cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3Qp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c2hvd1BhbmVsKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpc2Nvbm5lY3RGcm9udGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9i amVjdHMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclN0YXRlOjpJbnNwZWN0b3JTdGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3Iuc2V0IGN1cnJlbnRQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9Mb2FkZWRE b25lLm9uUG9wdWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb0xv YWRlZERvbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGlu ayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayk6CisKIDIwMTAtMTAtMjkg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IGM5 YjljNGUuLjMzMWU1MDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5p ZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAtOTUsNyArOTUsNiBA QCBtb2R1bGUgY29yZSB7CiAgICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgcG9wdWxh dGVTY3JpcHRPYmplY3RzKCk7CiAKICAgICAgICAgW2hhbmRsZXI9Q29udHJvbGxlcl0gdm9pZCBn ZXRJbnNwZWN0b3JTdGF0ZShvdXQgT2JqZWN0IHN0YXRlKTsKLSAgICAgICAgW2hhbmRsZXI9Q29u dHJvbGxlcl0gdm9pZCBzdG9yZUxhc3RBY3RpdmVQYW5lbChpbiBTdHJpbmcgcGFuZWxOYW1lKTsK IAogICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUo aW4gYm9vbGVhbiBlbmFibGVkLCBvdXQgYm9vbGVhbiBuZXdTdGF0ZSk7CiAKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNjFlYmY3Mi4uOTU2ZWY3ZSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTEyNyw4ICsxMjcs NiBAQCBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgZG9tTmF0aXZlQnJlYWtwb2ludFR5cGUgPSAi RE9NIjsKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBldmVudExpc3RlbmVyTmF0aXZlQnJlYWtw b2ludFR5cGUgPSAiRXZlbnRMaXN0ZW5lciI7CiBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgeGhy TmF0aXZlQnJlYWtwb2ludFR5cGUgPSAiWEhSIjsKIAotLy8gRklYTUU6IG1vdmUgbGFzdCBwYW5l bCBzZXR0aW5nIHRvIHRoZSBmcm9udC1lbmQKLWNvbnN0IGNoYXIqIGNvbnN0IEluc3BlY3RvckNv bnRyb2xsZXI6Okxhc3RBY3RpdmVQYW5lbCA9ICJsYXN0QWN0aXZlUGFuZWwiOwogY29uc3QgY2hh ciogY29uc3QgSW5zcGVjdG9yQ29udHJvbGxlcjo6RWxlbWVudHNQYW5lbCA9ICJlbGVtZW50cyI7 CiBjb25zdCBjaGFyKiBjb25zdCBJbnNwZWN0b3JDb250cm9sbGVyOjpDb25zb2xlUGFuZWwgPSAi Y29uc29sZSI7CiBjb25zdCBjaGFyKiBjb25zdCBJbnNwZWN0b3JDb250cm9sbGVyOjpTY3JpcHRz UGFuZWwgPSAic2NyaXB0cyI7CkBAIC0xNDgsNyArMTQ2LDYgQEAgSW5zcGVjdG9yQ29udHJvbGxl cjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVu dCkKICAgICAsIG1fbG9hZEV2ZW50VGltZSgtMS4wKQogICAgICwgbV9kb21Db250ZW50RXZlbnRU aW1lKC0xLjApCiAgICAgLCBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KDApCi0gICAgLCBt X3Nob3dBZnRlclZpc2libGUoTGFzdEFjdGl2ZVBhbmVsKQogICAgICwgbV9ncm91cExldmVsKDAp CiAgICAgLCBtX3ByZXZpb3VzTWVzc2FnZSgwKQogICAgICwgbV9zZXR0aW5nc0xvYWRlZChmYWxz ZSkKQEAgLTI2NiwxMCArMjYzLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNwZWN0 KE5vZGUqIG5vZGUpCiAgICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7CiAgICAgbV9u b2RlVG9Gb2N1cyA9IG5vZGU7CiAKLSAgICBpZiAoIW1fZnJvbnRlbmQpIHsKLSAgICAgICAgbV9z aG93QWZ0ZXJWaXNpYmxlID0gRWxlbWVudHNQYW5lbDsKKyAgICBpZiAoIW1fZnJvbnRlbmQpCiAg ICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBmb2N1c05vZGUoKTsKIH0KQEAgLTQwNSwxMSAr NDAwLDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjptYXJrVGltZWxpbmUoY29uc3QgU3Ry aW5nJiBtZXNzYWdlKQogICAgICAgICB0aW1lbGluZUFnZW50KCktPmRpZE1hcmtUaW1lbGluZSht ZXNzYWdlKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzdG9yZUxhc3RBY3RpdmVQ YW5lbChjb25zdCBTdHJpbmcmIHBhbmVsTmFtZSkKLXsKLSAgICBtX3N0YXRlLT5zZXRTdHJpbmco SW5zcGVjdG9yU3RhdGU6Omxhc3RBY3RpdmVQYW5lbCwgcGFuZWxOYW1lKTsKLX0KLQogdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjptb3VzZURpZE1vdmVPdmVyRWxlbWVudChjb25zdCBIaXRUZXN0 UmVzdWx0JiByZXN1bHQsIHVuc2lnbmVkKQogewogICAgIGlmICghZW5hYmxlZCgpIHx8ICFzZWFy Y2hpbmdGb3JOb2RlSW5QYWdlKCkpCkBAIC01NDksMTAgKzUzOSw2IEBAIHZvaWQgSW5zcGVjdG9y Q29udHJvbGxlcjo6c2hvd1BhbmVsKGNvbnN0IFN0cmluZyYgcGFuZWwpCiAgICAgICAgIG1fc2hv d0FmdGVyVmlzaWJsZSA9IHBhbmVsOwogICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgaWYg KHBhbmVsID09IExhc3RBY3RpdmVQYW5lbCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV9mcm9u dGVuZC0+c2hvd1BhbmVsKHBhbmVsKTsKIH0KIApAQCAtNTg3LDggKzU3Myw2IEBAIHZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKCkKICAgICB1bmJpbmRBbGxSZXNv dXJjZXMoKTsKICAgICBzdG9wVGltZWxpbmVQcm9maWxlcigpOwogCi0gICAgbV9zaG93QWZ0ZXJW aXNpYmxlID0gTGFzdEFjdGl2ZVBhbmVsOwotCiAgICAgaGlkZUhpZ2hsaWdodCgpOwogCiAjaWYg RU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCkBAIC02MjksMTAgKzYxMywxMCBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OnBvcHVsYXRlU2NyaXB0T2JqZWN0cygpCiAgICAgaWYgKCFtX2Zy b250ZW5kKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9zaG93QWZ0ZXJWaXNpYmxlID09 IExhc3RBY3RpdmVQYW5lbCkKLSAgICAgICAgbV9zaG93QWZ0ZXJWaXNpYmxlID0gbV9zdGF0ZS0+ Z2V0U3RyaW5nKEluc3BlY3RvclN0YXRlOjpsYXN0QWN0aXZlUGFuZWwpOwotCi0gICAgc2hvd1Bh bmVsKG1fc2hvd0FmdGVyVmlzaWJsZSk7CisgICAgaWYgKCFtX3Nob3dBZnRlclZpc2libGUuaXNF bXB0eSgpKSB7CisgICAgICAgIHNob3dQYW5lbChtX3Nob3dBZnRlclZpc2libGUpOworICAgICAg ICBtX3Nob3dBZnRlclZpc2libGUgPSAiIjsKKyAgICB9CiAKICNpZiBFTkFCTEUoSkFWQVNDUklQ VF9ERUJVR0dFUikKICAgICBpZiAobV9wcm9maWxlckFnZW50LT5lbmFibGVkKCkpCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggOTE3OTY4Yy4uODBkMDk0ZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtMTEwLDcgKzExMCw2IEBA IHB1YmxpYzoKICAgICB0eXBlZGVmIEhhc2hNYXA8aW50LCBSZWZQdHI8SW5zcGVjdG9yRGF0YWJh c2VSZXNvdXJjZT4gPiBEYXRhYmFzZVJlc291cmNlc01hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8 aW50LCBSZWZQdHI8SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlPiA+IERPTVN0b3JhZ2VSZXNv dXJjZXNNYXA7CiAKLSAgICBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgTGFzdEFjdGl2ZVBhbmVs OwogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBDb25zb2xlUGFuZWw7CiAgICAgc3RhdGlj IGNvbnN0IGNoYXIqIGNvbnN0IEVsZW1lbnRzUGFuZWw7CiAgICAgc3RhdGljIGNvbnN0IGNoYXIq IGNvbnN0IFByb2ZpbGVzUGFuZWw7CkBAIC0zMDAsNyArMjk5LDYgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFibGVkLCBib29sKiBuZXdTdGF0ZSk7CiAK ICAgICB2b2lkIHNldE1vbml0b3JpbmdYSFJFbmFibGVkKGJvb2wgZW5hYmxlZCwgYm9vbCogbmV3 U3RhdGUpOwotICAgIHZvaWQgc3RvcmVMYXN0QWN0aXZlUGFuZWwoY29uc3QgU3RyaW5nJiBwYW5l bE5hbWUpOwogICAgIEluc3BlY3RvckRPTUFnZW50KiBkb21BZ2VudCgpIHsgcmV0dXJuIG1fZG9t QWdlbnQuZ2V0KCk7IH0KICAgICB2b2lkIHJlbGVhc2VGcm9udGVuZExpZmV0aW1lQWdlbnRzKCk7 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcAppbmRleCA2YTUwNGM2Li5lNmQzMDQ0 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwCkBAIC00Niw3ICs0Niw2IEBAIElu c3BlY3RvclN0YXRlOjpJbnNwZWN0b3JTdGF0ZShJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKICAg ICByZWdpc3RlckJvb2xlYW4oc2VhcmNoaW5nRm9yTm9kZSwgZmFsc2UsICJzZWFyY2hpbmdGb3JO b2RlRW5hYmxlZCIsIChjb25zdCBjaGFyKikwKTsKICAgICByZWdpc3RlckJvb2xlYW4ocHJvZmls ZXJBbHdheXNFbmFibGVkLCBmYWxzZSwgKGNvbnN0IGNoYXIqKTAsICJwcm9maWxlckVuYWJsZWQi KTsKICAgICByZWdpc3RlckJvb2xlYW4oZGVidWdnZXJBbHdheXNFbmFibGVkLCBmYWxzZSwgKGNv bnN0IGNoYXIqKTAsICJkZWJ1Z2dlckVuYWJsZWQiKTsKLSAgICByZWdpc3RlclN0cmluZyhsYXN0 QWN0aXZlUGFuZWwsIEluc3BlY3RvckNvbnRyb2xsZXI6Okxhc3RBY3RpdmVQYW5lbCwgKGNvbnN0 IGNoYXIqKTAsICJsYXN0QWN0aXZlUGFuZWwiKTsKICAgICByZWdpc3RlckJvb2xlYW4oaW5zcGVj dG9yU3RhcnRzQXR0YWNoZWQsIHRydWUsIChjb25zdCBjaGFyKikwLCAiSW5zcGVjdG9yU3RhcnRz QXR0YWNoZWQiKTsKICAgICByZWdpc3RlckxvbmcoaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQsIElu c3BlY3RvckNvbnRyb2xsZXI6OmRlZmF1bHRBdHRhY2hlZEhlaWdodCwgKGNvbnN0IGNoYXIqKTAs ICJpbnNwZWN0b3JBdHRhY2hlZEhlaWdodCIpOwogICAgIHJlZ2lzdGVyTG9uZyhwYXVzZU9uRXhj ZXB0aW9uc1N0YXRlLCAwLCAicGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIsIChjb25zdCBjaGFyKikw KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCAyODA1YmM1Li4z ZmI4MWY1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC02MSw2 ICs2MSw3IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmlu c3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInNob3dJbmhlcml0ZWRDb21wdXRlZFN0eWxlUHJvcGVy dGllcyIsIGZhbHNlKTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInNob3dV c2VyQWdlbnRTdHlsZXMiLCB0cnVlKTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRp bmcoIndhdGNoRXhwcmVzc2lvbnMiLCBbXSk7CisgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25T ZXR0aW5nKCJsYXN0QWN0aXZlUGFuZWwiLCAiZWxlbWVudHMiKTsKIAogICAgIHRoaXMuaW5zdGFs bFByb2plY3RTZXR0aW5nKCJicmVha3BvaW50cyIsIHt9KTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGY1YjEyYzEuLmY1YTcwYzggMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTgxLDcgKzE4MSw3IEBAIHZhciBX ZWJJbnNwZWN0b3IgPSB7CiAKICAgICAgICAgZm9yICh2YXIgcGFuZWxOYW1lIGluIFdlYkluc3Bl Y3Rvci5wYW5lbHMpIHsKICAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzW3BhbmVs TmFtZV0gPT09IHgpIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnN0b3JlTGFz dEFjdGl2ZVBhbmVsKHBhbmVsTmFtZSk7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmFw cGxpY2F0aW9uU2V0dGluZ3MubGFzdEFjdGl2ZVBhbmVsID0gcGFuZWxOYW1lOwogICAgICAgICAg ICAgICAgIHRoaXMuX3BhbmVsSGlzdG9yeS5zZXRQYW5lbChwYW5lbE5hbWUpOwogICAgICAgICAg ICAgfQogICAgICAgICB9CkBAIC02MzksNyArNjM5LDEzIEBAIFdlYkluc3BlY3Rvci5kb0xvYWRl ZERvbmUgPSBmdW5jdGlvbigpCiAgICAgfQogICAgIEluc3BlY3RvckJhY2tlbmQuZ2V0SW5zcGVj dG9yU3RhdGUocG9wdWxhdGVJbnNwZWN0b3JTdGF0ZSk7CiAKLSAgICBJbnNwZWN0b3JCYWNrZW5k LnBvcHVsYXRlU2NyaXB0T2JqZWN0cygpOworICAgIGZ1bmN0aW9uIG9uUG9wdWxhdGVTY3JpcHRP YmplY3RzKCkKKyAgICB7CisgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCkK KyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoV2ViSW5zcGVjdG9yLmFwcGxpY2F0 aW9uU2V0dGluZ3MubGFzdEFjdGl2ZVBhbmVsKTsKKyAgICB9CisgICAgSW5zcGVjdG9yQmFja2Vu ZC5wb3B1bGF0ZVNjcmlwdE9iamVjdHMob25Qb3B1bGF0ZVNjcmlwdE9iamVjdHMpOworCiAgICAg SW5zcGVjdG9yQmFja2VuZC5zZXRDb25zb2xlTWVzc2FnZXNFbmFibGVkKHRydWUpOwogCiAgICAg Ly8gQXMgYSBET01BZ2VudCBtZXRob2QsIHRoaXMgbmVlZHMgdG8gaGFwcGVuIGFmdGVyIHRoZSBm cm9udGVuZCBoYXMgbG9hZGVkIGFuZCB0aGUgYWdlbnQgaXMgYXZhaWxhYmxlLgpAQCAtODEyLDcg KzgxOCw3IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiAg ICAgICAgICAgICBpZiAocGFyc2VkVVJMLmhvc3QgPT09ICJzaG93LXBhbmVsIikgewogICAgICAg ICAgICAgICAgIHZhciBwYW5lbCA9IHBhcnNlZFVSTC5wYXRoLnN1YnN0cmluZygxKTsKICAgICAg ICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnBhbmVsc1twYW5lbF0pCi0gICAgICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxzW3Bh bmVsXTsKKyAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dQYW5lbChwYW5lbCk7 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K