190230 2018-10-02 18:04:27 -0700 Web Inspector: REGRESSION(r236540): Uncaught Exception: TypeError: pauseReasonBreakpointTreeElement.removeStatusImage is not a function. 2018-10-04 14:01:08 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://devinrousso.com/demo/WebKit/test.html InRadar P2 Normal --- 1 hi hi commit-queue inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1465858 0 hi 2018-10-02 18:04:27 -0700 ------- Inspected URL: https://devinrousso.com/demo/WebKit/test.html Loading completed: true Frontend User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko) Uncaught Exceptions: - TypeError: pauseReasonBreakpointTreeElement.removeStatusImage is not a function. (In 'pauseReasonBreakpointTreeElement.removeStatusImage()', 'pauseReasonBreakpointTreeElement.removeStatusImage' is undefined) (at DebuggerSidebarPanel.js:524:67) _removeBreakpoint @ DebuggerSidebarPanel.js:524:67 _breakpointRemoved @ DebuggerSidebarPanel.js:722:31 dispatch @ Object.js:170:30 dispatchEventToListeners @ Object.js:177:17 removeEventBreakpoint @ DOMDebuggerManager.js:259:38 ondelete @ EventBreakpointTreeElement.js:97:56 _treeKeyDown @ TreeOutline.js:579:60 _treeKeyDown @ [native code] ------- * STEPS TO REPRODUCE 1. Create a "click" event breakpoint 2. Click one of the "test" buttons in the page 3. Delete the "click" breakpoint in the Debugger sidebar 1465859 1 351463 hi 2018-10-02 18:20:58 -0700 Created attachment 351463 Patch 1466438 2 mattbaker 2018-10-04 12:10:05 -0700 Isn't the real issue here that EventBreakpointTreeElement doesn't inherit from BreakpointTreeElement? Why not? If the change introduced by this patch is indeed the correct thing to do, an explanation in the change log would help. 1466439 3 351463 mattbaker 2018-10-04 12:11:42 -0700 Comment on attachment 351463 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351463&action=review > Source/WebInspectorUI/ChangeLog:10 > + Leverage existing `status` getter/setter for creating/removing the breakpoint icon element. I don't disagree with the spirit of this refactoring, but it just creates code churn and doesn't seem necessary to the fix. 1466440 4 mattbaker 2018-10-04 12:13:10 -0700 (In reply to Matt Baker from comment #2) > Isn't the real issue here that EventBreakpointTreeElement doesn't inherit > from BreakpointTreeElement? Why not? If the change introduced by this patch > is indeed the correct thing to do, an explanation in the change log would > help. Alright I see that DOMBreakpointTreeElement and XHRBreakpointTreeElement also inherit from GeneralTreeElement, not BreakpointTreeElement. 1466448 5 351463 mattbaker 2018-10-04 12:17:40 -0700 Comment on attachment 351463 Patch r-, since a little investigating revealed the problem is with our wacky tree element class hierarchy, not event breakpoints specifically. The bug also reproduces with DOM breakpoints and (I assume) XHR breakpoints. I think the correct fix should resolve the general problem affecting all three. 1466469 6 351463 hi 2018-10-04 12:36:26 -0700 Comment on attachment 351463 Patch (In reply to Matt Baker from comment #5) > Comment on attachment 351463 [details] > Patch > > r-, since a little investigating revealed the problem is with our wacky tree > element class hierarchy, not event breakpoints specifically. The bug also > reproduces with DOM breakpoints and (I assume) XHR breakpoints. I think the > correct fix should resolve the general problem affecting all three. Instead of creating `removeStatusImage` functions on DOM, Event, and XHR breakpoint tree elements, I tried to find a solution that was already present for all three. They all use `status` as the holder of the breakpoint icon, so removing it there makes the most sense. I feel like this is a simpler solution than trying to create a base class for breakpoint tree elements (not to mention the name `WI.BreakpointTreeElement` already exists). 1466497 7 351463 mattbaker 2018-10-04 13:32:15 -0700 Comment on attachment 351463 Patch r=me 1466509 8 351463 commit-queue 2018-10-04 13:58:24 -0700 Comment on attachment 351463 Patch Clearing flags on attachment: 351463 Committed r236848: <https://trac.webkit.org/changeset/236848> 1466510 9 commit-queue 2018-10-04 13:58:26 -0700 All reviewed patches have been landed. Closing bug. 1466515 10 webkit-bug-importer 2018-10-04 14:01:08 -0700 <rdar://problem/45021035> 351463 2018-10-02 18:20:58 -0700 2018-10-04 13:58:24 -0700 Patch bug-190230-20181002182056.patch text/plain 16260 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUwNTc0YWQ0MDhjY2RjOGNjNjRlNGQ5YWVmNmY4 ZDkzNWQwNDNjNWEuLjdiNDg0Y2RmZDczZmY1ZjE1Mjg4ZWEwZmViODEwNmE1MDNiZjg3NTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE4LTEwLTAyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OKHIyMzY1NDApOiBVbmNhdWdodCBFeGNlcHRpb246IFR5cGVFcnJvcjogcGF1c2VS ZWFzb25CcmVha3BvaW50VHJlZUVsZW1lbnQucmVtb3ZlU3RhdHVzSW1hZ2UgaXMgbm90IGEgZnVu Y3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTAyMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChX SS5EZWJ1Z2dlclNpZGViYXJQYW5lbC5fcmVtb3ZlQnJlYWtwb2ludCk6CisgICAgICAgIExldmVy YWdlIGV4aXN0aW5nIGBzdGF0dXNgIGdldHRlci9zZXR0ZXIgZm9yIGNyZWF0aW5nL3JlbW92aW5n IHRoZSBicmVha3BvaW50IGljb24gZWxlbWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuQnJlYWtwb2ludFRy ZWVFbGVtZW50KToKKyAgICAgICAgKFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5wcm90b3R5cGUu cG9wdWxhdGVDb250ZXh0TWVudSk6CisgICAgICAgIChXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQu cHJvdG90eXBlLl91cGRhdGVTdGF0dXMpOgorICAgICAgICAoV0kuQnJlYWtwb2ludFRyZWVFbGVt ZW50LnByb3RvdHlwZS5yZW1vdmVTdGF0dXNJbWFnZSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0RPTUJyZWFrcG9pbnRUcmVlRWxlbWVudC5qczoKKyAgICAgICAg KFdJLkRPTUJyZWFrcG9pbnRUcmVlRWxlbWVudCk6CisgICAgICAgIChXSS5ET01CcmVha3BvaW50 VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKToKKyAgICAgICAgKFdJLkRPTUJyZWFrcG9p bnRUcmVlRWxlbWVudC5wcm90b3R5cGUub25kZXRhY2gpOgorICAgICAgICAoV0kuRE9NQnJlYWtw b2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlU3RhdHVzKToKKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRXZlbnRCcmVha3BvaW50VHJlZUVsZW1lbnQuanM6CisgICAgICAg IChXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudCk6CisgICAgICAgIChXSS5FdmVudEJyZWFr cG9pbnRUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgorICAgICAgICAoV0kuRXZlbnRC cmVha3BvaW50VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGV0YWNoKToKKyAgICAgICAgKFdJLkV2 ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlU3RhdHVzKToKKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvWEhSQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzOgor ICAgICAgICAoV0kuWEhSQnJlYWtwb2ludFRyZWVFbGVtZW50KToKKyAgICAgICAgKFdJLlhIUkJy ZWFrcG9pbnRUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgorICAgICAgICAoV0kuWEhS QnJlYWtwb2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmRldGFjaCk6CisgICAgICAgIChXSS5Y SFJCcmVha3BvaW50VHJlZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVTdGF0dXMpOgorCiAyMDE4 LTEwLTAyICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFN0eWxlczogc3RhcnQgZWRpdGluZyBwcm9wZXJ0eSBuYW1lL3ZhbHVl IG9uIG1vdXNldXAgaW5zdGVhZCBvZiBtb3VzZWRvd24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVudC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVl RWxlbWVudC5qcwppbmRleCBkOWEyMjlmNDkyYzZmZTU2ZGRmNTdhZTk0MzQ2ODk2MTIyM2M3Yjli Li43Y2M3NzU4NWQ5YTM4MWVlYmMzNjI1ZWYxYWJmNmZlOWQyOWQxNmI0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVs ZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCkBAIC00OSwxNyArNDksMTUgQEAgV0kuQnJlYWtwb2lu dFRyZWVFbGVtZW50ID0gY2xhc3MgQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2Vu ZXJhbFRyZWVFbGUKICAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIoV0kucHJvYmVN YW5hZ2VyLCBXSS5Qcm9iZU1hbmFnZXIuRXZlbnQuUHJvYmVTZXRBZGRlZCwgdGhpcy5fcHJvYmVT ZXRBZGRlZCk7CiAgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0LnJlZ2lzdGVyKFdJLnByb2JlTWFu YWdlciwgV0kuUHJvYmVNYW5hZ2VyLkV2ZW50LlByb2JlU2V0UmVtb3ZlZCwgdGhpcy5fcHJvYmVT ZXRSZW1vdmVkKTsKIAotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJpbWciKTsKLSAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50 LmNsYXNzTmFtZSA9IFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZUVsZW1lbnRT dHlsZUNsYXNzTmFtZTsKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIodGhpcy5f c3RhdHVzSW1hZ2VFbGVtZW50LCAibW91c2Vkb3duIiwgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50 TW91c2VEb3duKTsKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIodGhpcy5fc3Rh dHVzSW1hZ2VFbGVtZW50LCAiY2xpY2siLCB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnRDbGlja2Vk KTsKKyAgICAgICAgdGhpcy5zdGF0dXMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsK KyAgICAgICAgdGhpcy5zdGF0dXMuY2xhc3NOYW1lID0gV0kuQnJlYWtwb2ludFRyZWVFbGVtZW50 LlN0YXR1c0ltYWdlRWxlbWVudFN0eWxlQ2xhc3NOYW1lOworICAgICAgICB0aGlzLl9saXN0ZW5l clNldC5yZWdpc3Rlcih0aGlzLnN0YXR1cywgIm1vdXNlZG93biIsIHRoaXMuX3N0YXR1c0ltYWdl RWxlbWVudE1vdXNlRG93bik7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0LnJlZ2lzdGVyKHRo aXMuc3RhdHVzLCAiY2xpY2siLCB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnRDbGlja2VkKTsKIAog ICAgICAgICBpZiAoIXRpdGxlKQogICAgICAgICAgICAgdGhpcy5fdXBkYXRlVGl0bGVzKCk7CiAg ICAgICAgIHRoaXMuX3VwZGF0ZVN0YXR1cygpOwogCi0gICAgICAgIHRoaXMuc3RhdHVzID0gdGhp cy5fc3RhdHVzSW1hZ2VFbGVtZW50OwotCiAgICAgICAgIHRoaXMuX2ljb25BbmltYXRpb25MYXll ckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHRoaXMu aWNvbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5faWNvbkFuaW1hdGlvbkxheWVyRWxlbWVudCk7 CiAgICAgICAgIHRoaXMudG9vbHRpcEhhbmRsZWRTZXBhcmF0ZWx5ID0gdHJ1ZTsKQEAgLTEyNiwx NyArMTI0LDExIEBAIFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudCA9IGNsYXNzIEJyZWFrcG9pbnRU cmVlRWxlbWVudCBleHRlbmRzIFdJLkdlbmVyYWxUcmVlRWxlCiAKICAgICBwb3B1bGF0ZUNvbnRl eHRNZW51KGNvbnRleHRNZW51LCBldmVudCkKICAgICB7Ci0gICAgICAgIFdJLmJyZWFrcG9pbnRQ b3BvdmVyQ29udHJvbGxlci5hcHBlbmRDb250ZXh0TWVudUl0ZW1zKGNvbnRleHRNZW51LCB0aGlz Ll9icmVha3BvaW50LCB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQpOworICAgICAgICBXSS5icmVh a3BvaW50UG9wb3ZlckNvbnRyb2xsZXIuYXBwZW5kQ29udGV4dE1lbnVJdGVtcyhjb250ZXh0TWVu dSwgdGhpcy5fYnJlYWtwb2ludCwgdGhpcy5zdGF0dXMpOwogCiAgICAgICAgIHN1cGVyLnBvcHVs YXRlQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIGV2ZW50KTsKICAgICB9CiAKLSAgICByZW1vdmVT dGF0dXNJbWFnZSgpCi0gICAgewotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQucmVt b3ZlKCk7Ci0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCA9IG51bGw7Ci0gICAgfQot CiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3VwZGF0ZVRpdGxlcygpCkBAIC0xNjQsMjMgKzE1Niwy MyBAQCBXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1l bnQgZXh0ZW5kcyBXSS5HZW5lcmFsVHJlZUVsZQogCiAgICAgX3VwZGF0ZVN0YXR1cygpCiAgICAg ewotICAgICAgICBpZiAoIXRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCkKKyAgICAgICAgaWYgKCF0 aGlzLnN0YXR1cykKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAodGhpcy5fYnJl YWtwb2ludC5kaXNhYmxlZCkKLSAgICAgICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5j bGFzc0xpc3QuYWRkKFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZURpc2FibGVk U3R5bGVDbGFzc05hbWUpOworICAgICAgICAgICAgdGhpcy5zdGF0dXMuY2xhc3NMaXN0LmFkZChX SS5CcmVha3BvaW50VHJlZUVsZW1lbnQuU3RhdHVzSW1hZ2VEaXNhYmxlZFN0eWxlQ2xhc3NOYW1l KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmNs YXNzTGlzdC5yZW1vdmUoV0kuQnJlYWtwb2ludFRyZWVFbGVtZW50LlN0YXR1c0ltYWdlRGlzYWJs ZWRTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgICAgICB0aGlzLnN0YXR1cy5jbGFzc0xpc3QucmVt b3ZlKFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZURpc2FibGVkU3R5bGVDbGFz c05hbWUpOwogCiAgICAgICAgIGlmICh0aGlzLl9icmVha3BvaW50LmF1dG9Db250aW51ZSkKLSAg ICAgICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLkJyZWFr cG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZUF1dG9Db250aW51ZVN0eWxlQ2xhc3NOYW1lKTsK KyAgICAgICAgICAgIHRoaXMuc3RhdHVzLmNsYXNzTGlzdC5hZGQoV0kuQnJlYWtwb2ludFRyZWVF bGVtZW50LlN0YXR1c0ltYWdlQXV0b0NvbnRpbnVlU3R5bGVDbGFzc05hbWUpOwogICAgICAgICBl bHNlCi0gICAgICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQuY2xhc3NMaXN0LnJlbW92 ZShXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQuU3RhdHVzSW1hZ2VBdXRvQ29udGludWVTdHlsZUNs YXNzTmFtZSk7CisgICAgICAgICAgICB0aGlzLnN0YXR1cy5jbGFzc0xpc3QucmVtb3ZlKFdJLkJy ZWFrcG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZUF1dG9Db250aW51ZVN0eWxlQ2xhc3NOYW1l KTsKIAogICAgICAgICBpZiAodGhpcy5fYnJlYWtwb2ludC5yZXNvbHZlZCAmJiBXSS5kZWJ1Z2dl ck1hbmFnZXIuYnJlYWtwb2ludHNFbmFibGVkKQotICAgICAgICAgICAgdGhpcy5fc3RhdHVzSW1h Z2VFbGVtZW50LmNsYXNzTGlzdC5hZGQoV0kuQnJlYWtwb2ludFRyZWVFbGVtZW50LlN0YXR1c0lt YWdlUmVzb2x2ZWRTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgICAgICB0aGlzLnN0YXR1cy5jbGFz c0xpc3QuYWRkKFdJLkJyZWFrcG9pbnRUcmVlRWxlbWVudC5TdGF0dXNJbWFnZVJlc29sdmVkU3R5 bGVDbGFzc05hbWUpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9zdGF0dXNJbWFn ZUVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQuU3RhdHVz SW1hZ2VSZXNvbHZlZFN0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAgICAgIHRoaXMuc3RhdHVzLmNs YXNzTGlzdC5yZW1vdmUoV0kuQnJlYWtwb2ludFRyZWVFbGVtZW50LlN0YXR1c0ltYWdlUmVzb2x2 ZWRTdHlsZUNsYXNzTmFtZSk7CiAgICAgfQogCiAgICAgX2FkZFByb2JlU2V0KHByb2JlU2V0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IDdjMjA0OWY1MDli ZTIxYzE5NmRiOWNmMzAzMDdkNTc5ZWRkYzA3YTguLjRiMmM1ZDA0ZmFiNzEwYjdlYzMyYTczMjU1 YzQzNWJkZTdjZGYwNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTUJyZWFrcG9pbnRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01CcmVha3BvaW50VHJlZUVsZW1lbnQu anMKQEAgLTM4LDkgKzM4LDkgQEAgV0kuRE9NQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3Mg RE9NQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFQKICAgICAgICAgY29u c3Qgc3VidGl0bGUgPSBudWxsOwogICAgICAgICBzdXBlcihbImJyZWFrcG9pbnQiLCAiZG9tIiwg Y2xhc3NOYW1lXSwgdGl0bGUsIHN1YnRpdGxlLCBicmVha3BvaW50KTsKIAotICAgICAgICB0aGlz Ll9zdGF0dXNJbWFnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsKLSAg ICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmNsYXNzTGlzdC5hZGQoInN0YXR1cy1pbWFn ZSIsICJyZXNvbHZlZCIpOwotICAgICAgICB0aGlzLnN0YXR1cyA9IHRoaXMuX3N0YXR1c0ltYWdl RWxlbWVudDsKKyAgICAgICAgdGhpcy5zdGF0dXMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJp bWciKTsKKyAgICAgICAgdGhpcy5zdGF0dXMuY2xhc3NMaXN0LmFkZCgic3RhdHVzLWltYWdlIiwg InJlc29sdmVkIik7CisKICAgICAgICAgdGhpcy50b29sdGlwSGFuZGxlZFNlcGFyYXRlbHkgPSB0 cnVlOwogCiAgICAgICAgIGJyZWFrcG9pbnQuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01CcmVha3Bv aW50LkV2ZW50LkRpc2FibGVkU3RhdGVEaWRDaGFuZ2UsIHRoaXMuX3VwZGF0ZVN0YXR1cywgdGhp cyk7CkBAIC03NSwxOCArNzUsMTggQEAgV0kuRE9NQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xh c3MgRE9NQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFQKICAgICAgICAg dGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkID0gdGhpcy5fc3RhdHVzSW1hZ2VF bGVtZW50Rm9jdXNlZC5iaW5kKHRoaXMpOwogICAgICAgICB0aGlzLl9ib3VuZFN0YXR1c0ltYWdl RWxlbWVudE1vdXNlRG93biA9IHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudE1vdXNlRG93bi5iaW5k KHRoaXMpOwogCi0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCk7Ci0gICAg ICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJmb2N1cyIsIHRo aXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50Rm9jdXNlZCk7Ci0gICAgICAgIHRoaXMuX3N0YXR1 c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9ib3VuZFN0 YXR1c0ltYWdlRWxlbWVudE1vdXNlRG93bik7CisgICAgICAgIHRoaXMuc3RhdHVzLmFkZEV2ZW50 TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRDbGlja2VkKTsK KyAgICAgICAgdGhpcy5zdGF0dXMuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9ib3Vu ZFN0YXR1c0ltYWdlRWxlbWVudEZvY3VzZWQpOworICAgICAgICB0aGlzLnN0YXR1cy5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudE1vdXNl RG93bik7CiAgICAgfQogCiAgICAgb25kZXRhY2goKQogICAgIHsKICAgICAgICAgc3VwZXIub25k ZXRhY2goKTsKIAotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQucmVtb3ZlRXZlbnRM aXN0ZW5lcigiY2xpY2siLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudENsaWNrZWQpOwot ICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigiZm9j dXMiLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudEZvY3VzZWQpOwotICAgICAgICB0aGlz Ll9zdGF0dXNJbWFnZUVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRNb3VzZURvd24pOworICAgICAgICB0aGlzLnN0YXR1 cy5yZW1vdmVFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVt ZW50Q2xpY2tlZCk7CisgICAgICAgIHRoaXMuc3RhdHVzLnJlbW92ZUV2ZW50TGlzdGVuZXIoImZv Y3VzIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkKTsKKyAgICAgICAgdGhp cy5zdGF0dXMucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fYm91bmRTdGF0 dXNJbWFnZUVsZW1lbnRNb3VzZURvd24pOwogCiAgICAgICAgIHRoaXMuX2JvdW5kU3RhdHVzSW1h Z2VFbGVtZW50Q2xpY2tlZCA9IG51bGw7CiAgICAgICAgIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VF bGVtZW50Rm9jdXNlZCA9IG51bGw7CkBAIC0xNTQsNiArMTU0LDYgQEAgV0kuRE9NQnJlYWtwb2lu dFRyZWVFbGVtZW50ID0gY2xhc3MgRE9NQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0ku R2VuZXJhbFQKIAogICAgIF91cGRhdGVTdGF0dXMoKQogICAgIHsKLSAgICAgICAgdGhpcy5fc3Rh dHVzSW1hZ2VFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImRpc2FibGVkIiwgdGhpcy5yZXByZXNl bnRlZE9iamVjdC5kaXNhYmxlZCk7CisgICAgICAgIHRoaXMuc3RhdHVzLmNsYXNzTGlzdC50b2dn bGUoImRpc2FibGVkIiwgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5kaXNhYmxlZCk7CiAgICAgfQog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggMjg0NTk5MGE0YjNlZjg0 NjY2NjEwNjZhNTg1NTc1MDJhNzQzZTA1Ni4uZDFlMzVlYmVkMGM4YWY1NDVkYTA2YTIyOGVjNzQx NTY5ZTg4N2U1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTUyMSw3 ICs1MjEsNyBAQCBXSS5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJh clBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYQogICAgICAgICBpZiAodGhpcy5fcGF1 c2VSZWFzb25UcmVlT3V0bGluZSkgewogICAgICAgICAgICAgbGV0IHBhdXNlUmVhc29uQnJlYWtw b2ludFRyZWVFbGVtZW50ID0gdGhpcy5fcGF1c2VSZWFzb25UcmVlT3V0bGluZS5nZXRDYWNoZWRU cmVlRWxlbWVudChicmVha3BvaW50KTsKICAgICAgICAgICAgIGlmIChwYXVzZVJlYXNvbkJyZWFr cG9pbnRUcmVlRWxlbWVudCkKLSAgICAgICAgICAgICAgICBwYXVzZVJlYXNvbkJyZWFrcG9pbnRU cmVlRWxlbWVudC5yZW1vdmVTdGF0dXNJbWFnZSgpOworICAgICAgICAgICAgICAgIHBhdXNlUmVh c29uQnJlYWtwb2ludFRyZWVFbGVtZW50LnN0YXR1cyA9IG51bGw7CiAgICAgICAgIH0KIAogICAg ICAgICBsZXQgYnJlYWtwb2ludFRyZWVFbGVtZW50ID0gdGhpcy5fYnJlYWtwb2ludHNDb250ZW50 VHJlZU91dGxpbmUuZ2V0Q2FjaGVkVHJlZUVsZW1lbnQoYnJlYWtwb2ludCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FdmVudEJyZWFrcG9p bnRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0V2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IGI1YTdkZDFhNjVhNzM5YmMz NzQ2ODRlMzUzY2U3NGU3NmYxM2MyNjIuLjY4N2FiYzVkZjE4NzQ3OTg3NDYyMmYyNDA5YzIxMDhl NjllOWM2NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0V2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0V2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50Lmpz CkBAIC0zOSw5ICszOSwxMCBAQCBXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudCA9IGNsYXNz IEV2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZQogICAgICAgICBjb25z dCBzdWJ0aXRsZSA9IG51bGw7CiAgICAgICAgIHN1cGVyKGNsYXNzTmFtZXMsIHRpdGxlLCBzdWJ0 aXRsZSwgYnJlYWtwb2ludCk7CiAKLSAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7Ci0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdl RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzdGF0dXMtaW1hZ2UiLCAicmVzb2x2ZWQiKTsKLSAgICAg ICAgdGhpcy5zdGF0dXMgPSB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQ7CisgICAgICAgIHRoaXMu c3RhdHVzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CisgICAgICAgIHRoaXMuc3Rh dHVzLmNsYXNzTGlzdC5hZGQoInN0YXR1cy1pbWFnZSIsICJyZXNvbHZlZCIpOworCisgICAgICAg IHRoaXMudG9vbHRpcEhhbmRsZWRTZXBhcmF0ZWx5ID0gdHJ1ZTsKIAogICAgICAgICBicmVha3Bv aW50LmFkZEV2ZW50TGlzdGVuZXIoV0kuRXZlbnRCcmVha3BvaW50LkV2ZW50LkRpc2FibGVkU3Rh dGVEaWRDaGFuZ2UsIHRoaXMuX3VwZGF0ZVN0YXR1cywgdGhpcyk7CiAKQEAgLTU4LDE4ICs1OSwx OCBAQCBXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudCA9IGNsYXNzIEV2ZW50QnJlYWtwb2lu dFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZQogICAgICAgICB0aGlzLl9ib3VuZFN0YXR1c0lt YWdlRWxlbWVudEZvY3VzZWQgPSB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkLmJpbmQo dGhpcyk7CiAgICAgICAgIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50TW91c2VEb3duID0g dGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50TW91c2VEb3duLmJpbmQodGhpcyk7CiAKLSAgICAgICAg dGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5f Ym91bmRTdGF0dXNJbWFnZUVsZW1lbnRDbGlja2VkKTsKLSAgICAgICAgdGhpcy5fc3RhdHVzSW1h Z2VFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFn ZUVsZW1lbnRGb2N1c2VkKTsKLSAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50TW91 c2VEb3duKTsKKyAgICAgICAgdGhpcy5zdGF0dXMuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudENsaWNrZWQpOworICAgICAgICB0aGlzLnN0YXR1 cy5hZGRFdmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50 Rm9jdXNlZCk7CisgICAgICAgIHRoaXMuc3RhdHVzLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50TW91c2VEb3duKTsKICAgICB9CiAKICAg ICBvbmRldGFjaCgpCiAgICAgewogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogCi0gICAgICAg IHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCk7Ci0gICAgICAgIHRoaXMuX3N0YXR1 c0ltYWdlRWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX2JvdW5kU3Rh dHVzSW1hZ2VFbGVtZW50Rm9jdXNlZCk7Ci0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVu dC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdl RWxlbWVudE1vdXNlRG93bik7CisgICAgICAgIHRoaXMuc3RhdHVzLnJlbW92ZUV2ZW50TGlzdGVu ZXIoImNsaWNrIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRDbGlja2VkKTsKKyAgICAg ICAgdGhpcy5zdGF0dXMucmVtb3ZlRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9ib3VuZFN0 YXR1c0ltYWdlRWxlbWVudEZvY3VzZWQpOworICAgICAgICB0aGlzLnN0YXR1cy5yZW1vdmVFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudE1vdXNl RG93bik7CiAKICAgICAgICAgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRDbGlja2VkID0g bnVsbDsKICAgICAgICAgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkID0gbnVs bDsKQEAgLTE1MSw2ICsxNTIsNiBAQCBXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudCA9IGNs YXNzIEV2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZQogCiAgICAgX3Vw ZGF0ZVN0YXR1cygpCiAgICAgewotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQuY2xh c3NMaXN0LnRvZ2dsZSgiZGlzYWJsZWQiLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmRpc2FibGVk KTsKKyAgICAgICAgdGhpcy5zdGF0dXMuY2xhc3NMaXN0LnRvZ2dsZSgiZGlzYWJsZWQiLCB0aGlz LnJlcHJlc2VudGVkT2JqZWN0LmRpc2FibGVkKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvWEhSQnJlYWtwb2ludFRyZWVF bGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvWEhS QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IGZiNzJlZDljNTdkNmU4NzcwOWM5ZjU3ZWFk OGU3ODc5NzE5ZWU1MzEuLjgyNzQyM2Q1ZTMzN2MxNWYwNWQ0NGQ2ZDQwYmEyZWZjNGVmZjJhN2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1hI UkJyZWFrcG9pbnRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9YSFJCcmVha3BvaW50VHJlZUVsZW1lbnQuanMKQEAgLTQzLDkgKzQz LDkgQEAgV0kuWEhSQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3MgWEhSQnJlYWtwb2ludFRy ZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFQKIAogICAgICAgICBzdXBlcihbImJyZWFrcG9p bnQiLCAieGhyIiwgY2xhc3NOYW1lXSwgdGl0bGUsIHN1YnRpdGxlLCBicmVha3BvaW50KTsKIAot ICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJpbWciKTsKLSAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmNsYXNzTGlzdC5hZGQo InN0YXR1cy1pbWFnZSIsICJyZXNvbHZlZCIpOwotICAgICAgICB0aGlzLnN0YXR1cyA9IHRoaXMu X3N0YXR1c0ltYWdlRWxlbWVudDsKKyAgICAgICAgdGhpcy5zdGF0dXMgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJpbWciKTsKKyAgICAgICAgdGhpcy5zdGF0dXMuY2xhc3NMaXN0LmFkZCgic3Rh dHVzLWltYWdlIiwgInJlc29sdmVkIik7CisKICAgICAgICAgdGhpcy50b29sdGlwSGFuZGxlZFNl cGFyYXRlbHkgPSB0cnVlOwogCiAgICAgICAgIGJyZWFrcG9pbnQuYWRkRXZlbnRMaXN0ZW5lcihX SS5YSFJCcmVha3BvaW50LkV2ZW50LkRpc2FibGVkU3RhdGVEaWRDaGFuZ2UsIHRoaXMuX3VwZGF0 ZVN0YXR1cywgdGhpcyk7CkBAIC02MywxOCArNjMsMTggQEAgV0kuWEhSQnJlYWtwb2ludFRyZWVF bGVtZW50ID0gY2xhc3MgWEhSQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJh bFQKICAgICAgICAgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkID0gdGhpcy5f c3RhdHVzSW1hZ2VFbGVtZW50Rm9jdXNlZC5iaW5kKHRoaXMpOwogICAgICAgICB0aGlzLl9ib3Vu ZFN0YXR1c0ltYWdlRWxlbWVudE1vdXNlRG93biA9IHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudE1v dXNlRG93bi5iaW5kKHRoaXMpOwogCi0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50Q2xp Y2tlZCk7Ci0gICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJmb2N1cyIsIHRoaXMuX2JvdW5kU3RhdHVzSW1hZ2VFbGVtZW50Rm9jdXNlZCk7Ci0gICAgICAg IHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudE1vdXNlRG93bik7CisgICAgICAgIHRoaXMuc3Rh dHVzLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1l bnRDbGlja2VkKTsKKyAgICAgICAgdGhpcy5zdGF0dXMuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMi LCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudEZvY3VzZWQpOworICAgICAgICB0aGlzLnN0 YXR1cy5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdl RWxlbWVudE1vdXNlRG93bik7CiAgICAgfQogCiAgICAgb25kZXRhY2goKQogICAgIHsKICAgICAg ICAgc3VwZXIub25kZXRhY2goKTsKIAotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQu cmVtb3ZlRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVu dENsaWNrZWQpOwotICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQucmVtb3ZlRXZlbnRM aXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9ib3VuZFN0YXR1c0ltYWdlRWxlbWVudEZvY3VzZWQpOwot ICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRNb3VzZURvd24pOworICAgICAg ICB0aGlzLnN0YXR1cy5yZW1vdmVFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JvdW5kU3Rh dHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCk7CisgICAgICAgIHRoaXMuc3RhdHVzLnJlbW92ZUV2ZW50 TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRGb2N1c2VkKTsK KyAgICAgICAgdGhpcy5zdGF0dXMucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5fYm91bmRTdGF0dXNJbWFnZUVsZW1lbnRNb3VzZURvd24pOwogCiAgICAgICAgIHRoaXMuX2Jv dW5kU3RhdHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCA9IG51bGw7CiAgICAgICAgIHRoaXMuX2JvdW5k U3RhdHVzSW1hZ2VFbGVtZW50Rm9jdXNlZCA9IG51bGw7CkBAIC0xNDMsNiArMTQzLDYgQEAgV0ku WEhSQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3MgWEhSQnJlYWtwb2ludFRyZWVFbGVtZW50 IGV4dGVuZHMgV0kuR2VuZXJhbFQKIAogICAgIF91cGRhdGVTdGF0dXMoKQogICAgIHsKLSAgICAg ICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImRpc2FibGVkIiwg dGhpcy5yZXByZXNlbnRlZE9iamVjdC5kaXNhYmxlZCk7CisgICAgICAgIHRoaXMuc3RhdHVzLmNs YXNzTGlzdC50b2dnbGUoImRpc2FibGVkIiwgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5kaXNhYmxl ZCk7CiAgICAgfQogfTsK