200296 2019-07-31 00:26:31 -0700 Web Inspector: Uncaught Exception: TypeError: null is not an object (evaluating 'issueMessage.sourceCodeLocation.sourceCode') 2019-07-31 21:25:33 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://www.youtube.com/user/NewOnNetflix/videos InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1557212 0 hi 2019-07-31 00:26:31 -0700 ------- Inspected URL: https://www.youtube.com/user/NewOnNetflix/videos Loading completed: true Frontend User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Uncaught Exceptions: - TypeError: null is not an object (evaluating 'issueMessage.sourceCodeLocation.sourceCode') (at DebuggerSidebarPanel.js:1406:111) _addIssue @ DebuggerSidebarPanel.js:1406:111 _addIssuesForSourceCode @ DebuggerSidebarPanel.js:587:27 _addResource @ DebuggerSidebarPanel.js:640:37 _addResourcesRecursivelyForFrame @ DebuggerSidebarPanel.js:619:26 DebuggerSidebarPanel @ DebuggerSidebarPanel.js:224:50 navigationSidebarPanel @ TabContentView.js:171:87 shown @ ContentBrowserTabContentView.js:101:17 prepareToShow @ BackForwardEntry.js:84:35 _showEntry @ ContentViewContainer.js:450:28 showBackForwardEntryForIndex @ ContentViewContainer.js:166:28 showContentView @ ContentViewContainer.js:142:42 _tabBarItemSelected @ TabBrowser.js:238:55 dispatch @ Object.js:165:30 dispatchEventToListeners @ Object.js:172:17 selectedTabBarItem @ LegacyTabBar.js:385:38 _handleMouseDown @ LegacyTabBar.js:634:13 _handleMouseDown @ [native code] ------- * STEPS TO REPRODUCE 1. set a specific event listener breakpoint for every event listener on `#menu > a:nth-child(2) > paper-item > paper-item-body > div.item.style-scope.yt-dropdown-menu`. 2. disable all event listeners of every parent 3. tap the node 1557216 1 375217 hi 2019-07-31 00:58:58 -0700 Created attachment 375217 Patch 1557424 2 375217 joepeck 2019-07-31 15:48:50 -0700 Comment on attachment 375217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375217&action=review r=me > Source/WebInspectorUI/ChangeLog:10 > + we should pass the `WI.SourceCode` along in that case, and use it when creating a associated Grammar: "a associate" => "an association" > Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js:1407 > + if (!sourceCode && !issueMessage.sourceCodeLocation) > + return null; Can this ever happen? Could this just become an assert. Seems the `debuggerObject` case is the only time this could happen. 1557512 3 375217 hi 2019-07-31 20:42:35 -0700 Comment on attachment 375217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375217&action=review >> Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js:1407 >> + return null; > > Can this ever happen? Could this just become an assert. > > Seems the `debuggerObject` case is the only time this could happen. I don't think it can happen, because the `debuggerObject` path already checks for `debuggerObject.sourceCodeLocation.displaySourceCode`, so it should be valid there too. I'll change it to an assert. 1557513 4 375288 hi 2019-07-31 20:46:35 -0700 Created attachment 375288 Patch 1557519 5 375288 commit-queue 2019-07-31 21:24:57 -0700 Comment on attachment 375288 Patch Clearing flags on attachment: 375288 Committed r248094: <https://trac.webkit.org/changeset/248094> 1557520 6 commit-queue 2019-07-31 21:24:58 -0700 All reviewed patches have been landed. Closing bug. 1557523 7 webkit-bug-importer 2019-07-31 21:25:33 -0700 <rdar://problem/53796065> 375217 2019-07-31 00:58:58 -0700 2019-07-31 20:46:34 -0700 Patch bug-200296-20190731005857.patch text/plain 4670 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFkODUzMmJmMDlhN2FhYmQ1Yjk5NWNjOGNlM2Jh YjE1OTM1NWFlMmMuLjc3NDczMjA0ZmQ2ZjY5ZGIyMWUxMDZhYTQ5MWNhMjg2N2M1ODBmNGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA3LTMxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBV bmNhdWdodCBFeGNlcHRpb246IFR5cGVFcnJvcjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFs dWF0aW5nICdpc3N1ZU1lc3NhZ2Uuc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUnKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMjk2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBmZXRjaGlu ZyBhbGwgYFdJLklzc3VlTWVzc2FnZWBzIGZvciBhIGdpdmVuIGBXSS5Tb3VyY2VDb2RlYCwgdGhl IGBXSS5Jc3N1ZU1lc3NhZ2VgIG1heQorICAgICAgICBiZSBhc3NvY2lhdGVkIGluIGEgZGlmZmVy ZW50IHdheSAoZS5nLiBieSB1cmwsIGluc3RlYWQgb2YgYFdJLlNvdXJjZUNvZGVMb2NhdGlvbmAp LiBBcyBzdWNoLAorICAgICAgICB3ZSBzaG91bGQgcGFzcyB0aGUgYFdJLlNvdXJjZUNvZGVgIGFs b25nIGluIHRoYXQgY2FzZSwgYW5kIHVzZSBpdCB3aGVuIGNyZWF0aW5nIGEgYXNzb2NpYXRlZAor ICAgICAgICBgV0kuSXNzdWVUcmVlRWxlbWVudGAgZm9yIHRoZSBgV0kuSXNzdWVNZXNzYWdlYC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanM6 CisgICAgICAgIChXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZElzc3Vlc0Zv clNvdXJjZUNvZGUpOgorICAgICAgICAoV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBl Ll9hZGRJc3N1ZSk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRl YmFyUGFuZWwucHJvdG90eXBlLl9hZGRJc3N1ZSk6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZElzc3Vlc0ZvclNvdXJjZUNvZGUpOgorCiAy MDE5LTA3LTI2ICBHcmVnIERvb2xpdHRsZSAgPGdyM2dAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFYSTogQXVkaXQ6IFR5cG8gb2YgInNvbWUiIGFzICJzb21lZSIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2Vy U2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggM2IwYmE3NDFhZTg1YzFkMTYyMGMxMGVk YTc4NDAxYjIzNTVlYTIzOS4uMGViMzkzNWQyZDU1M2Q1ZWJlYTg3ZDZlYjM3ZmI4YzViYjA0Njg3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGVidWdnZXJTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTU4NCw3ICs1ODQsNyBA QCBXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJhclBhbmVsIGV4 dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYQogICAgIHsKICAgICAgICAgdmFyIGlzc3VlcyA9IFdJ LmNvbnNvbGVNYW5hZ2VyLmlzc3Vlc0ZvclNvdXJjZUNvZGUoc291cmNlQ29kZSk7CiAgICAgICAg IGZvciAodmFyIGlzc3VlIG9mIGlzc3VlcykKLSAgICAgICAgICAgIHRoaXMuX2FkZElzc3VlKGlz c3VlKTsKKyAgICAgICAgICAgIHRoaXMuX2FkZElzc3VlKGlzc3VlLCBzb3VyY2VDb2RlKTsKICAg ICB9CiAKICAgICBfYWRkVHJlZUVsZW1lbnRGb3JTb3VyY2VDb2RlVG9UcmVlT3V0bGluZShzb3Vy Y2VDb2RlLCB0cmVlT3V0bGluZSkKQEAgLTEzOTcsMTMgKzEzOTcsMTYgQEAgV0kuRGVidWdnZXJT aWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmln YXRpb25TaWRlYmEKICAgICAgICAgdGhpcy5fcGF1c2VSZWFzb25MaW5rQ29udGFpbmVyRWxlbWVu dC5hcHBlbmRDaGlsZChsaW5rRWxlbWVudCk7CiAgICAgfQogCi0gICAgX2FkZElzc3VlKGlzc3Vl TWVzc2FnZSkKKyAgICBfYWRkSXNzdWUoaXNzdWVNZXNzYWdlLCBzb3VyY2VDb2RlKQogICAgIHsK ICAgICAgICAgbGV0IGlzc3VlVHJlZUVsZW1lbnQgPSB0aGlzLl9zY3JpcHRzQ29udGVudFRyZWVP dXRsaW5lLmZpbmRUcmVlRWxlbWVudChpc3N1ZU1lc3NhZ2UpOwogICAgICAgICBpZiAoaXNzdWVU cmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybiBpc3N1ZVRyZWVFbGVtZW50OwogCi0gICAg ICAgIGxldCBwYXJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2FkZFRyZWVFbGVtZW50Rm9yU291cmNl Q29kZVRvVHJlZU91dGxpbmUoaXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VD b2RlLCB0aGlzLl9zY3JpcHRzQ29udGVudFRyZWVPdXRsaW5lKTsKKyAgICAgICAgaWYgKCFzb3Vy Y2VDb2RlICYmICFpc3N1ZU1lc3NhZ2Uuc291cmNlQ29kZUxvY2F0aW9uKQorICAgICAgICAgICAg cmV0dXJuIG51bGw7CisKKyAgICAgICAgbGV0IHBhcmVudFRyZWVFbGVtZW50ID0gdGhpcy5fYWRk VHJlZUVsZW1lbnRGb3JTb3VyY2VDb2RlVG9UcmVlT3V0bGluZShzb3VyY2VDb2RlIHx8IGlzc3Vl TWVzc2FnZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSwgdGhpcy5fc2NyaXB0c0NvbnRl bnRUcmVlT3V0bGluZSk7CiAgICAgICAgIGlmICghcGFyZW50VHJlZUVsZW1lbnQpCiAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcwppbmRleCBlOTUwYjNmMDUxNTRmMTE3N2Q3MjFmNmE1YzgwNWJiMDZkZTk5 YWE5Li4xZTI2ZjFlOTNlMzQyYzc4NTNhZjM3N2I5Nzk1Njg5MDBlNjUxZDc1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMTAyNSwxMSAr MTAyNSwxNCBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJj ZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogICAgICAgICByZXR1cm4gYnJlYWtw b2ludHM7CiAgICAgfQogCi0gICAgX2FkZElzc3VlKGlzc3VlTWVzc2FnZSkKKyAgICBfYWRkSXNz dWUoaXNzdWVNZXNzYWdlLCBzb3VyY2VDb2RlKQogICAgIHsKICAgICAgICAgbGV0IGlzc3VlVHJl ZUVsZW1lbnQgPSB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQoaXNz dWVNZXNzYWdlKTsKICAgICAgICAgaWYgKCFpc3N1ZVRyZWVFbGVtZW50KSB7Ci0gICAgICAgICAg ICBsZXQgcGFyZW50VHJlZUVsZW1lbnQgPSB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5maW5k VHJlZUVsZW1lbnQoaXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlKTsK KyAgICAgICAgICAgIGlmICghc291cmNlQ29kZSAmJiAhaXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVM b2NhdGlvbikKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKworICAgICAgICAgICAgbGV0 IHBhcmVudFRyZWVFbGVtZW50ID0gdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUuZmluZFRyZWVF bGVtZW50KHNvdXJjZUNvZGUgfHwgaXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVMb2NhdGlvbi5zb3Vy Y2VDb2RlKTsKICAgICAgICAgICAgIGlmICghcGFyZW50VHJlZUVsZW1lbnQpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIG51bGw7CiAKQEAgLTEwNjgsNyArMTA3MSw3IEBAIFdJLlNvdXJjZXNOYXZp Z2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwg ZXh0ZW5kcyBXCiAgICAgX2FkZElzc3Vlc0ZvclNvdXJjZUNvZGUoc291cmNlQ29kZSkKICAgICB7 CiAgICAgICAgIGZvciAobGV0IGlzc3VlIG9mIFdJLmNvbnNvbGVNYW5hZ2VyLmlzc3Vlc0ZvclNv dXJjZUNvZGUoc291cmNlQ29kZSkpCi0gICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShpc3N1ZSk7 CisgICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShpc3N1ZSwgc291cmNlQ29kZSk7CiAgICAgfQog CiAgICAgX3VwZGF0ZVRlbXBvcmFyaWx5RGlzYWJsZWRCcmVha3BvaW50c0J1dHRvbnMoKQo= 375288 2019-07-31 20:46:35 -0700 2019-07-31 21:24:57 -0700 Patch bug-200296-20190731204634.patch text/plain 4727 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEwNGE0YmVjNGRkOTZjZGJjOTM2ODU1NWI5Yzdj ZTgzNWQ1ODEyOTkuLjVjY2U1YTg1MjE0NDkwODhiOWNkMDVlYTJjOGUyY2RmY2Q4NzBmMWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA3LTMxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBV bmNhdWdodCBFeGNlcHRpb246IFR5cGVFcnJvcjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFs dWF0aW5nICdpc3N1ZU1lc3NhZ2Uuc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUnKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMjk2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFdoZW4gZmV0Y2hp bmcgYWxsIGBXSS5Jc3N1ZU1lc3NhZ2VgcyBmb3IgYSBnaXZlbiBgV0kuU291cmNlQ29kZWAsIHRo ZSBgV0kuSXNzdWVNZXNzYWdlYCBtYXkKKyAgICAgICAgYmUgYXNzb2NpYXRlZCBpbiBhIGRpZmZl cmVudCB3YXkgKGUuZy4gYnkgdXJsLCBpbnN0ZWFkIG9mIGBXSS5Tb3VyY2VDb2RlTG9jYXRpb25g KS4gQXMgc3VjaCwKKyAgICAgICAgd2Ugc2hvdWxkIHBhc3MgdGhlIGBXSS5Tb3VyY2VDb2RlYCBh bG9uZywgYW5kIHVzZSBpdCB3aGVuIGFkZGluZyB0aGUgYFdJLklzc3VlVHJlZUVsZW1lbnRgLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qczoK KyAgICAgICAgKFdJLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYWRkSXNzdWVzRm9y U291cmNlQ29kZSk6CisgICAgICAgIChXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUu X2FkZElzc3VlKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5wcm90b3R5cGUuX2FkZElzc3VlKToKKyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYWRkSXNzdWVzRm9yU291cmNlQ29kZSk6CisKIDIw MTktMDctMzEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IERPTTogcHJvdmlkZSBhIHdheSB0byBkaXNhYmxlL2JyZWFrcG9pbnQgYWxs IGV2ZW50IGxpc3RlbmVycyBmb3IgYSBnaXZlbiBET00gbm9kZSBvciBldmVudCB0eXBlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dl clNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IDNiMGJhNzQxYWU4NWMxZDE2MjBjMTBl ZGE3ODQwMWIyMzU1ZWEyMzkuLjhmZjY3ZmFiYjYyNWYzYTAxOThhOGYzOTBkNWVmOTcxYWUxZTA5 ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCkBAIC01ODQsNyArNTg0LDcg QEAgV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAgICB7CiAgICAgICAgIHZhciBpc3N1ZXMgPSBX SS5jb25zb2xlTWFuYWdlci5pc3N1ZXNGb3JTb3VyY2VDb2RlKHNvdXJjZUNvZGUpOwogICAgICAg ICBmb3IgKHZhciBpc3N1ZSBvZiBpc3N1ZXMpCi0gICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShp c3N1ZSk7CisgICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShpc3N1ZSwgc291cmNlQ29kZSk7CiAg ICAgfQogCiAgICAgX2FkZFRyZWVFbGVtZW50Rm9yU291cmNlQ29kZVRvVHJlZU91dGxpbmUoc291 cmNlQ29kZSwgdHJlZU91dGxpbmUpCkBAIC0xMzk3LDEzICsxMzk3LDE0IEBAIFdJLkRlYnVnZ2Vy U2lkZWJhclBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZp Z2F0aW9uU2lkZWJhCiAgICAgICAgIHRoaXMuX3BhdXNlUmVhc29uTGlua0NvbnRhaW5lckVsZW1l bnQuYXBwZW5kQ2hpbGQobGlua0VsZW1lbnQpOwogICAgIH0KIAotICAgIF9hZGRJc3N1ZShpc3N1 ZU1lc3NhZ2UpCisgICAgX2FkZElzc3VlKGlzc3VlTWVzc2FnZSwgc291cmNlQ29kZSkKICAgICB7 CiAgICAgICAgIGxldCBpc3N1ZVRyZWVFbGVtZW50ID0gdGhpcy5fc2NyaXB0c0NvbnRlbnRUcmVl T3V0bGluZS5maW5kVHJlZUVsZW1lbnQoaXNzdWVNZXNzYWdlKTsKICAgICAgICAgaWYgKGlzc3Vl VHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gaXNzdWVUcmVlRWxlbWVudDsKIAotICAg ICAgICBsZXQgcGFyZW50VHJlZUVsZW1lbnQgPSB0aGlzLl9hZGRUcmVlRWxlbWVudEZvclNvdXJj ZUNvZGVUb1RyZWVPdXRsaW5lKGlzc3VlTWVzc2FnZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNl Q29kZSwgdGhpcy5fc2NyaXB0c0NvbnRlbnRUcmVlT3V0bGluZSk7CisgICAgICAgIGNvbnNvbGUu YXNzZXJ0KHNvdXJjZUNvZGUgfHwgKGlzc3VlTWVzc2FnZS5zb3VyY2VDb2RlTG9jYXRpb24gJiYg aXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlKSk7CisgICAgICAgIGxl dCBwYXJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2FkZFRyZWVFbGVtZW50Rm9yU291cmNlQ29kZVRv VHJlZU91dGxpbmUoc291cmNlQ29kZSB8fCBpc3N1ZU1lc3NhZ2Uuc291cmNlQ29kZUxvY2F0aW9u LnNvdXJjZUNvZGUsIHRoaXMuX3NjcmlwdHNDb250ZW50VHJlZU91dGxpbmUpOwogICAgICAgICBp ZiAoIXBhcmVudFRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNO YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggZTk1MGIz ZjA1MTU0ZjExNzdkNzIxZjZhNWM4MDViYjA2ZGU5OWFhOS4uMjhlMzcyNTYwODIxZWY1YTQ0NzRh NDM2YzJlMTU0MTkwMTBmMWEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRp b25TaWRlYmFyUGFuZWwuanMKQEAgLTEwMjUsMTEgKzEwMjUsMTIgQEAgV0kuU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBl eHRlbmRzIFcKICAgICAgICAgcmV0dXJuIGJyZWFrcG9pbnRzOwogICAgIH0KIAotICAgIF9hZGRJ c3N1ZShpc3N1ZU1lc3NhZ2UpCisgICAgX2FkZElzc3VlKGlzc3VlTWVzc2FnZSwgc291cmNlQ29k ZSkKICAgICB7CiAgICAgICAgIGxldCBpc3N1ZVRyZWVFbGVtZW50ID0gdGhpcy5fcmVzb3VyY2Vz VHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGlzc3VlTWVzc2FnZSk7CiAgICAgICAgIGlmICgh aXNzdWVUcmVlRWxlbWVudCkgewotICAgICAgICAgICAgbGV0IHBhcmVudFRyZWVFbGVtZW50ID0g dGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGlzc3VlTWVzc2FnZS5z b3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSk7CisgICAgICAgICAgICBjb25zb2xlLmFzc2Vy dChzb3VyY2VDb2RlIHx8IChpc3N1ZU1lc3NhZ2Uuc291cmNlQ29kZUxvY2F0aW9uICYmIGlzc3Vl TWVzc2FnZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSkpOworICAgICAgICAgICAgbGV0 IHBhcmVudFRyZWVFbGVtZW50ID0gdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUuZmluZFRyZWVF bGVtZW50KHNvdXJjZUNvZGUgfHwgaXNzdWVNZXNzYWdlLnNvdXJjZUNvZGVMb2NhdGlvbi5zb3Vy Y2VDb2RlKTsKICAgICAgICAgICAgIGlmICghcGFyZW50VHJlZUVsZW1lbnQpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIG51bGw7CiAKQEAgLTEwNjgsNyArMTA2OSw3IEBAIFdJLlNvdXJjZXNOYXZp Z2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwg ZXh0ZW5kcyBXCiAgICAgX2FkZElzc3Vlc0ZvclNvdXJjZUNvZGUoc291cmNlQ29kZSkKICAgICB7 CiAgICAgICAgIGZvciAobGV0IGlzc3VlIG9mIFdJLmNvbnNvbGVNYW5hZ2VyLmlzc3Vlc0ZvclNv dXJjZUNvZGUoc291cmNlQ29kZSkpCi0gICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShpc3N1ZSk7 CisgICAgICAgICAgICB0aGlzLl9hZGRJc3N1ZShpc3N1ZSwgc291cmNlQ29kZSk7CiAgICAgfQog CiAgICAgX3VwZGF0ZVRlbXBvcmFyaWx5RGlzYWJsZWRCcmVha3BvaW50c0J1dHRvbnMoKQo=