153268 2016-01-19 21:12:31 -0800 Web Inspector: Subclasses of WebInspector.Object shouldn't overwrite this._listeners 2016-01-19 22:21:15 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1156866 0 nvasilyev 2016-01-19 21:12:31 -0800 Here is a stack trace: [Error] object._listeners should be a Map but it isn't. `object` is most likely a WebInspector.EventListenerSet. dispatch (Object.js:146) dispatchEventToListeners (Object.js:167) mainTitle (GeneralTreeElement.js:133) _updateTitles (BreakpointTreeElement.js:143) BreakpointTreeElement (BreakpointTreeElement.js:57) _addBreakpoint (DebuggerSidebarPanel.js:297) _addBreakpointsForSourceCode (DebuggerSidebarPanel.js:308) _addResource (DebuggerSidebarPanel.js:367) _resourceAdded (DebuggerSidebarPanel.js:358) dispatch (Object.js:160) dispatchEventToListeners (Object.js:175) addResource (Frame.js:407) _addFrameTreeFromFrameResourceTreePayload (FrameResourceManager.js:563) _processMainFrameResourceTreePayload (FrameResourceManager.js:514) _processMainFrameResourceTreePayload _dispatchResponseToCallback (InspectorBackend.js:297) _dispatchResponse (InspectorBackend.js:270) dispatch (InspectorBackend.js:149) dispatchNextQueuedMessageFromBackend (MessageDispatcher.js:42) 1156867 1 webkit-bug-importer 2016-01-19 21:12:57 -0800 <rdar://problem/24252766> 1156868 2 269333 nvasilyev 2016-01-19 21:21:22 -0800 Created attachment 269333 Patch 1156887 3 269333 commit-queue 2016-01-19 22:21:11 -0800 Comment on attachment 269333 Patch Clearing flags on attachment: 269333 Committed r195343: <http://trac.webkit.org/changeset/195343> 1156888 4 commit-queue 2016-01-19 22:21:15 -0800 All reviewed patches have been landed. Closing bug. 269333 2016-01-19 21:21:22 -0800 2016-01-19 22:21:11 -0800 Patch patch.txt text/plain 10409 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFiN2QxNTYuLjgzMGM4YWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTAxLTE5ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN1YmNs YXNzZXMgb2YgV2ViSW5zcGVjdG9yLk9iamVjdCBzaG91bGRuJ3Qgb3ZlcndyaXRlIHRoaXMuX2xp c3RlbmVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUzMjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNDI1Mjc2Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9P YmplY3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZS5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMpOgorICAgICAgICBBZGQgYSBjb25zb2xlLmFzc2VydC4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmRldGFj aCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2JlU2V0RGF0YUdyaWQucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlByb2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIFJlcGxh Y2UgYWxsIGluc3RhbmNlcyBvZiAidGhpcy5fbGlzdGVuZXJzIiB3aXRoICJ0aGlzLl9saXN0ZW5l clNldCIuCisKIDIwMTYtMDEtMTkgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBwcm90b2NvbCB2ZXJzaW9uIGZvciBpT1Mg OS4zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L09iamVjdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvT2Jq ZWN0LmpzCmluZGV4IDBmMzUxMTguLmEyNzE2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvT2JqZWN0LmpzCkBAIC0xNDIsMTAgKzE0Miw3IEBA IFdlYkluc3BlY3Rvci5PYmplY3QgPSBjbGFzcyBXZWJJbnNwZWN0b3JPYmplY3QKICAgICAgICAg ICAgIGlmICghb2JqZWN0IHx8ICFvYmplY3QuX2xpc3RlbmVycyB8fCBldmVudC5fc3RvcHBlZFBy b3BhZ2F0aW9uKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYgKCEo b2JqZWN0Ll9saXN0ZW5lcnMgaW5zdGFuY2VvZiBNYXApKSB7Ci0gICAgICAgICAgICAgICAgY29u c29sZS5lcnJvcigib2JqZWN0Ll9saXN0ZW5lcnMgc2hvdWxkIGJlIGEgTWFwIGJ1dCBpdCBpc24n dC5cbmBvYmplY3RgIGlzIG1vc3QgbGlrZWx5IGEgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJT ZXQuIik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgICAgICAg ICAgY29uc29sZS5hc3NlcnQob2JqZWN0Ll9saXN0ZW5lcnMgaW5zdGFuY2VvZiBNYXApOwogCiAg ICAgICAgICAgICBsZXQgbGlzdGVuZXJzVGFibGUgPSBvYmplY3QuX2xpc3RlbmVycy5nZXQoZXZl bnRUeXBlKTsKICAgICAgICAgICAgIGlmICghbGlzdGVuZXJzVGFibGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVs ZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVh a3BvaW50VHJlZUVsZW1lbnQuanMKaW5kZXggNzQwY2EyZC4uNjAzMzUzNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVF bGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0JyZWFrcG9pbnRUcmVlRWxlbWVudC5qcwpAQCAtMzcsMjEgKzM3LDIxIEBAIFdlYkluc3BlY3Rv ci5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwCiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnQgPSBicmVha3BvaW50OwogICAg ICAgICB0aGlzLl9wcm9iZVNldCA9IG51bGw7CiAKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzID0g bmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0KHRoaXMsICJCcmVha3BvaW50VHJlZUVs ZW1lbnQgbGlzdGVuZXJzIik7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0ID0gbmV3IFdlYklu c3BlY3Rvci5FdmVudExpc3RlbmVyU2V0KHRoaXMsICJCcmVha3BvaW50VHJlZUVsZW1lbnQgbGlz dGVuZXJzIik7CiAgICAgICAgIGlmICghdGl0bGUpCi0gICAgICAgICAgICB0aGlzLl9saXN0ZW5l cnMucmVnaXN0ZXIoYnJlYWtwb2ludCwgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuTG9j YXRpb25EaWRDaGFuZ2UsIHRoaXMuX2JyZWFrcG9pbnRMb2NhdGlvbkRpZENoYW5nZSk7Ci0gICAg ICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihicmVha3BvaW50LCBXZWJJbnNwZWN0b3IuQnJl YWtwb2ludC5FdmVudC5EaXNhYmxlZFN0YXRlRGlkQ2hhbmdlLCB0aGlzLl91cGRhdGVTdGF0dXMp OwotICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIoYnJlYWtwb2ludCwgV2ViSW5zcGVj dG9yLkJyZWFrcG9pbnQuRXZlbnQuQXV0b0NvbnRpbnVlRGlkQ2hhbmdlLCB0aGlzLl91cGRhdGVT dGF0dXMpOwotICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIoYnJlYWtwb2ludCwgV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuUmVzb2x2ZWRTdGF0ZURpZENoYW5nZSwgdGhpcy5f dXBkYXRlU3RhdHVzKTsKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIsIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQu QnJlYWtwb2ludHNFbmFibGVkRGlkQ2hhbmdlLCB0aGlzLl91cGRhdGVTdGF0dXMpOworICAgICAg ICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIoYnJlYWtwb2ludCwgV2ViSW5zcGVjdG9y LkJyZWFrcG9pbnQuRXZlbnQuTG9jYXRpb25EaWRDaGFuZ2UsIHRoaXMuX2JyZWFrcG9pbnRMb2Nh dGlvbkRpZENoYW5nZSk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0LnJlZ2lzdGVyKGJyZWFr cG9pbnQsIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LkV2ZW50LkRpc2FibGVkU3RhdGVEaWRDaGFu Z2UsIHRoaXMuX3VwZGF0ZVN0YXR1cyk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0LnJlZ2lz dGVyKGJyZWFrcG9pbnQsIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LkV2ZW50LkF1dG9Db250aW51 ZURpZENoYW5nZSwgdGhpcy5fdXBkYXRlU3RhdHVzKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJT ZXQucmVnaXN0ZXIoYnJlYWtwb2ludCwgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuUmVz b2x2ZWRTdGF0ZURpZENoYW5nZSwgdGhpcy5fdXBkYXRlU3RhdHVzKTsKKyAgICAgICAgdGhpcy5f bGlzdGVuZXJTZXQucmVnaXN0ZXIoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlciwgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5CcmVha3BvaW50c0VuYWJsZWREaWRDaGFuZ2Us IHRoaXMuX3VwZGF0ZVN0YXR1cyk7CiAKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVy KFdlYkluc3BlY3Rvci5wcm9iZU1hbmFnZXIsIFdlYkluc3BlY3Rvci5Qcm9iZU1hbmFnZXIuRXZl bnQuUHJvYmVTZXRBZGRlZCwgdGhpcy5fcHJvYmVTZXRBZGRlZCk7Ci0gICAgICAgIHRoaXMuX2xp c3RlbmVycy5yZWdpc3RlcihXZWJJbnNwZWN0b3IucHJvYmVNYW5hZ2VyLCBXZWJJbnNwZWN0b3Iu UHJvYmVNYW5hZ2VyLkV2ZW50LlByb2JlU2V0UmVtb3ZlZCwgdGhpcy5fcHJvYmVTZXRSZW1vdmVk KTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIoV2ViSW5zcGVjdG9yLnByb2Jl TWFuYWdlciwgV2ViSW5zcGVjdG9yLlByb2JlTWFuYWdlci5FdmVudC5Qcm9iZVNldEFkZGVkLCB0 aGlzLl9wcm9iZVNldEFkZGVkKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0ZXIo V2ViSW5zcGVjdG9yLnByb2JlTWFuYWdlciwgV2ViSW5zcGVjdG9yLlByb2JlTWFuYWdlci5FdmVu dC5Qcm9iZVNldFJlbW92ZWQsIHRoaXMuX3Byb2JlU2V0UmVtb3ZlZCk7CiAKICAgICAgICAgdGhp cy5fc3RhdHVzSW1hZ2VFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAg ICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3Iu QnJlYWtwb2ludFRyZWVFbGVtZW50LlN0YXR1c0ltYWdlRWxlbWVudFN0eWxlQ2xhc3NOYW1lOwot ICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIodGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50 LCAibW91c2Vkb3duIiwgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50TW91c2VEb3duKTsKLSAgICAg ICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCwgImNs aWNrIiwgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCk7CisgICAgICAgIHRoaXMuX2xp c3RlbmVyU2V0LnJlZ2lzdGVyKHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCwgIm1vdXNlZG93biIs IHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudE1vdXNlRG93bik7CisgICAgICAgIHRoaXMuX2xpc3Rl bmVyU2V0LnJlZ2lzdGVyKHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCwgImNsaWNrIiwgdGhpcy5f c3RhdHVzSW1hZ2VFbGVtZW50Q2xpY2tlZCk7CiAKICAgICAgICAgaWYgKCF0aXRsZSkKICAgICAg ICAgICAgIHRoaXMuX3VwZGF0ZVRpdGxlcygpOwpAQCAtMTA2LDcgKzEwNiw3IEBAIFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1lbnQg ZXh0ZW5kcyBXZWJJbnNwCiAgICAgewogICAgICAgICBzdXBlci5vbmF0dGFjaCgpOwogCi0gICAg ICAgIHRoaXMuX2xpc3RlbmVycy5pbnN0YWxsKCk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0 Lmluc3RhbGwoKTsKIAogICAgICAgICBmb3IgKHZhciBwcm9iZVNldCBvZiBXZWJJbnNwZWN0b3Iu cHJvYmVNYW5hZ2VyLnByb2JlU2V0cykKICAgICAgICAgICAgIGlmIChwcm9iZVNldC5icmVha3Bv aW50ID09PSB0aGlzLl9icmVha3BvaW50KQpAQCAtMTE3LDcgKzExNyw3IEBAIFdlYkluc3BlY3Rv ci5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwCiAgICAgewogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogCi0gICAgICAg IHRoaXMuX2xpc3RlbmVycy51bmluc3RhbGwoKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQu dW5pbnN0YWxsKCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3Byb2JlU2V0KQogICAgICAgICAgICAg dGhpcy5fcmVtb3ZlUHJvYmVTZXQodGhpcy5fcHJvYmVTZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0YUdy aWQuanMKaW5kZXggYmM5MzBmZi4uNDNiNjFjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpz CkBAIC00NiwxMiArNDYsMTIgQEAgV2ViSW5zcGVjdG9yLlByb2JlU2V0RGF0YUdyaWQgPSBjbGFz cyBQcm9iZVNldERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLkRhdGEKICAgICAgICAgdGhp cy5fbGFzdFVwZGF0ZWRGcmFtZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX25vZGVzU2luY2VMYXN0 TmF2aWdhdGlvbiA9IFtdOwogCi0gICAgICAgIHRoaXMuX2xpc3RlbmVycyA9IG5ldyBXZWJJbnNw ZWN0b3IuRXZlbnRMaXN0ZW5lclNldCh0aGlzLCAiUHJvYmVTZXREYXRhR3JpZCBpbnN0YW5jZSBs aXN0ZW5lcnMiKTsKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKHByb2JlU2V0LCBX ZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQuUHJvYmVBZGRlZCwgdGhpcy5fc2V0dXBQcm9iZSk7 Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3Rlcihwcm9iZVNldCwgV2ViSW5zcGVjdG9y LlByb2JlU2V0LkV2ZW50LlByb2JlUmVtb3ZlZCwgdGhpcy5fdGVhcmRvd25Qcm9iZSk7Ci0gICAg ICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3Rlcihwcm9iZVNldCwgV2ViSW5zcGVjdG9yLlByb2Jl U2V0LkV2ZW50LlNhbXBsZXNDbGVhcmVkLCB0aGlzLl9zZXR1cERhdGEpOwotICAgICAgICB0aGlz Ll9saXN0ZW5lcnMucmVnaXN0ZXIoV2ViSW5zcGVjdG9yLlByb2JlLCBXZWJJbnNwZWN0b3IuUHJv YmUuRXZlbnQuRXhwcmVzc2lvbkNoYW5nZWQsIHRoaXMuX3Byb2JlRXhwcmVzc2lvbkNoYW5nZWQp OwotICAgICAgICB0aGlzLl9saXN0ZW5lcnMuaW5zdGFsbCgpOworICAgICAgICB0aGlzLl9saXN0 ZW5lclNldCA9IG5ldyBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lclNldCh0aGlzLCAiUHJvYmVT ZXREYXRhR3JpZCBpbnN0YW5jZSBsaXN0ZW5lcnMiKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJT ZXQucmVnaXN0ZXIocHJvYmVTZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5Qcm9iZUFk ZGVkLCB0aGlzLl9zZXR1cFByb2JlKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQucmVnaXN0 ZXIocHJvYmVTZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5Qcm9iZVJlbW92ZWQsIHRo aXMuX3RlYXJkb3duUHJvYmUpOworICAgICAgICB0aGlzLl9saXN0ZW5lclNldC5yZWdpc3Rlcihw cm9iZVNldCwgV2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZXNDbGVhcmVkLCB0aGlz Ll9zZXR1cERhdGEpOworICAgICAgICB0aGlzLl9saXN0ZW5lclNldC5yZWdpc3RlcihXZWJJbnNw ZWN0b3IuUHJvYmUsIFdlYkluc3BlY3Rvci5Qcm9iZS5FdmVudC5FeHByZXNzaW9uQ2hhbmdlZCwg dGhpcy5fcHJvYmVFeHByZXNzaW9uQ2hhbmdlZCk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0 Lmluc3RhbGwoKTsKIAogICAgICAgICB0aGlzLl9zZXR1cERhdGEoKTsKICAgICB9CkBAIC02Myw3 ICs2Myw3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkID0gY2xhc3MgUHJvYmVTZXRE YXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAgICAgICAgIGZvciAodmFyIHByb2Jl IG9mIHRoaXMucHJvYmVTZXQpCiAgICAgICAgICAgICB0aGlzLl90ZWFyZG93blByb2JlKHByb2Jl KTsKIAotICAgICAgICB0aGlzLl9saXN0ZW5lcnMudW5pbnN0YWxsKHRydWUpOworICAgICAgICB0 aGlzLl9saXN0ZW5lclNldC51bmluc3RhbGwodHJ1ZSk7CiAgICAgfQogCiAgICAgLy8gUHJpdmF0 ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMKaW5kZXggMzBhY2M5NS4uMGU3 OWZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpzCkBAIC00NCw3ICs0 NCw3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uID0gY2xhc3MgUHJvYmVT ZXREZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdlYkluCiAKICAgICAgICAgdGhpcy5fb3B0aW9uc0Vs ZW1lbnQgPSBvcHRpb25zRWxlbWVudDsKIAotICAgICAgICB0aGlzLl9saXN0ZW5lcnMgPSBuZXcg V2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJTZXQodGhpcywgIlByb2JlU2V0RGV0YWlsc1NlY3Rp b24gVUkgbGlzdGVuZXJzIik7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0ID0gbmV3IFdlYklu c3BlY3Rvci5FdmVudExpc3RlbmVyU2V0KHRoaXMsICJQcm9iZVNldERldGFpbHNTZWN0aW9uIFVJ IGxpc3RlbmVycyIpOwogICAgICAgICB0aGlzLl9wcm9iZVNldCA9IHByb2JlU2V0OwogICAgICAg ICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogCkBAIC02NCwyMiArNjQsMjIgQEAgV2ViSW5z cGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24gPSBjbGFzcyBQcm9iZVNldERldGFpbHNTZWN0 aW9uIGV4dGVuZHMgV2ViSW4KICAgICAgICAgdGhpcy5fcmVtb3ZlUHJvYmVCdXR0b25JdGVtLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNs aWNrZWQsIHRoaXMuX3JlbW92ZVByb2JlQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRo aXMuX25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fcmVtb3ZlUHJvYmVCdXR0 b25JdGVtKTsKIAotICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIodGhpcy5fcHJvYmVT ZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5TYW1wbGVBZGRlZCwgdGhpcy5fcHJvYmVT ZXRTYW1wbGVzQ2hhbmdlZCk7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3Rlcih0aGlz Ll9wcm9iZVNldCwgV2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZXNDbGVhcmVkLCB0 aGlzLl9wcm9iZVNldFNhbXBsZXNDaGFuZ2VkKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJTZXQu cmVnaXN0ZXIodGhpcy5fcHJvYmVTZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5TYW1w bGVBZGRlZCwgdGhpcy5fcHJvYmVTZXRTYW1wbGVzQ2hhbmdlZCk7CisgICAgICAgIHRoaXMuX2xp c3RlbmVyU2V0LnJlZ2lzdGVyKHRoaXMuX3Byb2JlU2V0LCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQu RXZlbnQuU2FtcGxlc0NsZWFyZWQsIHRoaXMuX3Byb2JlU2V0U2FtcGxlc0NoYW5nZWQpOwogCiAg ICAgICAgIC8vIFVwZGF0ZSB0aGUgc291cmNlIGxpbmsgd2hlbiB0aGUgYnJlYWtwb2ludCdzIHJl c29sdmVkIHN0YXRlIGNoYW5nZXMsCiAgICAgICAgIC8vIHNvIHRoYXQgaXQgY2FuIGJlY29tZSBh IGxpdmUgbG9jYXRpb24gbGluayB3aGVuIHBvc3NpYmxlLgogICAgICAgICB0aGlzLl91cGRhdGVM aW5rRWxlbWVudCgpOwotICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIodGhpcy5fcHJv YmVTZXQuYnJlYWtwb2ludCwgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuUmVzb2x2ZWRT dGF0ZURpZENoYW5nZSwgdGhpcy5fdXBkYXRlTGlua0VsZW1lbnQpOworICAgICAgICB0aGlzLl9s aXN0ZW5lclNldC5yZWdpc3Rlcih0aGlzLl9wcm9iZVNldC5icmVha3BvaW50LCBXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludC5FdmVudC5SZXNvbHZlZFN0YXRlRGlkQ2hhbmdlLCB0aGlzLl91cGRhdGVM aW5rRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzLmluc3RhbGwoKTsKKyAgICAg ICAgdGhpcy5fbGlzdGVuZXJTZXQuaW5zdGFsbCgpOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwog CiAgICAgY2xvc2VkKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy51bmluc3RhbGwo dHJ1ZSk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVyU2V0LnVuaW5zdGFsbCh0cnVlKTsKICAgICAg ICAgdGhpcy5lbGVtZW50LnJlbW92ZSgpOwogICAgIH0KIAo=