51174 2010-12-16 03:16:42 -0800 Web Inspector: status message isn't shown in call stack sidebar pane for native breakpoints 2010-12-16 15:38:56 -0800 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 323091 0 podivilov 2010-12-16 03:16:42 -0800 Web Inspector: status message isn't shown in call stack sidebar pane for native breakpoints 323092 1 76748 podivilov 2010-12-16 03:18:29 -0800 Created attachment 76748 Patch. Update CallStackSidebarPane placards and status message in the same event handler so it doesn't depend on event dispatch order. 323138 2 76748 yurys 2010-12-16 06:05:39 -0800 Comment on attachment 76748 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=76748&action=review > WebCore/inspector/front-end/BreakpointManager.js:181 > + this._lastHitBreakpointView = breakpointView; Breakpoint manager shouldn't modify breakpoint views, instead each view should listen to the corresponding breakpoint state changes and update itself. BreakpointManager should operate on the breakpoints. r- for this. 323150 3 podivilov 2010-12-16 06:40:43 -0800 (In reply to comment #2) > (From update of attachment 76748 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=76748&action=review > > > WebCore/inspector/front-end/BreakpointManager.js:181 > > + this._lastHitBreakpointView = breakpointView; > > Breakpoint manager shouldn't modify breakpoint views, instead each view should listen to the corresponding breakpoint state changes and update itself. BreakpointManager should operate on the breakpoints. r- for this. This patch is just a quick fix, relations between BreakpointManager and breakpoint views didn't change. I've just renamed _lastHitBreakpoint.view to _lastHitBreakpointView. Let me decouple breakpoint views from breakpoint manager in a separate patch. 323178 4 podivilov 2010-12-16 07:58:26 -0800 Committed r74191: <http://trac.webkit.org/changeset/74191> 323471 5 webkit.review.bot 2010-12-16 15:38:56 -0800 http://trac.webkit.org/changeset/74191 might have broken Leopard Intel Debug (Tests) 76748 2010-12-16 03:18:29 -0800 2010-12-16 07:32:18 -0800 Patch. patch text/plain 8857 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWI5ZGYyZS4uODU0NzhjNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMi0xNiAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB1cGRhdGUgQ2FsbFN0YWNrU2lk ZWJhclBhbmUgcGxhY2FyZHMgYW5kIHN0YXR1cyBtZXNzYWdlIGluIHRoZSBzYW1lIGV2ZW50IGhh bmRsZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 MTE3NAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUuYnJl YWtwb2ludFZpZXdGb3JFdmVudERhdGEpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyLnByb3RvdHlwZS5fZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fZGVidWdnZXJSZXN1bWVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUucmVnaXN0ZXJTaG9ydGN1 dHMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5wYXVzZWRTY3JpcHQp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2RlYnVnZ2VyUGF1c2VkKToK KwogMjAxMC0xMi0xNSAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSm9uIEhvbmV5Y3V0dC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwppbmRleCA0ZDlkM2FhLi42MDRkYTYw IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFn ZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2Vy LmpzCkBAIC01NCw3ICs1NCw2IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5FdmVu dHMgPSB7CiAgICAgRE9NQnJlYWtwb2ludEFkZGVkOiAiZG9tLWJyZWFrcG9pbnQtYWRkZWQiLAog ICAgIEV2ZW50TGlzdGVuZXJCcmVha3BvaW50QWRkZWQ6ICJldmVudC1saXN0ZW5lci1icmVha3Bv aW50LWFkZGVkIiwKICAgICBYSFJCcmVha3BvaW50QWRkZWQ6ICJ4aHItYnJlYWtwb2ludC1hZGRl ZCIsCi0gICAgTmF0aXZlQnJlYWtwb2ludEhpdDogIm5hdGl2ZS1icmVha3BvaW50LWhpdCIsCiAg ICAgUHJvamVjdENoYW5nZWQ6ICJwcm9qZWN0LWNoYW5nZWQiCiB9CiAKQEAgLTE1MiwxNCArMTUx LDggQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5fc2F2ZUJyZWFrcG9pbnRzKCk7CiAgICAgfSwKIAotICAgIF9kZWJ1Z2dlclBhdXNl ZDogZnVuY3Rpb24oZXZlbnQpCisgICAgYnJlYWtwb2ludFZpZXdGb3JFdmVudERhdGE6IGZ1bmN0 aW9uKGV2ZW50RGF0YSkKICAgICB7Ci0gICAgICAgIHZhciBldmVudFR5cGUgPSBldmVudC5kYXRh LmV2ZW50VHlwZTsKLSAgICAgICAgdmFyIGV2ZW50RGF0YSA9IGV2ZW50LmRhdGEuZXZlbnREYXRh OwotCi0gICAgICAgIGlmIChldmVudFR5cGUgIT09IFdlYkluc3BlY3Rvci5EZWJ1Z2dlckV2ZW50 VHlwZXMuTmF0aXZlQnJlYWtwb2ludCkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB2 YXIgYnJlYWtwb2ludElkOwogICAgICAgICBpZiAoZXZlbnREYXRhLmJyZWFrcG9pbnRUeXBlID09 PSBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuTmF0aXZlQnJlYWtwb2ludFR5cGVzLkRP TSkKICAgICAgICAgICAgIGJyZWFrcG9pbnRJZCA9IHRoaXMuX2NyZWF0ZURPTUJyZWFrcG9pbnRJ ZChldmVudERhdGEubm9kZUlkLCBldmVudERhdGEudHlwZSk7CkBAIC0xNjcsMjIgKzE2MCwzMyBA QCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAg ICAgYnJlYWtwb2ludElkID0gdGhpcy5fY3JlYXRlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRJZChl dmVudERhdGEuZXZlbnROYW1lKTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnREYXRhLmJyZWFrcG9p bnRUeXBlID09PSBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuTmF0aXZlQnJlYWtwb2lu dFR5cGVzLlhIUikKICAgICAgICAgICAgIGJyZWFrcG9pbnRJZCA9IHRoaXMuX2NyZWF0ZVhIUkJy ZWFrcG9pbnRJZChldmVudERhdGEuYnJlYWtwb2ludFVSTCk7Ci0KICAgICAgICAgdmFyIGJyZWFr cG9pbnQgPSB0aGlzLl9uYXRpdmVCcmVha3BvaW50c1ticmVha3BvaW50SWRdOwotICAgICAgICBp ZiAoIWJyZWFrcG9pbnQpCisgICAgICAgIGlmIChicmVha3BvaW50KQorICAgICAgICAgICAgcmV0 dXJuIGJyZWFrcG9pbnQudmlldzsKKyAgICB9LAorCisgICAgX2RlYnVnZ2VyUGF1c2VkOiBmdW5j dGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBldmVudFR5cGUgPSBldmVudC5kYXRhLmV2 ZW50VHlwZTsKKyAgICAgICAgdmFyIGV2ZW50RGF0YSA9IGV2ZW50LmRhdGEuZXZlbnREYXRhOwor CisgICAgICAgIGlmIChldmVudFR5cGUgIT09IFdlYkluc3BlY3Rvci5EZWJ1Z2dlckV2ZW50VHlw ZXMuTmF0aXZlQnJlYWtwb2ludCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIg YnJlYWtwb2ludFZpZXcgPSB0aGlzLmJyZWFrcG9pbnRWaWV3Rm9yRXZlbnREYXRhKGV2ZW50RGF0 YSk7CisgICAgICAgIGlmICghYnJlYWtwb2ludFZpZXcpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgYnJlYWtwb2ludC52aWV3LmhpdCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2xhc3RI aXRCcmVha3BvaW50ID0gYnJlYWtwb2ludDsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50cy5OYXRpdmVCcmVh a3BvaW50SGl0LCB7IGJyZWFrcG9pbnQ6IGJyZWFrcG9pbnQudmlldywgZXZlbnREYXRhOiBldmVu dERhdGEgfSk7CisgICAgICAgIGJyZWFrcG9pbnRWaWV3LmhpdCA9IHRydWU7CisgICAgICAgIHRo aXMuX2xhc3RIaXRCcmVha3BvaW50VmlldyA9IGJyZWFrcG9pbnRWaWV3OwogICAgIH0sCiAKICAg ICBfZGVidWdnZXJSZXN1bWVkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICgh dGhpcy5fbGFzdEhpdEJyZWFrcG9pbnQpCisgICAgICAgIGlmICghdGhpcy5fbGFzdEhpdEJyZWFr cG9pbnRWaWV3KQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlzLl9sYXN0SGl0QnJl YWtwb2ludC52aWV3LmhpdCA9IGZhbHNlOwotICAgICAgICBkZWxldGUgdGhpcy5fbGFzdEhpdEJy ZWFrcG9pbnQ7CisgICAgICAgIHRoaXMuX2xhc3RIaXRCcmVha3BvaW50Vmlldy5oaXQgPSBmYWxz ZTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2xhc3RIaXRCcmVha3BvaW50VmlldzsKICAgICB9LAog CiAgICAgX3Byb2plY3RDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcwppbmRleCA0MGI5NmYz Li40MzIyNjBlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0 YWNrU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxT dGFja1NpZGViYXJQYW5lLmpzCkBAIC0yNiwxMiArMjYsMTAgQEAKIFdlYkluc3BlY3Rvci5DYWxs U3RhY2tTaWRlYmFyUGFuZSA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3IuU2lkZWJh clBhbmUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwgU3RhY2siKSk7Ci0g ICAgV2ViSW5zcGVjdG9yLmJyZWFrcG9pbnRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50cy5OYXRpdmVCcmVha3BvaW50SGl0LCB0aGlz Ll9uYXRpdmVCcmVha3BvaW50SGl0LCB0aGlzKTsKLSAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJN b2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5C cmVha3BvaW50SGl0LCB0aGlzLl9zY3JpcHRCcmVha3BvaW50SGl0LCB0aGlzKTsKIH0KIAogV2Vi SW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKLSAgICB1cGRhdGU6 IGZ1bmN0aW9uKGNhbGxGcmFtZXMpCisgICAgdXBkYXRlOiBmdW5jdGlvbihjYWxsRnJhbWVzLCBl dmVudFR5cGUsIGV2ZW50RGF0YSkKICAgICB7CiAgICAgICAgIHRoaXMuYm9keUVsZW1lbnQucmVt b3ZlQ2hpbGRyZW4oKTsKIApAQCAtODIsNiArODAsMTkgQEAgV2ViSW5zcGVjdG9yLkNhbGxTdGFj a1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMucGxhY2FyZHMucHVz aChwbGFjYXJkKTsKICAgICAgICAgICAgIHRoaXMuYm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQocGxh Y2FyZC5lbGVtZW50KTsKICAgICAgICAgfQorCisgICAgICAgIGlmIChldmVudFR5cGUgPT09IFdl Ykluc3BlY3Rvci5EZWJ1Z2dlckV2ZW50VHlwZXMuSmF2YVNjcmlwdFBhdXNlKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHZhciBzdGF0dXNNZXNzYWdlRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICBzdGF0dXNNZXNzYWdlRWxlbWVudC5jbGFz c05hbWUgPSAiaW5mbyI7CisgICAgICAgIGlmIChldmVudFR5cGUgPT09IFdlYkluc3BlY3Rvci5E ZWJ1Z2dlckV2ZW50VHlwZXMuTmF0aXZlQnJlYWtwb2ludCkgeworICAgICAgICAgICAgdmFyIGJy ZWFrcG9pbnQgPSBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuYnJlYWtwb2ludFZpZXdG b3JFdmVudERhdGEoZXZlbnREYXRhKTsKKyAgICAgICAgICAgIGlmIChicmVha3BvaW50KQorICAg ICAgICAgICAgICAgIGJyZWFrcG9pbnQucG9wdWxhdGVTdGF0dXNNZXNzYWdlRWxlbWVudChzdGF0 dXNNZXNzYWdlRWxlbWVudCwgZXZlbnREYXRhKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBzdGF0dXNNZXNzYWdlRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9k ZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlZCBvbiBhIEphdmFTY3JpcHQgYnJlYWtwb2lu dC4iKSkpOworICAgICAgICB0aGlzLmJvZHlFbGVtZW50LmFwcGVuZENoaWxkKHN0YXR1c01lc3Nh Z2VFbGVtZW50KTsKICAgICB9LAogCiAgICAgZ2V0IHNlbGVjdGVkQ2FsbEZyYW1lKCkKQEAgLTE2 OSwyMyArMTgwLDYgQEAgV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3ByZXZDYWxsRnJhbWUua2V5XSA9IHRoaXMu X3NlbGVjdFByZXZpb3VzQ2FsbEZyYW1lT25TdGFjay5iaW5kKHRoaXMpOwogCiAgICAgICAgIHNl Y3Rpb24uYWRkUmVsYXRlZEtleXMoWyBuZXh0Q2FsbEZyYW1lLm5hbWUsIHByZXZDYWxsRnJhbWUu bmFtZSBdLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5leHQvcHJldmlvdXMgY2FsbCBmcmFtZSIp KTsKLSAgICB9LAotCi0gICAgX25hdGl2ZUJyZWFrcG9pbnRIaXQ6ICBmdW5jdGlvbihldmVudCkK LSAgICB7Ci0gICAgICAgIHZhciBicmVha3BvaW50ID0gZXZlbnQuZGF0YS5icmVha3BvaW50Owot ICAgICAgICB2YXIgc3RhdHVzTWVzc2FnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICAgICAgc3RhdHVzTWVzc2FnZUVsZW1lbnQuY2xhc3NOYW1lID0gImluZm8i OwotICAgICAgICBicmVha3BvaW50LnBvcHVsYXRlU3RhdHVzTWVzc2FnZUVsZW1lbnQoc3RhdHVz TWVzc2FnZUVsZW1lbnQsIGV2ZW50LmRhdGEuZXZlbnREYXRhKTsKLSAgICAgICAgdGhpcy5ib2R5 RWxlbWVudC5hcHBlbmRDaGlsZChzdGF0dXNNZXNzYWdlRWxlbWVudCk7Ci0gICAgfSwKLQotICAg IF9zY3JpcHRCcmVha3BvaW50SGl0OiAgZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICB2 YXIgc3RhdHVzTWVzc2FnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK LSAgICAgICAgc3RhdHVzTWVzc2FnZUVsZW1lbnQuY2xhc3NOYW1lID0gImluZm8iOwotICAgICAg ICBzdGF0dXNNZXNzYWdlRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9k ZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlZCBvbiBhIEphdmFTY3JpcHQgYnJlYWtwb2lu dC4iKSkpOwotICAgICAgICB0aGlzLmJvZHlFbGVtZW50LmFwcGVuZENoaWxkKHN0YXR1c01lc3Nh Z2VFbGVtZW50KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyTW9kZWwuanMKaW5kZXggY2M4Nzc1NS4uMzFjNzVlNSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKQEAgLTQyLDcgKzQyLDYgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzID0gewogICAgIFBhcnNlZFNjcmlwdFNvdXJjZTog InBhcnNlZC1zY3JpcHQtc291cmNlIiwKICAgICBGYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlOiAi ZmFpbGVkLXRvLXBhcnNlLXNjcmlwdC1zb3VyY2UiLAogICAgIEJyZWFrcG9pbnRBZGRlZDogImJy ZWFrcG9pbnQtYWRkZWQiLAotICAgIEJyZWFrcG9pbnRIaXQ6ICJicmVha3BvaW50LWhpdCIKIH0K IAogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewpAQCAtMTcxLDEzICsx NzAsMTEgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAg ICBpZiAoZGV0YWlscy5ldmVudFR5cGUgPT09IFdlYkluc3BlY3Rvci5EZWJ1Z2dlckV2ZW50VHlw ZXMuSmF2YVNjcmlwdFBhdXNlIHx8IGRldGFpbHMuZXZlbnRUeXBlID09PSBXZWJJbnNwZWN0b3Iu RGVidWdnZXJFdmVudFR5cGVzLk5hdGl2ZUJyZWFrcG9pbnQpCiAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgdmFyIGJyZWFrcG9pbnRJZCA9IFdlYkluc3BlY3Rvci5CcmVha3BvaW50Lmpz QnJlYWtwb2ludElkKGRldGFpbHMuY2FsbEZyYW1lc1swXS5zb3VyY2VJRCwgZGV0YWlscy5jYWxs RnJhbWVzWzBdLmxpbmUpOwotICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9p bnRzW2JyZWFrcG9pbnRJZF07CisgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5maW5kQnJl YWtwb2ludChkZXRhaWxzLmNhbGxGcmFtZXNbMF0uc291cmNlSUQsIGRldGFpbHMuY2FsbEZyYW1l c1swXS5saW5lKTsKICAgICAgICAgaWYgKCFicmVha3BvaW50KQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBicmVha3BvaW50LmhpdCA9IHRydWU7CiAgICAgICAgIHRoaXMuX2xhc3RIaXRC cmVha3BvaW50ID0gYnJlYWtwb2ludDsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRIaXQsIGJy ZWFrcG9pbnQpOwogICAgIH0sCiAKICAgICByZXN1bWVkU2NyaXB0OiBmdW5jdGlvbigpCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCAxNDA5Zjc0Li5i MTJlNThhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTM3OCw3ICszNzgsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9 IHsKIAogICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVudFBhbmVsID0gdGhpczsKIAotICAgICAg ICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2sudXBkYXRlKGNhbGxGcmFtZXMpOworICAgICAg ICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2sudXBkYXRlKGNhbGxGcmFtZXMsIGV2ZW50LmRh dGEuZXZlbnRUeXBlLCBldmVudC5kYXRhLmV2ZW50RGF0YSk7CiAgICAgICAgIHRoaXMuc2lkZWJh clBhbmVzLmNhbGxzdGFjay5zZWxlY3RlZENhbGxGcmFtZSA9IGNhbGxGcmFtZXNbMF07CiAKICAg ICAgICAgd2luZG93LmZvY3VzKCk7Cg==