129655 2014-03-03 20:11:45 -0800 Inspector does not restore breakpoints after a page reload 2014-03-04 20:38:37 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam bburg bburg commit-queue graouts joepeck mark.lam timothy webkit-bug-importer oldest_to_newest 986651 0 225731 mark.lam 2014-03-03 20:11:45 -0800 Created attachment 225731 reproduction test case Steps to reproduce: 1. Untar the attached test case. You should get a debugger-statement.html and debugger-statement.js. Load debugger-statement.html in the browser. 2. Open the WebInspector. 3. Set breakpoint in debugger-statement.js at lines 2 and 4. 4. Reload the page in the browser. After the reload, the breakpoints are not re-enabled. I put some prints in JSC::Debugger::setBreakpoint() and JSC::Debugger::clearBreakpoint(), and confirmed that the breakpoints were set, and then cleared when I did the reload. However, after the reload, setBreakpoint() was not called to restore the breakpoints. This means the issue happens above JSC. 986652 1 webkit-bug-importer 2014-03-03 20:12:16 -0800 <rdar://problem/16219327> 987032 2 225829 bburg 2014-03-04 16:29:11 -0800 Created attachment 225829 the patch 987035 3 225829 mark.lam 2014-03-04 16:33:00 -0800 Comment on attachment 225829 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=225829&action=review > Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:723 > + scriptDebugServer().continueProgram(); > + clearDebuggerBreakpointState(); Shouldn't you clear the breakpoints before continuing the program? 987041 4 bburg 2014-03-04 16:51:37 -0800 (In reply to comment #3) > (From update of attachment 225829 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=225829&action=review > > > Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:723 > > + scriptDebugServer().continueProgram(); > > + clearDebuggerBreakpointState(); > > Shouldn't you clear the breakpoints before continuing the program? That call is redundant with the clear/continue inside clearDebuggerBreakpointState(), and can be removed. 987047 5 225829 joepeck 2014-03-04 16:58:16 -0800 Comment on attachment 225829 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=225829&action=review > Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:713 > + ErrorString dummyError; > setOverlayMessage(&dummyError, nullptr); setOverlayMessage currently does nothing. And I wouldn't associate this with "clearDebuggerBreakpointState". Maybe we should just remove it. Otherwise, leave it here and we will clean it up later. >> Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:723 >> + clearDebuggerBreakpointState(); > > Shouldn't you clear the breakpoints before continuing the program? I agree with Mark's comment. In fact, clearDebuggerBreakpointState already does a continue program, so you can remove the line from here. r=me with that change. 987086 6 225845 bburg 2014-03-04 19:35:08 -0800 Created attachment 225845 the patch (revised) 987096 7 225845 commit-queue 2014-03-04 20:38:35 -0800 Comment on attachment 225845 the patch (revised) Clearing flags on attachment: 225845 Committed r165093: <http://trac.webkit.org/changeset/165093> 987097 8 commit-queue 2014-03-04 20:38:37 -0800 All reviewed patches have been landed. Closing bug. 225731 2014-03-03 20:11:45 -0800 2014-03-03 20:11:45 -0800 reproduction test case debugger-statement-testcase.tgz application/x-gzip 290 mark.lam H4sIANDeFFMAA+3Uy1KDMBQG4K55ijOs2oU2IQQWUFa61WdIubRVLk4Ijo7juxuCdaPVDdOOM/+3 OTmQhGSSQ1Fuh92u1Fe9UaZsytZc701TL+bEGIvCkMYYR9JFFky5w0NJPBBMchlzERPjkQjkgtis qzhhsBvXdimN0o+1ak72s92q6pd5pq3QV/wn0vG0M48o3ZeqGBu22ef68GSo1/nGL75fkIfez9L1 1MkNXR/HptuueM3sAxc9+8LNfulNwkk/Hu/M3/iz/rn4rH8RCxnZ+pdxzFH/51ANbW4OXUtV1y1X 9OZ+AM9K0wttiCUuPd6RKVN1qc3Sv7m/u/VXiffueW5ogioHAAAAAAAAAAAAAAAAAAAAuIQP3Xo0 MAAoAAA= 225829 2014-03-04 16:29:11 -0800 2014-03-04 19:35:07 -0800 the patch bug-129655-20140304162910.patch text/plain 7533 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 NDVlYzRlMzBjYzAwODUyMjE1NDViMWJkZmFjMTM3MDJlMzc3MmIwLi5jMjNlY2VmNjE4Y2E2NDIy MzI2MDU4YmQ1ZDE0NDc0NjY0OGJmNGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNC0wMy0wNCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBJbnNwZWN0b3IgZG9lcyBub3QgcmVzdG9yZSBicmVha3BvaW50cyBhZnRlciBhIHBh Z2UgcmVsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjk2NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggYSByZWdyZXNzaW9uIGludHJvZHVjZWQgYnkgcjE2MjA5NiB0aGF0IGVycm9uZW91c2x5 IHJlbW92ZWQKKyAgICAgICAgdGhlIGluc3BlY3RvciBiYWNrZW5kJ3MgbWFwcGluZyBvZiBmaWxl cyB0byBicmVha3BvaW50cyB3aGVuZXZlciB0aGUKKyAgICAgICAgZ2xvYmFsIG9iamVjdCB3YXMg Y2xlYXJlZC4KKworICAgICAgICBUaGUgaW5zcGVjdG9yJ3MgYnJlYWtwb2ludCBtYXBwaW5ncyBz aG91bGQgb25seSBiZSBjbGVhcmVkIHdoZW4gdGhlCisgICAgICAgIGRlYnVnZ2VyIGFnZW50IGlz IGRpc2FibGVkIG9yIGRlc3Ryb3llZC4gV2Ugc2hvdWxkIG9ubHkgY2xlYXIgdGhlCisgICAgICAg IGRlYnVnZ2VyJ3MgYnJlYWtwb2ludCBzdGF0ZSB3aGVuIHRoZSBnbG9iYWwgb2JqZWN0IGlzIGNs ZWFyZWQuCisKKyAgICAgICAgVG8gbWFrZSBpdCBjbGVhcmVyIHdoYXQgc3RhdGUgaXMgYmVpbmcg Y2xlYXJlZCwgdGhlIHR3byBjYXNlcyBoYXZlCisgICAgICAgIGJlZW4gc3BsaXQgaW50byBzZXBh cmF0ZSBtZXRob2RzLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1 Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlzYWJsZSk6CisgICAgICAgIChJbnNwZWN0b3I6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6 OmNsZWFySW5zcGVjdG9yQnJlYWtwb2ludFN0YXRlKToKKyAgICAgICAgKEluc3BlY3Rvcjo6SW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6Y2xlYXJEZWJ1Z2dlckJyZWFrcG9pbnRTdGF0ZSk6CisgICAg ICAgIChJbnNwZWN0b3I6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZENsZWFyR2xvYmFsT2Jq ZWN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu aDoKKwogMjAxNC0wMy0wNCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgU3BhbSBzdGF0aWMgYnJhbmNoIHByZWRpY3Rpb24gaGludHMgb24gSlMgYmluZGluZ3Mu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2ZDhjNGQwNTU3N2Y2ZGMyYjM2MmQyNGFkOTk0 OTJjYzIyMGZkMTFhLi4wOGIyZDkzMWI3M2YwNzYyNjg2ZDA3NWUzMTFjNzIyNDU2ZjZkNWMzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNC0wMy0wNCAgQnJp YW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKworICAgICAgICBJbnNwZWN0b3IgZG9lcyBub3Qg cmVzdG9yZSBicmVha3BvaW50cyBhZnRlciBhIHBhZ2UgcmVsb2FkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk2NTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggc29tZSBjb25zb2xlIGFzc2VydHMg dGhhdCBmaXJlIHdoZW4gYnJlYWtwb2ludHMgcmVzb2x2ZS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuYnJlYWtwb2ludFJlc29sdmVkKToKKyAgICAg ICAgVGhpcyBoYWQgYSB0eXBvLCBpdCBzaG91bGQgYmUgYGJyZWFrcG9pbnQuaWRlbnRpZmllcmAu CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5zY3JpcHRE aWRQYXJzZSk6CisgICAgICAgIFNvbWV0aW1lcyB0aGUgYHVybGAgcGFyYW1ldGVyIGlzIGVtcHR5 IGluc3RlYWQgb2YgbnVsbC4KKwogMjAxNC0wMy0wNCAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlu b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBXZWJJbnNwZWN0 b3IuRXZlbnRIYW5kbGVyIGluIGZhdm9yIG9mIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IDRkMGJiY2QyZmQzNjBhMDc3 OWFkN2E5NTU4MjE5YzQyYTk0MGQ1OGQuLjdkMDI4MTVjNTgyNWU5ZDY3Y2EwNzkyNWI5NWE3Mzg4 NGJhNGEzOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0xMDgsMTAg KzEwOCwxMCBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpc2FibGUoYm9vbCBpc0Jl aW5nRGVzdHJveWVkKQogICAgIGlmICghbV9lbmFibGVkKQogICAgICAgICByZXR1cm47CiAKLSAg ICBtX2phdmFTY3JpcHRCcmVha3BvaW50cy5jbGVhcigpOwotCiAgICAgc3RvcExpc3RlbmluZ1Nj cmlwdERlYnVnU2VydmVyKGlzQmVpbmdEZXN0cm95ZWQpOwotICAgIGNsZWFyUmVzb2x2ZWRCcmVh a3BvaW50U3RhdGUoKTsKKyAgICBjbGVhckluc3BlY3RvckJyZWFrcG9pbnRTdGF0ZSgpOworCisg ICAgQVNTRVJUKG1famF2YVNjcmlwdEJyZWFrcG9pbnRzLmlzRW1wdHkoKSk7CiAKICAgICBpZiAo bV9saXN0ZW5lcikKICAgICAgICAgbV9saXN0ZW5lci0+ZGVidWdnZXJXYXNEaXNhYmxlZCgpOwpA QCAtNjg2LDcgKzY4Niw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6YnJlYWtQcm9n cmFtKEluc3BlY3RvckRlYnVnZ2VyRnJvbnRlbmREaXNwYXRjaGVyOjpSCiAgICAgc2NyaXB0RGVi dWdTZXJ2ZXIoKS5icmVha1Byb2dyYW0oKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpjbGVhclJlc29sdmVkQnJlYWtwb2ludFN0YXRlKCkKK3ZvaWQgSW5zcGVjdG9yRGVidWdn ZXJBZ2VudDo6Y2xlYXJJbnNwZWN0b3JCcmVha3BvaW50U3RhdGUoKQogewogICAgIEVycm9yU3Ry aW5nIGR1bW15RXJyb3I7CiAgICAgVmVjdG9yPFN0cmluZz4gYnJlYWtwb2ludElkZW50aWZpZXJz OwpAQCAtNjk0LDcgKzY5NCwxMiBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFy UmVzb2x2ZWRCcmVha3BvaW50U3RhdGUoKQogICAgIGZvciAoY29uc3QgU3RyaW5nJiBpZGVudGlm aWVyIDogYnJlYWtwb2ludElkZW50aWZpZXJzKQogICAgICAgICByZW1vdmVCcmVha3BvaW50KCZk dW1teUVycm9yLCBpZGVudGlmaWVyKTsKIAotICAgIHNjcmlwdERlYnVnU2VydmVyKCkuY29udGlu dWVQcm9ncmFtKCk7CisgICAgY2xlYXJEZWJ1Z2dlckJyZWFrcG9pbnRTdGF0ZSgpOworfQorCit2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyRGVidWdnZXJCcmVha3BvaW50U3RhdGUo KQoreworICAgIHNjcmlwdERlYnVnU2VydmVyKCkuY2xlYXJCcmVha3BvaW50cygpOwogCiAgICAg bV9wYXVzZWRTY3JpcHRTdGF0ZSA9IG51bGxwdHI7CiAgICAgbV9jdXJyZW50Q2FsbFN0YWNrID0g RGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUoKTsKQEAgLTcwMyw3ICs3MDgsMjIgQEAgdm9pZCBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpjbGVhclJlc29sdmVkQnJlYWtwb2ludFN0YXRlKCkKICAgICBt X2NvbnRpbnVlVG9Mb2NhdGlvbkJyZWFrcG9pbnRJRCA9IEpTQzo6bm9CcmVha3BvaW50SUQ7CiAg ICAgY2xlYXJCcmVha0RldGFpbHMoKTsKICAgICBtX2phdmFTY3JpcHRQYXVzZVNjaGVkdWxlZCA9 IGZhbHNlOworCisgICAgRXJyb3JTdHJpbmcgZHVtbXlFcnJvcjsKICAgICBzZXRPdmVybGF5TWVz c2FnZSgmZHVtbXlFcnJvciwgbnVsbHB0cik7CisKKyAgICBzY3JpcHREZWJ1Z1NlcnZlcigpLmNv bnRpbnVlUHJvZ3JhbSgpOworfQorCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZENs ZWFyR2xvYmFsT2JqZWN0KCkKK3sKKyAgICAvLyBDbGVhciBicmVha3BvaW50cyBmcm9tIHRoZSBk ZWJ1Z2dlciwgYnV0IGtlZXAgdGhlIGluc3BlY3RvcidzIG1vZGVsIG9mIHdoaWNoCisgICAgLy8g cGFnZXMgaGF2ZSB3aGF0IGJyZWFrcG9pbnRzLCBhcyB0aGUgbWFwcGluZyBpcyBvbmx5IHNlbnQg dG8gRGVidWdnZXJBZ2VudCBvbmNlLgorICAgIHNjcmlwdERlYnVnU2VydmVyKCkuY29udGludWVQ cm9ncmFtKCk7CisgICAgY2xlYXJEZWJ1Z2dlckJyZWFrcG9pbnRTdGF0ZSgpOworCisgICAgaWYg KG1fZnJvbnRlbmREaXNwYXRjaGVyKQorICAgICAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+Z2xv YmFsT2JqZWN0Q2xlYXJlZCgpOwogfQogCiBib29sIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmFz c2VydFBhdXNlZChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcpCkBAIC03MjIsMTMgKzc0Miw2IEBA IHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y2xlYXJCcmVha0RldGFpbHMoKQogICAgIG1f YnJlYWtBdXhEYXRhID0gbnVsbHB0cjsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpkaWRDbGVhckdsb2JhbE9iamVjdCgpCi17Ci0gICAgaWYgKG1fZnJvbnRlbmREaXNwYXRjaGVy KQotICAgICAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+Z2xvYmFsT2JqZWN0Q2xlYXJlZCgpOwot Ci0gICAgY2xlYXJSZXNvbHZlZEJyZWFrcG9pbnRTdGF0ZSgpOwotfQogCiB9IC8vIG5hbWVzcGFj ZSBJbnNwZWN0b3IKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IDI0Y2UxNjZm MGU4Y2QwNWU0NzkxMTgxOTQwNDQzM2U0MzI0ODVlMTAuLjBjNjRmNjg0ZDRiY2YxNmQwMzkxNjQy ZTU3OTgwMTRiNDU3Njc4NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTEz OSw3ICsxMzksOCBAQCBwcml2YXRlOgogCiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVC dWlsZGVyOjpEZWJ1Z2dlcjo6TG9jYXRpb24+IHJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmlu ZyYgYnJlYWtwb2ludElkZW50aWZpZXIsIEpTQzo6U291cmNlSUQsIGNvbnN0IFNjcmlwdEJyZWFr cG9pbnQmKTsKICAgICBib29sIGFzc2VydFBhdXNlZChFcnJvclN0cmluZyopOwotICAgIHZvaWQg Y2xlYXJSZXNvbHZlZEJyZWFrcG9pbnRTdGF0ZSgpOworICAgIHZvaWQgY2xlYXJEZWJ1Z2dlckJy ZWFrcG9pbnRTdGF0ZSgpOworICAgIHZvaWQgY2xlYXJJbnNwZWN0b3JCcmVha3BvaW50U3RhdGUo KTsKICAgICB2b2lkIGNsZWFyQnJlYWtEZXRhaWxzKCk7CiAKICAgICBib29sIGJyZWFrcG9pbnRB Y3Rpb25zRnJvbVByb3RvY29sKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFycmF5PiYg YWN0aW9ucywgVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24+KiByZXN1bHQpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVi dWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCmluZGV4IGFkZTc1ODIyZmQ4YmM5YTMxMzliNWQx ODQ4YzZhYjdhMzdmM2ZhZGMuLmU0NzNhNTE0M2ZkYmRjNWI4MDZlNzYxYzQwZWUzNDg4NTQ1YmM1 ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKQEAgLTMwNSw3ICszMDUs NyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKCFicmVha3BvaW50KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGNvbnNvbGUu YXNzZXJ0KGJyZWFrcG9pbnQuaWQgPT09IGJyZWFrcG9pbnRJZGVudGlmaWVyKTsKKyAgICAgICAg Y29uc29sZS5hc3NlcnQoYnJlYWtwb2ludC5pZGVudGlmaWVyID09PSBicmVha3BvaW50SWRlbnRp Zmllcik7CiAKICAgICAgICAgYnJlYWtwb2ludC5yZXNvbHZlZCA9IHRydWU7CiAgICAgfSwKQEAg LTQxMSw3ICs0MTEsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIC8vIERvbid0IGFkZCB0aGUgc2NyaXB0IGFnYWluIGlmIGl0IGlz IGFscmVhZHkga25vd24uCiAgICAgICAgIGlmICh0aGlzLl9zY3JpcHRJZE1hcFtzY3JpcHRJZGVu dGlmaWVyXSkgewotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fc2NyaXB0SWRNYXBb c2NyaXB0SWRlbnRpZmllcl0udXJsID09PSB1cmwpOworICAgICAgICAgICAgY29uc29sZS5hc3Nl cnQodGhpcy5fc2NyaXB0SWRNYXBbc2NyaXB0SWRlbnRpZmllcl0udXJsID09PSAodXJsIHx8IG51 bGwpKTsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NjcmlwdElkTWFwW3Njcmlw dElkZW50aWZpZXJdLnJhbmdlLnN0YXJ0TGluZSA9PT0gc3RhcnRMaW5lKTsKICAgICAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NjcmlwdElkTWFwW3NjcmlwdElkZW50aWZpZXJdLnJhbmdl LnN0YXJ0Q29sdW1uID09PSBzdGFydENvbHVtbik7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2Vy dCh0aGlzLl9zY3JpcHRJZE1hcFtzY3JpcHRJZGVudGlmaWVyXS5yYW5nZS5lbmRMaW5lID09PSBl bmRMaW5lKTsK 225845 2014-03-04 19:35:08 -0800 2014-03-04 20:38:35 -0800 the patch (revised) bug-129655-20140304193508.patch text/plain 7435 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NzE4YmY3YjM1Y2RjOTkyN2M2MDgyMWQ1NzI4YzEyNmQ1ZWIyOWMwLi4xMmVlNmRkMjJlYTg5MGVi YjEwNDZjN2Y4NWFjOTczN2MxZjIwOGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNC0wMy0wNCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBJbnNwZWN0b3IgZG9lcyBub3QgcmVzdG9yZSBicmVha3BvaW50cyBhZnRlciBhIHBh Z2UgcmVsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjk2NTUKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAg ICAgRml4IGEgcmVncmVzc2lvbiBpbnRyb2R1Y2VkIGJ5IHIxNjIwOTYgdGhhdCBlcnJvbmVvdXNs eSByZW1vdmVkCisgICAgICAgIHRoZSBpbnNwZWN0b3IgYmFja2VuZCdzIG1hcHBpbmcgb2YgZmls ZXMgdG8gYnJlYWtwb2ludHMgd2hlbmV2ZXIgdGhlCisgICAgICAgIGdsb2JhbCBvYmplY3Qgd2Fz IGNsZWFyZWQuCisKKyAgICAgICAgVGhlIGluc3BlY3RvcidzIGJyZWFrcG9pbnQgbWFwcGluZ3Mg c2hvdWxkIG9ubHkgYmUgY2xlYXJlZCB3aGVuIHRoZQorICAgICAgICBkZWJ1Z2dlciBhZ2VudCBp cyBkaXNhYmxlZCBvciBkZXN0cm95ZWQuIFdlIHNob3VsZCBvbmx5IGNsZWFyIHRoZQorICAgICAg ICBkZWJ1Z2dlcidzIGJyZWFrcG9pbnQgc3RhdGUgd2hlbiB0aGUgZ2xvYmFsIG9iamVjdCBpcyBj bGVhcmVkLgorCisgICAgICAgIFRvIG1ha2UgaXQgY2xlYXJlciB3aGF0IHN0YXRlIGlzIGJlaW5n IGNsZWFyZWQsIHRoZSB0d28gY2FzZXMgaGF2ZQorICAgICAgICBiZWVuIHNwbGl0IGludG8gc2Vw YXJhdGUgbWV0aG9kcy4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6Okluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OmRpc2FibGUpOgorICAgICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpjbGVhckluc3BlY3RvckJyZWFrcG9pbnRTdGF0ZSk6CisgICAgICAgIChJbnNwZWN0b3I6Oklu c3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyRGVidWdnZXJCcmVha3BvaW50U3RhdGUpOgorICAg ICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRDbGVhckdsb2JhbE9i amVjdCk6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 Lmg6CisKIDIwMTQtMDMtMDQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIFN0cmVhbWxpbmUgSlNWYWx1ZTo6Z2V0KCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpp bmRleCA2ZDhjNGQwNTU3N2Y2ZGMyYjM2MmQyNGFkOTk0OTJjYzIyMGZkMTFhLi4xMWZmNWI4ZGYw ODU1MWNjZjY3YmVmNmQyNjI3YmZjZDcwZTI4YWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAxNC0wMy0wNCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNv bT4KKworICAgICAgICBJbnNwZWN0b3IgZG9lcyBub3QgcmVzdG9yZSBicmVha3BvaW50cyBhZnRl ciBhIHBhZ2UgcmVsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjk2NTUKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisK KyAgICAgICAgRml4IHNvbWUgY29uc29sZSBhc3NlcnRzIHRoYXQgZmlyZSB3aGVuIGJyZWFrcG9p bnRzIHJlc29sdmUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVn Z2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIucHJv dG90eXBlLmJyZWFrcG9pbnRSZXNvbHZlZCk6CisgICAgICAgIFRoaXMgaGFkIGEgdHlwbywgaXQg c2hvdWxkIGJlIGBicmVha3BvaW50LmlkZW50aWZpZXJgLgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuc2NyaXB0RGlkUGFyc2UpOgorICAgICAgICBTb21l dGltZXMgdGhlIGB1cmxgIHBhcmFtZXRlciBpcyBlbXB0eSBpbnN0ZWFkIG9mIG51bGwuCisKIDIw MTQtMDMtMDQgIERpZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgV2ViSW5zcGVjdG9yLkV2ZW50SGFuZGxlciBpbiBmYXZv ciBvZiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lclNldApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcAppbmRleCA0ZDBiYmNkMmZkMzYwYTA3NzlhZDdhOTU1ODIxOWM0MmE5NDBkNThk Li5kYTU0MDg1ODMyODlkMGNjNjkzZTQ0NGNkMzQzMzQxMTFkODU4NzUyIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMTA4LDEwICsxMDgsMTAgQEAgdm9pZCBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpkaXNhYmxlKGJvb2wgaXNCZWluZ0Rlc3Ryb3llZCkKICAgICBpZiAo IW1fZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9qYXZhU2NyaXB0QnJlYWtwb2lu dHMuY2xlYXIoKTsKLQogICAgIHN0b3BMaXN0ZW5pbmdTY3JpcHREZWJ1Z1NlcnZlcihpc0JlaW5n RGVzdHJveWVkKTsKLSAgICBjbGVhclJlc29sdmVkQnJlYWtwb2ludFN0YXRlKCk7CisgICAgY2xl YXJJbnNwZWN0b3JCcmVha3BvaW50U3RhdGUoKTsKKworICAgIEFTU0VSVChtX2phdmFTY3JpcHRC cmVha3BvaW50cy5pc0VtcHR5KCkpOwogCiAgICAgaWYgKG1fbGlzdGVuZXIpCiAgICAgICAgIG1f bGlzdGVuZXItPmRlYnVnZ2VyV2FzRGlzYWJsZWQoKTsKQEAgLTY4Niw3ICs2ODYsNyBAQCB2b2lk IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmJyZWFrUHJvZ3JhbShJbnNwZWN0b3JEZWJ1Z2dlckZy b250ZW5kRGlzcGF0Y2hlcjo6UgogICAgIHNjcmlwdERlYnVnU2VydmVyKCkuYnJlYWtQcm9ncmFt KCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y2xlYXJSZXNvbHZlZEJyZWFr cG9pbnRTdGF0ZSgpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFySW5zcGVjdG9y QnJlYWtwb2ludFN0YXRlKCkKIHsKICAgICBFcnJvclN0cmluZyBkdW1teUVycm9yOwogICAgIFZl Y3RvcjxTdHJpbmc+IGJyZWFrcG9pbnRJZGVudGlmaWVyczsKQEAgLTY5NCw3ICs2OTQsMTIgQEAg dm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjbGVhclJlc29sdmVkQnJlYWtwb2ludFN0YXRl KCkKICAgICBmb3IgKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciA6IGJyZWFrcG9pbnRJZGVudGlm aWVycykKICAgICAgICAgcmVtb3ZlQnJlYWtwb2ludCgmZHVtbXlFcnJvciwgaWRlbnRpZmllcik7 CiAKLSAgICBzY3JpcHREZWJ1Z1NlcnZlcigpLmNvbnRpbnVlUHJvZ3JhbSgpOworICAgIGNsZWFy RGVidWdnZXJCcmVha3BvaW50U3RhdGUoKTsKK30KKwordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpjbGVhckRlYnVnZ2VyQnJlYWtwb2ludFN0YXRlKCkKK3sKKyAgICBzY3JpcHREZWJ1Z1Nl cnZlcigpLmNsZWFyQnJlYWtwb2ludHMoKTsKIAogICAgIG1fcGF1c2VkU2NyaXB0U3RhdGUgPSBu dWxscHRyOwogICAgIG1fY3VycmVudENhbGxTdGFjayA9IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVl KCk7CkBAIC03MDMsNyArNzA4LDE4IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y2xl YXJSZXNvbHZlZEJyZWFrcG9pbnRTdGF0ZSgpCiAgICAgbV9jb250aW51ZVRvTG9jYXRpb25CcmVh a3BvaW50SUQgPSBKU0M6Om5vQnJlYWtwb2ludElEOwogICAgIGNsZWFyQnJlYWtEZXRhaWxzKCk7 CiAgICAgbV9qYXZhU2NyaXB0UGF1c2VTY2hlZHVsZWQgPSBmYWxzZTsKLSAgICBzZXRPdmVybGF5 TWVzc2FnZSgmZHVtbXlFcnJvciwgbnVsbHB0cik7CisKKyAgICBzY3JpcHREZWJ1Z1NlcnZlcigp LmNvbnRpbnVlUHJvZ3JhbSgpOworfQorCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRp ZENsZWFyR2xvYmFsT2JqZWN0KCkKK3sKKyAgICAvLyBDbGVhciBicmVha3BvaW50cyBmcm9tIHRo ZSBkZWJ1Z2dlciwgYnV0IGtlZXAgdGhlIGluc3BlY3RvcidzIG1vZGVsIG9mIHdoaWNoCisgICAg Ly8gcGFnZXMgaGF2ZSB3aGF0IGJyZWFrcG9pbnRzLCBhcyB0aGUgbWFwcGluZyBpcyBvbmx5IHNl bnQgdG8gRGVidWdnZXJBZ2VudCBvbmNlLgorICAgIGNsZWFyRGVidWdnZXJCcmVha3BvaW50U3Rh dGUoKTsKKworICAgIGlmIChtX2Zyb250ZW5kRGlzcGF0Y2hlcikKKyAgICAgICAgbV9mcm9udGVu ZERpc3BhdGNoZXItPmdsb2JhbE9iamVjdENsZWFyZWQoKTsKIH0KIAogYm9vbCBJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50Ojphc3NlcnRQYXVzZWQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nKQpAQCAt NzIyLDEzICs3MzgsNiBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyQnJlYWtE ZXRhaWxzKCkKICAgICBtX2JyZWFrQXV4RGF0YSA9IG51bGxwdHI7CiB9CiAKLXZvaWQgSW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6ZGlkQ2xlYXJHbG9iYWxPYmplY3QoKQotewotICAgIGlmIChtX2Zy b250ZW5kRGlzcGF0Y2hlcikKLSAgICAgICAgbV9mcm9udGVuZERpc3BhdGNoZXItPmdsb2JhbE9i amVjdENsZWFyZWQoKTsKLQotICAgIGNsZWFyUmVzb2x2ZWRCcmVha3BvaW50U3RhdGUoKTsKLX0K IAogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu aAppbmRleCAyNGNlMTY2ZjBlOGNkMDVlNDc5MTE4MTk0MDQ0MzNlNDMyNDg1ZTEwLi4wYzY0ZjY4 NGQ0YmNmMTZkMDM5MTY0MmU1Nzk4MDE0YjQ1NzY3ODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5oCkBAIC0xMzksNyArMTM5LDggQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8 SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6RGVidWdnZXI6OkxvY2F0aW9uPiByZXNvbHZlQnJlYWtw b2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZGVudGlmaWVyLCBKU0M6OlNvdXJjZUlELCBj b25zdCBTY3JpcHRCcmVha3BvaW50Jik7CiAgICAgYm9vbCBhc3NlcnRQYXVzZWQoRXJyb3JTdHJp bmcqKTsKLSAgICB2b2lkIGNsZWFyUmVzb2x2ZWRCcmVha3BvaW50U3RhdGUoKTsKKyAgICB2b2lk IGNsZWFyRGVidWdnZXJCcmVha3BvaW50U3RhdGUoKTsKKyAgICB2b2lkIGNsZWFySW5zcGVjdG9y QnJlYWtwb2ludFN0YXRlKCk7CiAgICAgdm9pZCBjbGVhckJyZWFrRGV0YWlscygpOwogCiAgICAg Ym9vbCBicmVha3BvaW50QWN0aW9uc0Zyb21Qcm90b2NvbChFcnJvclN0cmluZyosIFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4mIGFjdGlvbnMsIFZlY3RvcjxTY3JpcHRCcmVha3BvaW50QWN0aW9uPiog cmVzdWx0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwppbmRleCBhZGU3NTgy MmZkOGJjOWEzMTM5YjVkMTg0OGM2YWI3YTM3ZjNmYWRjLi5lNDczYTUxNDNmZGJkYzViODA2ZTc2 MWM0MGVlMzQ4ODU0NWJjNWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpz CkBAIC0zMDUsNyArMzA1LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICghYnJlYWtwb2ludCkKICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICBjb25zb2xlLmFzc2VydChicmVha3BvaW50LmlkID09PSBicmVha3BvaW50SWRlbnRp Zmllcik7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnQuaWRlbnRpZmllciA9PT0g YnJlYWtwb2ludElkZW50aWZpZXIpOwogCiAgICAgICAgIGJyZWFrcG9pbnQucmVzb2x2ZWQgPSB0 cnVlOwogICAgIH0sCkBAIC00MTEsNyArNDExLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFu YWdlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICAvLyBEb24ndCBhZGQgdGhlIHNjcmlw dCBhZ2FpbiBpZiBpdCBpcyBhbHJlYWR5IGtub3duLgogICAgICAgICBpZiAodGhpcy5fc2NyaXB0 SWRNYXBbc2NyaXB0SWRlbnRpZmllcl0pIHsKLSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuX3NjcmlwdElkTWFwW3NjcmlwdElkZW50aWZpZXJdLnVybCA9PT0gdXJsKTsKKyAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NjcmlwdElkTWFwW3NjcmlwdElkZW50aWZpZXJdLnVy bCA9PT0gKHVybCB8fCBudWxsKSk7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9z Y3JpcHRJZE1hcFtzY3JpcHRJZGVudGlmaWVyXS5yYW5nZS5zdGFydExpbmUgPT09IHN0YXJ0TGlu ZSk7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9zY3JpcHRJZE1hcFtzY3JpcHRJ ZGVudGlmaWVyXS5yYW5nZS5zdGFydENvbHVtbiA9PT0gc3RhcnRDb2x1bW4pOwogICAgICAgICAg ICAgY29uc29sZS5hc3NlcnQodGhpcy5fc2NyaXB0SWRNYXBbc2NyaXB0SWRlbnRpZmllcl0ucmFu Z2UuZW5kTGluZSA9PT0gZW5kTGluZSk7Cg==