192090 2018-11-28 11:42:29 -0800 Web Inspector: REGRESSION(r238599): Uncaught Exception: TypeError: null is not an object (evaluating 'treeElement.listItemElement.classList') 2018-12-14 19:35:04 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED file:///Volumes/DATA/Build/Release/WebInspectorUI.framework/Resources/Main.html InRadar P2 Normal --- 191483 1 hi mattbaker commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1482558 0 hi 2018-11-28 11:42:29 -0800 ------- Inspected URL: file:///Volumes/DATA/Build/Release/WebInspectorUI.framework/Resources/Main.html Loading completed: true Frontend User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Uncaught Exceptions: - TypeError: null is not an object (evaluating 'treeElement.listItemElement.classList') (at TreeOutline.js:855:44) selectionControllerSelectionDidChange @ TreeOutline.js:855:44 _updateSelectedItems @ SelectionController.js:391:61 selectItem @ SelectionController.js:102:34 selectedTreeElement @ TreeOutline.js:114:49 selectTreeElementInternal @ TreeOutline.js:917:13 select @ TreeElement.js:521:46 refresh @ ThreadTreeElement.js:67:46 onattach @ ThreadTreeElement.js:113:21 _attach @ TreeElement.js:252:30 appendChild @ TreeOutline.js:247:26 _addTarget @ DebuggerSidebarPanel.js:741:47 DebuggerSidebarPanel @ DebuggerSidebarPanel.js:215:28 navigationSidebarPanel @ TabContentView.js:171:87 showRepresentedObject @ ContentBrowserTabContentView.js:229:17 showRepresentedObject @ Main.js:1221:41 _treeSelectionDidChange @ ResourceSidebarPanel.js:480:37 dispatch @ Object.js:170:30 dispatchEventToListeners @ Object.js:177:17 _dispatchSelectionDidChangeEvent @ TreeOutline.js:1101:38 selectionControllerSelectionDidChange @ TreeOutline.js:863:46 _updateSelectedItems @ SelectionController.js:391:61 selectItem @ SelectionController.js:102:34 handleItemMouseDown @ SelectionController.js:265:28 _handleMouseDown @ TreeOutline.js:1037:54 _handleMouseDown @ [native code] ------- * STEPS TO REPRODUCE 1. open inspector^2 2. set a breakpoint somewhere that will be hit 3. wait for the breakpoint to be hit 1482592 1 webkit-bug-importer 2018-11-28 12:48:09 -0800 <rdar://problem/46318614> 1485563 2 hi 2018-12-05 19:12:07 -0800 I'm now also seeing another error similar to this (likely from r238859 <https://webkit.org/b/192119>): - TypeError: null is not an object (evaluating 'this._previousSelectedTreeElement.listItemElement.classList')​ (at TreeOutline.js:​829:​66)​ selectionControllerSelectionDidChange @ TreeOutline.js:​829:​66 _updateSelectedItems @ SelectionController.js:​391:​61 selectItem @ SelectionController.js:​102:​34 selectedTreeElement @ TreeOutline.js:​114:​49 selectTreeElementInternal @ TreeOutline.js:​888:​13 select @ TreeElement.js:​518:​46 refresh @ ThreadTreeElement.js:​67:​46 onattach @ ThreadTreeElement.js:​113:​21 _attach @ TreeElement.js:​251:​30 appendChild @ TreeOutline.js:​249:​26 _addTarget @ DebuggerSidebarPanel.js:​741:​47 DebuggerSidebarPanel @ DebuggerSidebarPanel.js:​215:​28 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:​243:​55 dispatch @ Object.js:​170:​30 dispatchEventToListeners @ Object.js:​177:​17 selectedTabBarItem @ TabBar.js:​359:​38 showTabForContentView @ TabBrowser.js:​186:​21 showDebuggerTab @ Main.js:​1024:​42 _debuggerDidPause @ Main.js:​1445:​25 dispatch @ Object.js:​170:​30 dispatchEventToListeners @ Object.js:​177:​17 debuggerDidPause @ DebuggerManager.js:​674:​42 paused @ DebuggerObserver.js:​68:​44 dispatchEvent @ InspectorBackend.js:​334:​42 _dispatchEvent @ Connection.js:​195:​32 dispatch @ Connection.js:​72:​32 dispatchMessageFromTarget @ TargetManager.js:​101:​35 dispatchMessageFromTarget @ TargetObserver.js:​42:​51 dispatchEvent @ InspectorBackend.js:​334:​42 _dispatchEvent @ Connection.js:​195:​32 dispatch @ Connection.js:​72:​32 dispatch @ InspectorBackend.js:​172:​52 dispatchNextQueuedMessageFromBackend @ MessageDispatcher.js:​42:​34 Additional Details:​ cause --> An uncaught exception was thrown while handling event:​ Debugger.paused 1488011 3 hi 2018-12-14 12:55:00 -0800 (In reply to Devin Rousso from comment #0) > * STEPS TO REPRODUCE > 1. open inspector^2 > 2. set a breakpoint somewhere that will be hit > 3. wait for the breakpoint to be hit You might also have to change tabs in inspector^2, close, and reopen it (e.g. remove any DOM elements for any `WI.TreeElement`). I'm guessing that this situation occurs when the `WI.TreeElement` gets selected before it has a chance to actually add itself to the DOM (e.g. it's been added to the `WI.TreeOutline` model object hierarchy with relationships to other `WI.TreeElement`s, but that hasn't been carried over into the DOM yet). 1488060 4 mattbaker 2018-12-14 14:40:12 -0800 Okay, I can reliably reproduce this without opening Inspector²: Steps to Reproduce: 1. Goto daringfireball.net 2. Open Inspector > Debugger tab 3. Add breakpoint on FancyZoon.js:68 4. Select a different tab 5. Close and reopen Inspector 6. Reload page => Debugger tab shown, content is blank, sidebar won't expand 7. Switch to a different tab and back => Error TypeError:​ null is not an object (evaluating 'treeElement.listItemElement.classList')​ (at TreeOutline.js:​816:​44)​ selectionControllerSelectionDidChange @ TreeOutline.js:​816:​44 _updateSelectedItems @ SelectionController.js:​443:​61 selectItem @ SelectionController.js:​106:​34 selectedTreeElement @ TreeOutline.js:​114:​49 selectTreeElementInternal @ TreeOutline.js:​889:​13 select @ TreeElement.js:​518:​46 refresh @ ThreadTreeElement.js:​67:​46 onattach @ ThreadTreeElement.js:​113:​21 _attach @ TreeElement.js:​251:​30 appendChild @ TreeOutline.js:​249:​26 _addTarget @ DebuggerSidebarPanel.js:​741:​47 DebuggerSidebarPanel @ DebuggerSidebarPanel.js:​215:​28 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:​243:​55 dispatch @ Object.js:​170:​30 dispatchEventToListeners @ Object.js:​177:​17 selectedTabBarItem @ LegacyTabBar.js:​386:​38 _handleMouseDown @ LegacyTabBar.js:​623:​13 _handleMouseDown @ [native code]​ 1488084 5 mattbaker 2018-12-14 15:45:09 -0800 Analysis of the above crash trace: TypeError:​ null is not an object (evaluating 'treeElement.listItemElement.classList')​ (at TreeOutline.js:​816:​44)​ D) selectionControllerSelectionDidChange @ TreeOutline.js:​816:​44 _updateSelectedItems @ SelectionController.js:​443:​61 selectItem @ SelectionController.js:​106:​34 selectedTreeElement @ TreeOutline.js:​114:​49 selectTreeElementInternal @ TreeOutline.js:​889:​13 C) select @ TreeElement.js:​518:​46 B) refresh @ ThreadTreeElement.js:​67:​46 A) onattach @ ThreadTreeElement.js:​113:​21 _attach @ TreeElement.js:​251:​30 appendChild @ TreeOutline.js:​249:​26 _addTarget @ DebuggerSidebarPanel.js:​741:​47 DebuggerSidebarPanel @ DebuggerSidebarPanel.js:​215:​28 ... A) ThreadTreeElement is now attached (its `listItemElement` property is valid). B) ThreadTreeElement creates and appends child CallFrameTreeElements. Since the ThreadTreeElement hasn't been expanded, its `_childrenListNode` is null and the children won't be attached. C) The CallFrameTreeElement for the active call frame is selected by its parent. D) TreeOutline accesses the `listItemElement` property of the selected TreeElement, which is invalid (see B), leading to the exception. Another crash with an identical cause can occur accessing `this._previousSelectedTreeElement.listItemElement`. I think the fix is simply to check that `listItemElement` exists before using it. The "selected" class will be added by TreeElement when it is eventually attached. 1488085 6 357351 mattbaker 2018-12-14 15:48:01 -0800 Created attachment 357351 Patch 1488098 7 357351 hi 2018-12-14 16:24:58 -0800 Comment on attachment 357351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357351&action=review rs=me Perhaps this is a good opportunity to move `addClassName` and `removeClassName` from `WI.GeneralTreeElement` to `WI.TreeElement`. It would effectively solve this problem. > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:805 > + if (treeElement && treeElement.listItemElement) { This would prevent `deselect` from being called if the element hasn't been created yet. I think we only want to avoid adding a class to the element, not any other functionality. > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:815 > + if (treeElement && treeElement.listItemElement) { Ditto (>805). 1488168 8 357365 mattbaker 2018-12-14 18:01:26 -0800 Created attachment 357365 Patch for landing 1488201 9 357365 commit-queue 2018-12-14 19:35:02 -0800 Comment on attachment 357365 Patch for landing Clearing flags on attachment: 357365 Committed r239246: <https://trac.webkit.org/changeset/239246> 1488202 10 commit-queue 2018-12-14 19:35:04 -0800 All reviewed patches have been landed. Closing bug. 357351 2018-12-14 15:48:01 -0800 2018-12-14 18:01:25 -0800 Patch bug-192090-20181214154800.patch text/plain 3329 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw YTJhZTBkNzkwNTlmYTliYzE3Y2YzYWQzZmE3Mjg1ZDQzMWNmYzUyLi4wNmUwZTdmNmY5NjVmNDhj YjM5Njk4YjgwOTFhNzgyN2UyMWEyMjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0xMi0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjM4NTk5KTogVW5jYXVnaHQg RXhjZXB0aW9uOiBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAn dHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNzTGlzdCcpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIwOTAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ2MzE4NjE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qczoKKyAgICAgICAg KFdJLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5zZWxlY3Rpb25Db250cm9sbGVyU2VsZWN0aW9uRGlk Q2hhbmdlKToKKyAgICAgICAgQ2hlY2sgdGhhdCBgbGlzdEl0ZW1FbGVtZW50YCBpcyB2YWxpZCBi ZWZvcmUgYWNjZXNzaW5nIGl0IHRvIHVwZGF0ZSBjbGFzcworICAgICAgICBuYW1lcy4gVGhlIHNl bGVjdGlvbiBjYW4gY2hhbmdlIGJlZm9yZSB0aGUgVHJlZUVsZW1lbnQgaGFzIGJlZW4gYXR0YWNo ZWQuCisKIDIwMTgtMTItMTQgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IENvb2tpZXMgdmlldyBzaG91bGQgdXNlIG1vZGVsIG9iamVj dHMgaW5zdGVhZCBvZiByYXcgcGF5bG9hZCBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCmluZGV4IDI0N2I2 NTc3YzQ3MzYwMjk1MDllNzhlYWEwZWZjMjhmNTVhMzZjYzUuLmJmZGVjOWYzZTU5NzllZGE0ZWFj Mjc0YmEwY2M4MmJiNDc2MDg1ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCkBAIC04MDIsNyArODAyLDcg QEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICBmb3IgKGxldCBpbmRleCBvZiBkZXNlbGVjdGVkSXRlbXMpIHsKICAgICAgICAgICAg IGxldCB0cmVlRWxlbWVudCA9IHRoaXMuX3RyZWVFbGVtZW50QXRJbmRleChpbmRleCk7CiAgICAg ICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVudCwgIk1pc3NpbmcgVHJlZUVsZW1lbnQg Zm9yIGRlc2VsZWN0ZWQgaW5kZXggIiArIGluZGV4KTsKLSAgICAgICAgICAgIGlmICh0cmVlRWxl bWVudCkgeworICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50ICYmIHRyZWVFbGVtZW50Lmxpc3RJ dGVtRWxlbWVudCkgewogICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVu dC5jbGFzc0xpc3QucmVtb3ZlKCJzZWxlY3RlZCIpOwogICAgICAgICAgICAgICAgIGlmICghdGhp cy5fc3VwcHJlc3NOZXh0U2VsZWN0aW9uRGlkQ2hhbmdlRXZlbnQpCiAgICAgICAgICAgICAgICAg ICAgIHRyZWVFbGVtZW50LmRlc2VsZWN0KCk7CkBAIC04MTIsNyArODEyLDcgQEAgV0kuVHJlZU91 dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBmb3Ig KGxldCBpbmRleCBvZiBzZWxlY3RlZEl0ZW1zKSB7CiAgICAgICAgICAgICBsZXQgdHJlZUVsZW1l bnQgPSB0aGlzLl90cmVlRWxlbWVudEF0SW5kZXgoaW5kZXgpOwogICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQodHJlZUVsZW1lbnQsICJNaXNzaW5nIFRyZWVFbGVtZW50IGZvciBzZWxlY3RlZCBp bmRleCAiICsgaW5kZXgpOwotICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50KSB7CisgICAgICAg ICAgICBpZiAodHJlZUVsZW1lbnQgJiYgdHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50KSB7CiAg ICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNzTGlzdC5hZGQo InNlbGVjdGVkIik7CiAgICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9zdXBwcmVzc05leHRTZWxl Y3Rpb25EaWRDaGFuZ2VFdmVudCkKICAgICAgICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQuc2Vs ZWN0KCk7CkBAIC04MjEsMTIgKzgyMSwxMiBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVP dXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgbGV0IHNlbGVjdGVkVHJlZUVsZW1l bnQgPSB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQ7CiAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVF bGVtZW50ICE9PSB0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQpIHsKLSAgICAgICAg ICAgIGlmICh0aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQpCisgICAgICAgICAgICBp ZiAodGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50ICYmIHRoaXMuX3ByZXZpb3VzU2Vs ZWN0ZWRUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQpCiAgICAgICAgICAgICAgICAgdGhpcy5f cHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QucmVt b3ZlKCJsYXN0LXNlbGVjdGVkIik7CiAKICAgICAgICAgICAgIHRoaXMuX3ByZXZpb3VzU2VsZWN0 ZWRUcmVlRWxlbWVudCA9IHNlbGVjdGVkVHJlZUVsZW1lbnQ7CiAKLSAgICAgICAgICAgIGlmICh0 aGlzLl9wcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQpCisgICAgICAgICAgICBpZiAodGhpcy5f cHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50ICYmIHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVl RWxlbWVudC5saXN0SXRlbUVsZW1lbnQpCiAgICAgICAgICAgICAgICAgdGhpcy5fcHJldmlvdXNT ZWxlY3RlZFRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsYXN0LXNl bGVjdGVkIik7CiAgICAgICAgIH0KIAo= 357365 2018-12-14 18:01:26 -0800 2018-12-14 19:35:02 -0800 Patch for landing bug-192090-20181214180126.patch text/plain 3396 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw YTJhZTBkNzkwNTlmYTliYzE3Y2YzYWQzZmE3Mjg1ZDQzMWNmYzUyLi5lMzQ0YzM1MjY4ODAwNDM3 ODRmMzZiYzQwZWQxNWU5OGYzZDgxY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0xMi0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjM4NTk5KTogVW5jYXVnaHQg RXhjZXB0aW9uOiBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAn dHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmNsYXNzTGlzdCcpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIwOTAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ2MzE4NjE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanM6CisgICAgICAgIChX SS5UcmVlT3V0bGluZS5wcm90b3R5cGUuc2VsZWN0aW9uQ29udHJvbGxlclNlbGVjdGlvbkRpZENo YW5nZSk6CisgICAgICAgIENoZWNrIHRoYXQgYGxpc3RJdGVtRWxlbWVudGAgaXMgdmFsaWQgYmVm b3JlIGFjY2Vzc2luZyBpdCB0byB1cGRhdGUgY2xhc3MKKyAgICAgICAgbmFtZXMuIFRoZSBzZWxl Y3Rpb24gY2FuIGNoYW5nZSBiZWZvcmUgdGhlIFRyZWVFbGVtZW50IGhhcyBiZWVuIGF0dGFjaGVk LgorCiAyMDE4LTEyLTE0ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBDb29raWVzIHZpZXcgc2hvdWxkIHVzZSBtb2RlbCBvYmplY3Rz IGluc3RlYWQgb2YgcmF3IHBheWxvYWQgZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwppbmRleCAyNDdiNjU3 N2M0NzM2MDI5NTA5ZTc4ZWFhMGVmYzI4ZjU1YTM2Y2M1Li5jYzhiYjJkMDVmZjExYmIyZGEwZWE3 ODdiZjEzZDQ0ZTQ1N2VjMjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtODAzLDcgKzgwMyw4IEBA IFdJLlRyZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAg ICAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMuX3RyZWVFbGVtZW50QXRJbmRleChpbmRl eCk7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVudCwgIk1pc3NpbmcgVHJl ZUVsZW1lbnQgZm9yIGRlc2VsZWN0ZWQgaW5kZXggIiArIGluZGV4KTsKICAgICAgICAgICAgIGlm ICh0cmVlRWxlbWVudCkgewotICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50Lmxpc3RJdGVtRWxl bWVudC5jbGFzc0xpc3QucmVtb3ZlKCJzZWxlY3RlZCIpOworICAgICAgICAgICAgICAgIGlmICh0 cmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQpCisgICAgICAgICAgICAgICAgICAgIHRyZWVFbGVt ZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJzZWxlY3RlZCIpOwogICAgICAg ICAgICAgICAgIGlmICghdGhpcy5fc3VwcHJlc3NOZXh0U2VsZWN0aW9uRGlkQ2hhbmdlRXZlbnQp CiAgICAgICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LmRlc2VsZWN0KCk7CiAgICAgICAgICAg ICB9CkBAIC04MTMsNyArODE0LDggQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGlu ZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgbGV0IHRyZWVFbGVtZW50ID0gdGhpcy5f dHJlZUVsZW1lbnRBdEluZGV4KGluZGV4KTsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRy ZWVFbGVtZW50LCAiTWlzc2luZyBUcmVlRWxlbWVudCBmb3Igc2VsZWN0ZWQgaW5kZXggIiArIGlu ZGV4KTsKICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCkgewotICAgICAgICAgICAgICAgIHRy ZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzZWxlY3RlZCIpOworICAg ICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQpCisgICAgICAgICAg ICAgICAgICAgIHRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzZWxl Y3RlZCIpOwogICAgICAgICAgICAgICAgIGlmICghdGhpcy5fc3VwcHJlc3NOZXh0U2VsZWN0aW9u RGlkQ2hhbmdlRXZlbnQpCiAgICAgICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LnNlbGVjdCgp OwogICAgICAgICAgICAgfQpAQCAtODIxLDEyICs4MjMsMTIgQEAgV0kuVHJlZU91dGxpbmUgPSBj bGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIGxldCBzZWxlY3Rl ZFRyZWVFbGVtZW50ID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50OwogICAgICAgICBpZiAoc2Vs ZWN0ZWRUcmVlRWxlbWVudCAhPT0gdGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50KSB7 Ci0gICAgICAgICAgICBpZiAodGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50KQorICAg ICAgICAgICAgaWYgKHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudCAmJiB0aGlzLl9w cmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50KQogICAgICAgICAgICAg ICAgIHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuY2xh c3NMaXN0LnJlbW92ZSgibGFzdC1zZWxlY3RlZCIpOwogCiAgICAgICAgICAgICB0aGlzLl9wcmV2 aW91c1NlbGVjdGVkVHJlZUVsZW1lbnQgPSBzZWxlY3RlZFRyZWVFbGVtZW50OwogCi0gICAgICAg ICAgICBpZiAodGhpcy5fcHJldmlvdXNTZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAgICAgICAg aWYgKHRoaXMuX3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudCAmJiB0aGlzLl9wcmV2aW91c1Nl bGVjdGVkVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50KQogICAgICAgICAgICAgICAgIHRoaXMu X3ByZXZpb3VzU2VsZWN0ZWRUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgibGFzdC1zZWxlY3RlZCIpOwogICAgICAgICB9CiAK