56747 2011-03-21 09:17:56 -0700 Web Inspector: [REGRESSION] scripts panel is broken when frontend is reopened. 2011-03-22 11:39:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 370411 0 podivilov 2011-03-21 09:17:56 -0700 Web Inspector: [REGRESSION] scripts panel is broken when frontend is reopened. Debugger is enabled too early when reopening frontend. As a result scripts come before resources and scripts panel displays wrong content. 371323 1 86453 podivilov 2011-03-22 03:33:57 -0700 Created attachment 86453 Patch. 371331 2 86453 yurys 2011-03-22 04:55:12 -0700 Comment on attachment 86453 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=86453&action=review > Source/WebCore/ChangeLog:6 > + https://bugs.webkit.org/show_bug.cgi?id=56747 Can you provide a test for this? 371421 3 podivilov 2011-03-22 09:28:54 -0700 Committed r81673: <http://trac.webkit.org/changeset/81673> 371483 4 podivilov 2011-03-22 10:55:54 -0700 (In reply to comment #2) > (From update of attachment 86453 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86453&action=review > > > Source/WebCore/ChangeLog:6 > > + https://bugs.webkit.org/show_bug.cgi?id=56747 > > Can you provide a test for this? Please review the new test at https://bugs.webkit.org/show_bug.cgi?id=56841. 371517 5 webkit.review.bot 2011-03-22 11:39:57 -0700 http://trac.webkit.org/changeset/81673 might have broken GTK Linux 32-bit Debug The following tests are not passing: inspector/debugger/debug-inlined-scripts.html 86453 2011-03-22 03:33:57 -0700 2011-03-22 04:55:12 -0700 Patch. patch text/plain 9159 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYzg2NDE2Li4yMjAyMzUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDMtMjEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogW1JFR1JFU1NJT05dIHNjcmlwdHMgcGFuZWwgaXMgYnJva2VuIHdoZW4gZnJvbnRl bmQgaXMgcmVvcGVuZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01Njc0NworCisgICAgICAgIERlYnVnZ2VyIHNob3VsZCBiZSBlbmFibGVkIG9uIGZy b250LWVuZCBzaWRlIHRvIGd1YXJhbnRlZSBpbml0aWFsaXphdGlvbiBzZXF1ZW5jZSAocmVzb3Vy Y2VzIGNvbWUgYmVmb3JlIHNjcmlwdHMpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6c2hvd1Byb2ZpbGVzUGFuZWwpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6 Okluc3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6Y29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OnNob3dBbmRFbmFibGVEZWJ1Z2dlcik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRG cm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjbGVh ckZyb250ZW5kKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o OgorCiAyMDExLTAzLTIxICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24KaW5kZXggOWQzMzY0Zi4uMThmMWUzZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTE3LDYgKzExNyw5IEBACiAgICAgICAgICAgICAg ICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFt ZSI6ICJzdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmciCisgICAgICAgICAgICB9LAorICAgICAg ICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImV2YWx1YXRlRm9yVGVzdEluRnJvbnRl bmQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInRlc3RDYWxsSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKaW5kZXggYmRhZmUyZS4uNjlkNTRk ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCkBAIC02 NzgsMTEgKzY3OCw2IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnNob3dQcm9maWxlc1BhbmVsKCkK IHsKICAgICBzaG93UGFuZWwocHJvZmlsZXNQYW5lbE5hbWUpOwogfQotCi12b2lkIEluc3BlY3Rv ckFnZW50OjpzaG93U2NyaXB0c1BhbmVsKCkKLXsKLSAgICBzaG93UGFuZWwoc2NyaXB0c1BhbmVs TmFtZSk7Ci19CiAjZW5kaWYKIAogdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZXZhbHVhdGVGb3JUZXN0 SW5Gcm9udGVuZChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBzY3JpcHQpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCmluZGV4IDU4MGE3YjYuLjhhMjJjYzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCkBAIC0xODQsNyArMTg0 LDYgQEAgcHVibGljOgogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgdm9p ZCBzaG93UHJvZmlsZXNQYW5lbCgpOwotICAgIHZvaWQgc2hvd1NjcmlwdHNQYW5lbCgpOwogI2Vu ZGlmCiAKICAgICAvLyBHZW5lcmljIGNvZGUgY2FsbGVkIGZyb20gY3VzdG9tIGltcGxlbWVudGF0 aW9ucy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcAppbmRleCA2ODBkMjU3Li4xZDUyZTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC01OCw2ICs1OCw3IEBAIEluc3BlY3Rv ckNvbnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xp ZW50KiBpbnNwZWN0b3JDCiAgICAgLCBtX2luc3BlY3RvckFnZW50KG5ldyBJbnNwZWN0b3JBZ2Vu dChwYWdlLCBpbnNwZWN0b3JDbGllbnQsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmdldCgpKSkK ICAgICAsIG1faW5zcGVjdG9yQ2xpZW50KGluc3BlY3RvckNsaWVudCkKICAgICAsIG1fb3Blbmlu Z0Zyb250ZW5kKGZhbHNlKQorICAgICwgbV9zdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmdXaGVu RnJvbnRlZElzQ29ubmVjdGVkKGZhbHNlKQogewogfQogCkBAIC0xMzcsNiArMTM4LDExIEBAIHZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKCkKICNlbmRpZgogICAgICAg ICBtX2luc3BlY3RvckFnZW50LT5ydW50aW1lQWdlbnQoKSwKICAgICAgICAgbV9pbnNwZWN0b3JB Z2VudC0+dGltZWxpbmVBZ2VudCgpKTsKKworICAgIGlmIChtX3N0YXJ0VXNlckluaXRpYXRlZERl YnVnZ2luZ1doZW5Gcm9udGVkSXNDb25uZWN0ZWQpIHsKKyAgICAgICAgbV9pbnNwZWN0b3JGcm9u dGVuZC0+aW5zcGVjdG9yKCktPnN0YXJ0VXNlckluaXRpYXRlZERlYnVnZ2luZygpOworICAgICAg ICBtX3N0YXJ0VXNlckluaXRpYXRlZERlYnVnZ2luZ1doZW5Gcm9udGVkSXNDb25uZWN0ZWQgPSBm YWxzZTsKKyAgICB9CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZy b250ZW5kKCkKQEAgLTI3NSw4ICsyODEsMTEgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpz aG93QW5kRW5hYmxlRGVidWdnZXIoKQogICAgIGlmICghZW5hYmxlZCgpKQogICAgICAgICByZXR1 cm47CiAgICAgc2hvdygpOwotICAgIG1faW5zcGVjdG9yQWdlbnQtPnNob3dTY3JpcHRzUGFuZWwo KTsKLSAgICBtX2luc3BlY3RvckFnZW50LT5kZWJ1Z2dlckFnZW50KCktPnN0YXJ0VXNlckluaXRp YXRlZERlYnVnZ2luZygpOworCisgICAgaWYgKG1faW5zcGVjdG9yRnJvbnRlbmQpCisgICAgICAg IG1faW5zcGVjdG9yRnJvbnRlbmQtPmluc3BlY3RvcigpLT5zdGFydFVzZXJJbml0aWF0ZWREZWJ1 Z2dpbmcoKTsKKyAgICBlbHNlCisgICAgICAgIG1fc3RhcnRVc2VySW5pdGlhdGVkRGVidWdnaW5n V2hlbkZyb250ZWRJc0Nvbm5lY3RlZCA9IHRydWU7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlzYWJsZURlYnVnZ2VyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5oCmluZGV4IDkzNTMyMzIuLmYzOGViM2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtMTEwLDYgKzExMCw3 IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPEluc3BlY3RvckZyb250ZW5kPiBtX2luc3BlY3RvckZy b250ZW5kOwogICAgIEluc3BlY3RvckNsaWVudCogbV9pbnNwZWN0b3JDbGllbnQ7CiAgICAgYm9v bCBtX29wZW5pbmdGcm9udGVuZDsKKyAgICBib29sIG1fc3RhcnRVc2VySW5pdGlhdGVkRGVidWdn aW5nV2hlbkZyb250ZWRJc0Nvbm5lY3RlZDsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCBiMjI5M2Y2Li43 OWI4MjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuY3BwCkBAIC00NSw3ICs0NSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog bmFtZXNwYWNlIERlYnVnZ2VyQWdlbnRTdGF0ZSB7CiBzdGF0aWMgY29uc3QgY2hhciBkZWJ1Z2dl ckVuYWJsZWRbXSA9ICJkZWJ1Z2dlckVuYWJsZWQiOwotc3RhdGljIGNvbnN0IGNoYXIgZW5hYmxl V2hlblNob3duW10gPSAiZGVidWdnZXJFbmFibGVXaGVuU2hvd24iOwogc3RhdGljIGNvbnN0IGNo YXIgamF2YVNjcmlwdEJyZWFrcG9pbnRzW10gPSAiamF2YVNjcmlwdEJyZWFrb3BpbnRzIjsKIH07 CiAKQEAgLTcxLDE0ICs3MCw2IEBAIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6On5JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50KCkKICAgICBBU1NFUlQoIW1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVj dG9yRGVidWdnZXJBZ2VudCgpKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpz dGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmcoKQotewotICAgIGlmIChtX2Zyb250ZW5kKQotICAg ICAgICBlbmFibGUoZmFsc2UpOwotICAgIGVsc2UKLSAgICAgICAgbV9pbnNwZWN0b3JTdGF0ZS0+ c2V0Qm9vbGVhbihEZWJ1Z2dlckFnZW50U3RhdGU6OmVuYWJsZVdoZW5TaG93biwgdHJ1ZSk7Ci19 Ci0KIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZW5hYmxlKGJvb2wgcmVzdG9yaW5nRnJv bVN0YXRlKQogewogICAgIEFTU0VSVChtX2Zyb250ZW5kKTsKQEAgLTEyOCwxMSArMTE5LDYgQEAg dm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXN0b3JlKCkKIHZvaWQgSW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogewog ICAgIG1fZnJvbnRlbmQgPSBmcm9udGVuZC0+ZGVidWdnZXIoKTsKLQotICAgIGlmIChtX2luc3Bl Y3RvclN0YXRlLT5nZXRCb29sZWFuKERlYnVnZ2VyQWdlbnRTdGF0ZTo6ZW5hYmxlV2hlblNob3du KSkgewotICAgICAgICBtX2luc3BlY3RvclN0YXRlLT5zZXRCb29sZWFuKERlYnVnZ2VyQWdlbnRT dGF0ZTo6ZW5hYmxlV2hlblNob3duLCBmYWxzZSk7Ci0gICAgICAgIGVuYWJsZShmYWxzZSk7Ci0g ICAgfQogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQpA QCAtMTQ1LDcgKzEzMSw2IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y2xlYXJGcm9u dGVuZCgpCiAgICAgLy8gcmVtZW1iZXIgdGhpcyBzdGF0ZSB0byByZS1lbmFibGUgZGVidWdnZXIg b24gdGhlIG5leHQgd2luZG93CiAgICAgLy8gb3BlbmluZy4KICAgICBkaXNhYmxlKCk7Ci0gICAg bV9pbnNwZWN0b3JTdGF0ZS0+c2V0Qm9vbGVhbihEZWJ1Z2dlckFnZW50U3RhdGU6OmVuYWJsZVdo ZW5TaG93biwgdHJ1ZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6YWN0aXZh dGVCcmVha3BvaW50cyhFcnJvclN0cmluZyopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAppbmRleCA4YjgyNWI2Li43ODk2ZDRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgK QEAgLTY3LDcgKzY3LDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKiwgSW5zcGVjdG9yU3Rh dGUqLCBQYWdlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CiAgICAgdmlydHVhbCB+SW5zcGVj dG9yRGVidWdnZXJBZ2VudCgpOwogCi0gICAgdm9pZCBzdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dp bmcoKTsKICAgICB2b2lkIGVuYWJsZShFcnJvclN0cmluZyopIHsgZW5hYmxlKGZhbHNlKTsgfQog ICAgIHZvaWQgZGlzYWJsZShFcnJvclN0cmluZyopIHsgZGlzYWJsZSgpOyB9CiAgICAgdm9pZCBk aXNhYmxlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCmluZGV4IDhkYmEwODQuLjQ3MTI4ZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTk2LDcgKzE5 Niw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f cHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQnJlYWtwb2ludFJlbW92ZWQsIHRoaXMuX2JyZWFrcG9p bnRSZW1vdmVkLCB0aGlzKTsKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5DYWxs RnJhbWVTZWxlY3RlZCwgdGhpcy5fY2FsbEZyYW1lU2VsZWN0ZWQsIHRoaXMpOwogCi0gICAgaWYg KFByZWZlcmVuY2VzLmRlYnVnZ2VyQWx3YXlzRW5hYmxlZCB8fCBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MuZGVidWdnZXJFbmFibGVkKQorICAgIHZhciBlbmFibGVEZWJ1Z2dlciA9IFByZWZlcmVuY2Vz LmRlYnVnZ2VyQWx3YXlzRW5hYmxlZCB8fCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGVidWdnZXJF bmFibGVkOworICAgIGlmIChlbmFibGVEZWJ1Z2dlciB8fCBJbnNwZWN0b3JGcm9udGVuZEhvc3Qu bG9hZFNlc3Npb25TZXR0aW5nKCJkZWJ1Z2dlci1lbmFibGVkIikgPT09ICJ0cnVlIikKICAgICAg ICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZW5hYmxlRGVidWdnZXIoKTsKIH0KIApAQCAt NDA1LDYgKzQwNiw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgICAgIGlmICh0aGlzLl9kZWJ1Z2dlckVuYWJsZWQpCiAgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVTZXNzaW9uU2V0dGluZygiZGVi dWdnZXItZW5hYmxlZCIsICJ0cnVlIik7CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyRW5hYmxlZCA9 IHRydWU7CiAgICAgICAgIHRoaXMucmVzZXQodHJ1ZSk7CiAgICAgfSwKQEAgLTQxNCw2ICs0MTcs NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KCF0aGlzLl9kZWJ1Z2dlckVuYWJsZWQpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAg SW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVTZXNzaW9uU2V0dGluZygiZGVidWdnZXItZW5hYmxl ZCIsICJmYWxzZSIpOwogICAgICAgICB0aGlzLl9kZWJ1Z2dlckVuYWJsZWQgPSBmYWxzZTsKICAg ICAgICAgdGhpcy5yZXNldCh0cnVlKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBkMjc2ODVjLi4xMTNhOGYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAt OTg1LDYgKzk4NSwxMiBAQCBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsID0gZnVuY3Rpb24ocGFuZWwp CiAgICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVsc1twYW5lbF07CiB9CiAKK1dlYklu c3BlY3Rvci5zdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmcgPSBmdW5jdGlvbigpCit7CisgICAg dGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVscy5zY3JpcHRzOworICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmVuYWJsZURlYnVnZ2VyKCk7Cit9CisKIFdlYkluc3BlY3Rvci5kb21D b250ZW50RXZlbnRGaXJlZCA9IGZ1bmN0aW9uKHRpbWUpCiB7CiAgICAgdGhpcy5wYW5lbHMuYXVk aXRzLm1haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0gdGltZTsK