196420 2019-03-29 20:10:08 -0700 Web Inspector: Uncaught Exception: null is not an object (evaluating 'this.ownerDocument.frameIdentifier') 2019-04-23 14:06:50 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://www.reddit.com/ InRadar P2 Normal --- 1 joepeck hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam timothy webkit-bug-importer oldest_to_newest 1522724 0 joepeck 2019-03-29 20:10:08 -0700 Uncaught Exception: null is not an object (evaluating 'this.ownerDocument.frameIdentifier') Steps to Reproduce: 1. Start a timeline recording on reddit.com 2. Scroll around a bit / interact => Exception ------- Inspected URL: https://www.reddit.com/ Dispatch Source: Protocol Event Protocol Event: {"method":"DOM.didFireEvent","params":{"nodeId":436,"eventName":"canplaythrough","timestamp":37.480989417003}} Uncaught Exceptions: - null is not an object (evaluating 'this.ownerDocument.frameIdentifier') (at DOMNode.js:186:59) frameIdentifier @ DOMNode.js:186:59 frame @ DOMNode.js:192:68 addRecord @ TimelineRecording.js:322:49 _addRecord @ TimelineManager.js:830:40 _handleDOMNodeDidFireEvent @ TimelineManager.js:1247:24 dispatch @ Object.js:165:30 dispatchEventToListeners @ Object.js:180:21 _addDOMEvent @ DOMNode.js:805:38 didFireEvent @ DOMNode.js:755:26 didFireEvent @ DOMManager.js:164:26 didFireEvent @ DOMObserver.js:117:35 dispatchEvent @ InspectorBackend.js:340:42 _dispatchEvent @ Connection.js:195:32 dispatch @ Connection.js:72:32 dispatchMessageFromTarget @ TargetManager.js:101:35 dispatchMessageFromTarget @ TargetObserver.js:42:51 dispatchEvent @ InspectorBackend.js:340:42 _dispatchEvent @ Connection.js:195:32 dispatch @ Connection.js:72:32 dispatch @ InspectorBackend.js:178:52 dispatchNextQueuedMessageFromBackend @ MessageDispatcher.js:42:34 Additional Details: cause --> An uncaught exception was thrown while handling event: DOM.didFireEvent 1522725 1 webkit-bug-importer 2019-03-29 20:10:23 -0700 <rdar://problem/49444205> 1528711 2 367787 hi 2019-04-18 23:17:37 -0700 Created attachment 367787 Patch This should probably have a test, but I'm going to see how the bots like it first... 1528712 3 ews-watchlist 2019-04-18 23:18:41 -0700 This patch modifies the inspector protocol. Please ensure that any frontend changes appropriately use feature checks for new protocol features. 1529732 4 367787 joepeck 2019-04-23 13:38:56 -0700 Comment on attachment 367787 Patch Looks good to me too 1529753 5 367787 commit-queue 2019-04-23 14:06:48 -0700 Comment on attachment 367787 Patch Clearing flags on attachment: 367787 Committed r244566: <https://trac.webkit.org/changeset/244566> 1529754 6 commit-queue 2019-04-23 14:06:50 -0700 All reviewed patches have been landed. Closing bug. 367787 2019-04-18 23:17:37 -0700 2019-04-23 14:06:48 -0700 Patch bug-196420-20190418231736.patch text/plain 17877 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAyMTY5Yjc1ODY4ZGZkZDAzODgyZWZiZTk3Mjhi OWNlM2MyMGMzYWEuLmM1YTgyYzM1ZmU4NTVjNDliOGY5ZDI0MDQ5NzcxMzc1NTczOTgxYzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA0LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBV bmNhdWdodCBFeGNlcHRpb246IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAndGhp cy5vd25lckRvY3VtZW50LmZyYW1lSWRlbnRpZmllcicpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY0MjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ5NDQ0MjA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uOgorICAgICAgICBNb2RpZnkgdGhlIGV4 aXN0aW5nIGBmcmFtZUlkYCB0byByZXByZXNlbnQgdGhlIG93bmVyIGZyYW1lIG9mIHRoZSBub2Rl LCByYXRoZXIgdGhhbiB0aGUKKyAgICAgICAgZnJhbWUgaXQgaG9sZHMgKGluIHRoZSBjYXNlIG9m IGFuIGA8aWZyYW1lPmApLgorCiAyMDE5LTA0LTE4ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBw bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1c2VDb25jdXJyZW50QmFycmllcnMgb3B0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggNzBiZWMxYzQ1ZThjZjNjODIxNThhODA5MDlmYWYyNzJiOWFmMzA0OC4uZDNj ZjNlNjJiN2EyNDk4N2VlZmQ5ZGVjMzFiNWZiOTAwNGU2NzNmYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA0LTE4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmNhdWdodCBFeGNlcHRpb246IG51bGwgaXMgbm90 IGFuIG9iamVjdCAoZXZhbHVhdGluZyAndGhpcy5vd25lckRvY3VtZW50LmZyYW1lSWRlbnRpZmll cicpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY0 MjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NDQ0MjA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmeSB0aGUgZXhpc3RpbmcgYGZyYW1l SWRgIHRvIHJlcHJlc2VudCB0aGUgb3duZXIgZnJhbWUgb2YgdGhlIG5vZGUsIHJhdGhlciB0aGFu IHRoZQorICAgICAgICBmcmFtZSBpdCBob2xkcyAoaW4gdGhlIGNhc2Ugb2YgYW4gYDxpZnJhbWU+ YCkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZvck5vZGUp OgorCiAyMDE5LTA0LTE4ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgogCiAgICAgICAgIEltcGxlbWVudCBLZXllZERlY29kZXJHZW5lcmljIGFuZCBLZXllZEVuY29k ZXJHZW5lcmljCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBlNGE0N2U4ODA0MjAxZGQ0N2I5 MGQ1NTkzMjZjZWRmMjg5YmNlYzhlLi5kYWZmMTAzZTVkZjViNGJhNDI5YTQ0YWI2ZDhlNDZmNWU4 MmIzYzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxOS0w NC0xOCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogVW5jYXVnaHQgRXhjZXB0aW9uOiBudWxsIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1 YXRpbmcgJ3RoaXMub3duZXJEb2N1bWVudC5mcmFtZUlkZW50aWZpZXInKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NDIwCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80OTQ0NDIwNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAgICAg IChXSS5ET01Ob2RlKToKKyAgICAgICAgKFdJLkRPTU5vZGUucHJvdG90eXBlLmdldCBmcmFtZSk6 IEFkZGVkLgorICAgICAgICAoV0kuRE9NTm9kZS5wcm90b3R5cGUuZ2V0IGZyYW1lSWRlbnRpZmll cik6IERlbGV0ZWQuCisgICAgICAgIE1vZGlmeSB0aGUgZXhpc3RpbmcgYGZyYW1lSWRgIHRvIHJl cHJlc2VudCB0aGUgb3duZXIgZnJhbWUgb2YgdGhlIG5vZGUsIHJhdGhlciB0aGFuIHRoZQorICAg ICAgICBmcmFtZSBpdCBob2xkcyAoaW4gdGhlIGNhc2Ugb2YgYW4gYDxpZnJhbWU+YCkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qczoK KyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuZG9tQnJlYWtwb2ludHNG b3JOb2RlKToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX2RldGFj aERPTUJyZWFrcG9pbnQpOgorICAgICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlw ZS5fcmVzb2x2ZURPTUJyZWFrcG9pbnQpOgorICAgICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2Vy LnByb3RvdHlwZS5fbm9kZUluc2VydGVkKToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdl ci5wcm90b3R5cGUuX25vZGVSZW1vdmVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9wb3B1bGF0ZVRhZ0NvbnRleHRNZW51KToKKyAgICAgICAgKFdJLkRPTVRyZWVFbGVtZW50LnBy b3RvdHlwZS5fYnVpbGRBdHRyaWJ1dGVET00pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5f c2VsZWN0RXhlY3V0aW9uQ29udGV4dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAgICAoV0kuU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUuX2hpZ2hsaWdodE5v ZGVzV2l0aFNlbGVjdG9yKToKKwogMjAxOS0wNC0xOCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTiAocjI0NDE1NSk6 IHByZXNzaW5nIGRvd24gZXhwYW5kcyBmb2xkZXJzIGluIHRyZWVzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbgppbmRleCAzOGVmNzc2Y2Y2 YmZlZmRhMzI5MWRkOTA3YzQ5MGE3OGQyOWRjODhmLi4xMTk1ZTg4NmRlOTJhMTcxYWRlNDhlODMy YzZhMDZhNjM0NTQyMWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL0RPTS5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAgLTQ3LDYgKzQ3LDcgQEAKICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm5vZGVOYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIjxj b2RlPk5vZGU8L2NvZGU+J3Mgbm9kZU5hbWUuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAibG9jYWxOYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIjxjb2RlPk5v ZGU8L2NvZGU+J3MgbG9jYWxOYW1lLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5v ZGVWYWx1ZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5Ob2RlPC9j b2RlPidzIG5vZGVWYWx1ZS4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUlk IiwgIiRyZWYiOiAiTmV0d29yay5GcmFtZUlkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIGNvbnRhaW5pbmcgZnJhbWUuIiB9LAogICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiY2hpbGROb2RlQ291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNoaWxkIGNvdW50IGZvciA8Y29kZT5Db250 YWluZXI8L2NvZGU+IG5vZGVzLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxk cmVuIiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVm IjogIk5vZGUiIH0sICJkZXNjcmlwdGlvbiI6ICJDaGlsZCBub2RlcyBvZiB0aGlzIG5vZGUgd2hl biByZXF1ZXN0ZWQgd2l0aCBjaGlsZHJlbi4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJhdHRyaWJ1dGVzIiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMi OiB7ICJ0eXBlIjogInN0cmluZyIgfSwgImRlc2NyaXB0aW9uIjogIkF0dHJpYnV0ZXMgb2YgdGhl IDxjb2RlPkVsZW1lbnQ8L2NvZGU+IG5vZGUgaW4gdGhlIGZvcm0gb2YgZmxhdCBhcnJheSA8Y29k ZT5bbmFtZTEsIHZhbHVlMSwgbmFtZTIsIHZhbHVlMl08L2NvZGU+LiIgfSwKQEAgLTYwLDcgKzYx LDYgQEAKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBzZXVkb1R5cGUiLCAiJHJlZiI6ICJQ c2V1ZG9UeXBlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlBzZXVkbyBlbGVt ZW50IHR5cGUgZm9yIHRoaXMgbm9kZS4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz aGFkb3dSb290VHlwZSIsICIkcmVmIjogIlNoYWRvd1Jvb3RUeXBlIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIlNoYWRvdyByb290IHR5cGUuIiB9LAogICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiY3VzdG9tRWxlbWVudFN0YXRlIiwgIiRyZWYiOiAiQ3VzdG9tRWxlbWVudFN0 YXRlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkN1c3RvbSBlbGVtZW50IHN0 YXRlLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lSWQiLCAiJHJlZiI6ICJO ZXR3b3JrLkZyYW1lSWQiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUg SUQgZm9yIGZyYW1lIG93bmVyIGVsZW1lbnRzLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImNvbnRlbnREb2N1bWVudCIsICIkcmVmIjogIk5vZGUiLCAib3B0aW9uYWwiOiB0cnVlLCAi ZGVzY3JpcHRpb24iOiAiQ29udGVudCBkb2N1bWVudCBmb3IgZnJhbWUgb3duZXIgZWxlbWVudHMu IiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2hhZG93Um9vdHMiLCAidHlwZSI6ICJh cnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiTm9kZSIgfSwgImRl c2NyaXB0aW9uIjogIlNoYWRvdyByb290IGxpc3QgZm9yIGdpdmVuIGVsZW1lbnQgaG9zdC4iIH0s CiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0ZW1wbGF0ZUNvbnRlbnQiLCAiJHJlZiI6ICJO b2RlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNvbnRlbnQgZG9jdW1lbnQg ZnJhZ21lbnQgZm9yIHRlbXBsYXRlIGVsZW1lbnRzIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAzMzk1NWFj NTMxNzBlZmIwZmFkOTUzMmM3NmFmMGQyMTUyMDI3MzhlLi4xZGQ2NGMxZWQ2MGE4NDEyZjU5YWU3 OThmZDVmYTc5YWRlMWM3MWVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtNTksNiArNTksNyBAQAogI2luY2x1 ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVHJl ZS5oIgorI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkZ1bGxzY3JlZW5NYW5hZ2Vy LmgiCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVs ZW1lbnQuaCIKQEAgLTE1NTksMTkgKzE1NjAsMTYgQEAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkRPTTo6Tm9kZT4gSW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yTm9kZShOb2RlKgog ICAgIH0KIAogICAgIGF1dG8qIHBhZ2VBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy5pbnNw ZWN0b3JQYWdlQWdlbnQoKTsKKyAgICBpZiAocGFnZUFnZW50KSB7CisgICAgICAgIGlmIChhdXRv KiBmcmFtZVZpZXcgPSBub2RlLT5kb2N1bWVudCgpLnZpZXcoKSkKKyAgICAgICAgICAgIHZhbHVl LT5zZXRGcmFtZUlkKHBhZ2VBZ2VudC0+ZnJhbWVJZCgmZnJhbWVWaWV3LT5mcmFtZSgpKSk7Cisg ICAgfQogCiAgICAgaWYgKGlzPEVsZW1lbnQ+KCpub2RlKSkgewogICAgICAgICBFbGVtZW50JiBl bGVtZW50ID0gZG93bmNhc3Q8RWxlbWVudD4oKm5vZGUpOwogICAgICAgICB2YWx1ZS0+c2V0QXR0 cmlidXRlcyhidWlsZEFycmF5Rm9yRWxlbWVudEF0dHJpYnV0ZXMoJmVsZW1lbnQpKTsKICAgICAg ICAgaWYgKGlzPEhUTUxGcmFtZU93bmVyRWxlbWVudD4oZWxlbWVudCkpIHsKLSAgICAgICAgICAg IEhUTUxGcmFtZU93bmVyRWxlbWVudCYgZnJhbWVPd25lciA9IGRvd25jYXN0PEhUTUxGcmFtZU93 bmVyRWxlbWVudD4oZWxlbWVudCk7Ci0gICAgICAgICAgICBpZiAocGFnZUFnZW50KSB7Ci0gICAg ICAgICAgICAgICAgRnJhbWUqIGZyYW1lID0gZnJhbWVPd25lci5jb250ZW50RnJhbWUoKTsKLSAg ICAgICAgICAgICAgICBpZiAoZnJhbWUpCi0gICAgICAgICAgICAgICAgICAgIHZhbHVlLT5zZXRG cmFtZUlkKHBhZ2VBZ2VudC0+ZnJhbWVJZChmcmFtZSkpOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWVPd25lci5jb250ZW50RG9jdW1lbnQoKTsK LSAgICAgICAgICAgIGlmIChkb2N1bWVudCkKKyAgICAgICAgICAgIGlmIChhdXRvKiBkb2N1bWVu dCA9IGRvd25jYXN0PEhUTUxGcmFtZU93bmVyRWxlbWVudD4oZWxlbWVudCkuY29udGVudERvY3Vt ZW50KCkpCiAgICAgICAgICAgICAgICAgdmFsdWUtPnNldENvbnRlbnREb2N1bWVudChidWlsZE9i amVjdEZvck5vZGUoZG9jdW1lbnQsIDAsIG5vZGVzTWFwKSk7CiAgICAgICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9N RGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCmluZGV4IDEyZmJlYjliMWU2YWQ0N2Y2 NmIyNmNmZmZiOWQzMjgyYmRlZDc5ZmEuLjA5YWI4M2JiZjkyMGZkNzg4MzdlZTQzMTU5NzBmZGVi MzE4MDhiZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanMKQEAg LTE3MCwxMCArMTcwLDEwIEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVn Z2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgIHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQobm9kZSBpbnN0YW5jZW9mIFdJLkRPTU5vZGUpOwogCi0gICAgICAgIGlmICghbm9kZSkKKyAg ICAgICAgaWYgKCFub2RlIHx8ICFub2RlLmZyYW1lKQogICAgICAgICAgICAgcmV0dXJuIFtdOwog Ci0gICAgICAgIGxldCBkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXAgPSB0aGlzLl9kb21C cmVha3BvaW50RnJhbWVJZGVudGlmaWVyTWFwLmdldChub2RlLmZyYW1lSWRlbnRpZmllcik7Cisg ICAgICAgIGxldCBkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXAgPSB0aGlzLl9kb21CcmVh a3BvaW50RnJhbWVJZGVudGlmaWVyTWFwLmdldChub2RlLmZyYW1lLmlkKTsKICAgICAgICAgaWYg KCFkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXApCiAgICAgICAgICAgICByZXR1cm4gW107 CiAKQEAgLTM5NywxMCArMzk3LDEwIEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERP TURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBsZXQgbm9kZUlkZW50 aWZpZXIgPSBicmVha3BvaW50LmRvbU5vZGVJZGVudGlmaWVyOwogICAgICAgICBsZXQgbm9kZSA9 IFdJLmRvbU1hbmFnZXIubm9kZUZvcklkKG5vZGVJZGVudGlmaWVyKTsKICAgICAgICAgY29uc29s ZS5hc3NlcnQobm9kZSwgIk1pc3NpbmcgRE9NIG5vZGUgZm9yIGJyZWFrcG9pbnQuIiwgYnJlYWtw b2ludCk7Ci0gICAgICAgIGlmICghbm9kZSkKKyAgICAgICAgaWYgKCFub2RlIHx8ICFub2RlLmZy YW1lKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGxldCBmcmFtZUlkZW50aWZpZXIg PSBub2RlLmZyYW1lSWRlbnRpZmllcjsKKyAgICAgICAgbGV0IGZyYW1lSWRlbnRpZmllciA9IG5v ZGUuZnJhbWUuaWQ7CiAgICAgICAgIGxldCBkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXAg PSB0aGlzLl9kb21CcmVha3BvaW50RnJhbWVJZGVudGlmaWVyTWFwLmdldChmcmFtZUlkZW50aWZp ZXIpOwogICAgICAgICBjb25zb2xlLmFzc2VydChkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJN YXAsICJNaXNzaW5nIERPTSBicmVha3BvaW50cyBmb3Igbm9kZSBwYXJlbnQgZnJhbWUuIiwgbm9k ZSk7CiAgICAgICAgIGlmICghZG9tQnJlYWtwb2ludE5vZGVJZGVudGlmaWVyTWFwKQpAQCAtNDU3 LDEwICs0NTcsMTAgQEAgV0kuRE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJN YW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgewogICAgICAgICBsZXQgbm9kZSA9IFdJLmRv bU1hbmFnZXIubm9kZUZvcklkKG5vZGVJZGVudGlmaWVyKTsKICAgICAgICAgY29uc29sZS5hc3Nl cnQobm9kZSwgIk1pc3NpbmcgRE9NIG5vZGUgZm9yIG5vZGVJZGVudGlmaWVyLiIsIG5vZGVJZGVu dGlmaWVyKTsKLSAgICAgICAgaWYgKCFub2RlKQorICAgICAgICBpZiAoIW5vZGUgfHwgIW5vZGUu ZnJhbWUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbGV0IGZyYW1lSWRlbnRpZmll ciA9IG5vZGUuZnJhbWVJZGVudGlmaWVyOworICAgICAgICBsZXQgZnJhbWVJZGVudGlmaWVyID0g bm9kZS5mcmFtZS5pZDsKICAgICAgICAgbGV0IGRvbUJyZWFrcG9pbnROb2RlSWRlbnRpZmllck1h cCA9IHRoaXMuX2RvbUJyZWFrcG9pbnRGcmFtZUlkZW50aWZpZXJNYXAuZ2V0KGZyYW1lSWRlbnRp Zmllcik7CiAgICAgICAgIGlmICghZG9tQnJlYWtwb2ludE5vZGVJZGVudGlmaWVyTWFwKSB7CiAg ICAgICAgICAgICBkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXAgPSBuZXcgTWFwOwpAQCAt NjExLDEwICs2MTEsMTAgQEAgV0kuRE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdn ZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgX25vZGVJbnNlcnRlZChldmVudCkKICAg ICB7CiAgICAgICAgIGxldCBub2RlID0gZXZlbnQuZGF0YS5ub2RlOwotICAgICAgICBpZiAobm9k ZS5ub2RlVHlwZSgpICE9PSBOb2RlLkVMRU1FTlRfTk9ERSB8fCAhbm9kZS5vd25lckRvY3VtZW50 KQorICAgICAgICBpZiAobm9kZS5ub2RlVHlwZSgpICE9PSBOb2RlLkVMRU1FTlRfTk9ERSB8fCAh bm9kZS5mcmFtZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBsZXQgdXJsID0gbm9k ZS5vd25lckRvY3VtZW50LmRvY3VtZW50VVJMOworICAgICAgICBsZXQgdXJsID0gbm9kZS5mcmFt ZS51cmw7CiAgICAgICAgIGxldCBicmVha3BvaW50cyA9IHRoaXMuX2RvbUJyZWFrcG9pbnRVUkxN YXAuZ2V0KHVybCk7CiAgICAgICAgIGlmICghYnJlYWtwb2ludHMpCiAgICAgICAgICAgICByZXR1 cm47CkBAIC02MzMsMTAgKzYzMywxMCBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBE T01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICBfbm9kZVJlbW92ZWQoZXZl bnQpCiAgICAgewogICAgICAgICBsZXQgbm9kZSA9IGV2ZW50LmRhdGEubm9kZTsKLSAgICAgICAg aWYgKG5vZGUubm9kZVR5cGUoKSAhPT0gTm9kZS5FTEVNRU5UX05PREUgfHwgIW5vZGUub3duZXJE b2N1bWVudCkKKyAgICAgICAgaWYgKG5vZGUubm9kZVR5cGUoKSAhPT0gTm9kZS5FTEVNRU5UX05P REUgfHwgIW5vZGUuZnJhbWUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbGV0IGRv bUJyZWFrcG9pbnROb2RlSWRlbnRpZmllck1hcCA9IHRoaXMuX2RvbUJyZWFrcG9pbnRGcmFtZUlk ZW50aWZpZXJNYXAuZ2V0KG5vZGUuZnJhbWVJZGVudGlmaWVyKTsKKyAgICAgICAgbGV0IGRvbUJy ZWFrcG9pbnROb2RlSWRlbnRpZmllck1hcCA9IHRoaXMuX2RvbUJyZWFrcG9pbnRGcmFtZUlkZW50 aWZpZXJNYXAuZ2V0KG5vZGUuZnJhbWUuaWQpOwogICAgICAgICBpZiAoIWRvbUJyZWFrcG9pbnRO b2RlSWRlbnRpZmllck1hcCkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNjQ3LDcgKzY0Nyw3 IEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICBkb21CcmVha3BvaW50Tm9kZUlkZW50aWZpZXJNYXAuZGVs ZXRlKG5vZGUuaWQpOwogCiAgICAgICAgIGlmICghZG9tQnJlYWtwb2ludE5vZGVJZGVudGlmaWVy TWFwLnNpemUpCi0gICAgICAgICAgICB0aGlzLl9kb21CcmVha3BvaW50RnJhbWVJZGVudGlmaWVy TWFwLmRlbGV0ZShub2RlLmZyYW1lSWRlbnRpZmllcik7CisgICAgICAgICAgICB0aGlzLl9kb21C cmVha3BvaW50RnJhbWVJZGVudGlmaWVyTWFwLmRlbGV0ZShub2RlLmZyYW1lLmlkKTsKIAogICAg ICAgICBmb3IgKGxldCBicmVha3BvaW50IG9mIGJyZWFrcG9pbnRzKQogICAgICAgICAgICAgYnJl YWtwb2ludC5kb21Ob2RlSWRlbnRpZmllciA9IG51bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCmluZGV4IDM5ODE4NDFi NTdkNTZhYThlZTVhN2YwNDhmNTVmNWQ1YjM1MzdkODQuLjE4YjdlMTVmZGNiODE1OTU5NWRlNDFl NDY4Yjk2MGM3MmNkYmE1MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC01Niw2ICs1NiwxNyBAQCBXSS5ET01O b2RlID0gY2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBlbHNlCiAgICAg ICAgICAgICB0aGlzLm93bmVyRG9jdW1lbnQgPSBkb2M7CiAKKyAgICAgICAgdGhpcy5fZnJhbWUg PSBudWxsOworCisgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMi4yKTogRE9NLk5vZGUu ZnJhbWVJZCB3YXMgY2hhbmdlZCB0byByZXByZXNlbnQgdGhlIG93bmVyIGZyYW1lLCBub3QgdGhl IGNvbnRlbnQgZnJhbWUuCisgICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuVGlt ZWxpbmUgJiYgIUluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5UaW1lbGluZS5oYXNFdmVudCgicHJv Z3JhbW1hdGljQ2FwdHVyZVN0YXJ0ZWQiKSkgeworICAgICAgICAgICAgaWYgKHBheWxvYWQuZnJh bWVJZCkKKyAgICAgICAgICAgICAgICB0aGlzLl9mcmFtZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLmZy YW1lRm9ySWRlbnRpZmllcihwYXlsb2FkLmZyYW1lSWQpOworICAgICAgICB9CisKKyAgICAgICAg aWYgKCF0aGlzLl9mcmFtZSAmJiB0aGlzLm93bmVyRG9jdW1lbnQpCisgICAgICAgICAgICB0aGlz Ll9mcmFtZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLmZyYW1lRm9ySWRlbnRpZmllcih0aGlzLm93bmVy RG9jdW1lbnQuZnJhbWVJZGVudGlmaWVyKTsKKwogICAgICAgICB0aGlzLl9hdHRyaWJ1dGVzID0g W107CiAgICAgICAgIHRoaXMuX2F0dHJpYnV0ZXNNYXAgPSBuZXcgTWFwOwogICAgICAgICBpZiAo cGF5bG9hZC5hdHRyaWJ1dGVzKQpAQCAtMTE2LDkgKzEyNyw2IEBAIFdJLkRPTU5vZGUgPSBjbGFz cyBET01Ob2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0aGlzLl9yZW51bWJlcigp OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHBheWxvYWQuZnJhbWVJZCkKLSAgICAgICAgICAg IHRoaXMuX2ZyYW1lSWRlbnRpZmllciA9IHBheWxvYWQuZnJhbWVJZDsKLQogICAgICAgICBpZiAo dGhpcy5fbm9kZVR5cGUgPT09IE5vZGUuRUxFTUVOVF9OT0RFKSB7CiAgICAgICAgICAgICAvLyBI VE1MIGFuZCBCT0RZIGZyb20gaW50ZXJuYWwgaWZyYW1lcyBzaG91bGQgbm90IG92ZXJ3cml0ZSB0 b3AtbGV2ZWwgb25lcy4KICAgICAgICAgICAgIGlmICh0aGlzLm93bmVyRG9jdW1lbnQgJiYgIXRo aXMub3duZXJEb2N1bWVudC5kb2N1bWVudEVsZW1lbnQgJiYgdGhpcy5fbm9kZU5hbWUgPT09ICJI VE1MIikKQEAgLTE3OCwyMSArMTg2LDEwIEBAIFdJLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4 dGVuZHMgV0kuT2JqZWN0CiAKICAgICAvLyBQdWJsaWMKIAorICAgIGdldCBmcmFtZSgpIHsgcmV0 dXJuIHRoaXMuX2ZyYW1lOyB9CiAgICAgZ2V0IGRvbUV2ZW50cygpIHsgcmV0dXJuIHRoaXMuX2Rv bUV2ZW50czsgfQogICAgIGdldCBsb3dQb3dlclJhbmdlcygpIHsgcmV0dXJuIHRoaXMuX2xvd1Bv d2VyUmFuZ2VzOyB9CiAKLSAgICBnZXQgZnJhbWVJZGVudGlmaWVyKCkKLSAgICB7Ci0gICAgICAg IHJldHVybiB0aGlzLl9mcmFtZUlkZW50aWZpZXIgfHwgdGhpcy5vd25lckRvY3VtZW50LmZyYW1l SWRlbnRpZmllcjsKLSAgICB9Ci0KLSAgICBnZXQgZnJhbWUoKQotICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLl9mcmFtZSkKLSAgICAgICAgICAgIHRoaXMuX2ZyYW1lID0gV0kubmV0d29ya01hbmFn ZXIuZnJhbWVGb3JJZGVudGlmaWVyKHRoaXMuZnJhbWVJZGVudGlmaWVyKTsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX2ZyYW1lOwotICAgIH0KLQogICAgIGdldCBhdHRhY2hlZCgpCiAgICAgewogICAg ICAgICBmb3IgKGxldCBub2RlID0gdGhpczsgbm9kZTsgbm9kZSA9IG5vZGUucGFyZW50Tm9kZSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCBjODdkMzQzMjU2MGYzMGE3N2EzYWMxZWJkNTg1 NDE1ODI1MzY2MjdiLi4wYmU5YjA4MDZlNGNiZDk1MTU4NDMxMzVlMDUwNmE0ODMwZDM1NDFmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtNzM2LDExICs3MzYsOCBAQCBXSS5ET01UcmVlRWxl bWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV0kuVHJlZUVsZW1lbnQKICAgICAg ICAgbGV0IGlzTm9uU2hhZG93RWRpdGFibGUgPSAhbm9kZS5pc0luVXNlckFnZW50U2hhZG93VHJl ZSgpICYmIHRoaXMuZWRpdGFibGU7CiAgICAgICAgIGxldCBhdHRhY2hlZCA9IG5vZGUuYXR0YWNo ZWQ7CiAKLSAgICAgICAgaWYgKGV2ZW50LnRhcmdldCAmJiBldmVudC50YXJnZXQudGFnTmFtZSA9 PT0gIkEiKSB7Ci0gICAgICAgICAgICBsZXQgdXJsID0gZXZlbnQudGFyZ2V0LmhyZWY7Ci0gICAg ICAgICAgICBsZXQgZnJhbWUgPSBXSS5uZXR3b3JrTWFuYWdlci5mcmFtZUZvcklkZW50aWZpZXIo bm9kZS5mcmFtZUlkZW50aWZpZXIpOwotICAgICAgICAgICAgV0kuYXBwZW5kQ29udGV4dE1lbnVJ dGVtc0ZvclVSTChjb250ZXh0TWVudSwgdXJsLCB7ZnJhbWV9KTsKLSAgICAgICAgfQorICAgICAg ICBpZiAoZXZlbnQudGFyZ2V0ICYmIGV2ZW50LnRhcmdldC50YWdOYW1lID09PSAiQSIpCisgICAg ICAgICAgICBXSS5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yVVJMKGNvbnRleHRNZW51LCBldmVu dC50YXJnZXQuaHJlZiwge2ZyYW1lOiBub2RlLmZyYW1lfSk7CiAKICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAKQEAgLTEyNzYsNyArMTI3Myw3IEBAIFdJLkRPTVRyZWVF bGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogICAg ICAgICAgICAgYXR0clNwYW5FbGVtZW50LmFwcGVuZCgiPVx1MjAwQlwiIik7CiAKICAgICAgICAg aWYgKG5hbWUgPT09ICJzcmMiIHx8IC9cYmhyZWZcYi8udGVzdChuYW1lKSkgewotICAgICAgICAg ICAgbGV0IGJhc2VVUkwgPSBub2RlLm93bmVyRG9jdW1lbnQgPyBub2RlLm93bmVyRG9jdW1lbnQu ZG9jdW1lbnRVUkwgOiBudWxsOworICAgICAgICAgICAgbGV0IGJhc2VVUkwgPSBub2RlLmZyYW1l ID8gbm9kZS5mcmFtZS51cmwgOiBudWxsOwogICAgICAgICAgICAgbGV0IHJld3JpdHRlblVSTCA9 IGFic29sdXRlVVJMKHZhbHVlLCBiYXNlVVJMKTsKICAgICAgICAgICAgIHZhbHVlID0gdmFsdWUu aW5zZXJ0V29yZEJyZWFrQ2hhcmFjdGVycygpOwogICAgICAgICAgICAgaWYgKCFyZXdyaXR0ZW5V UkwpIHsKQEAgLTEyOTIsNyArMTI4OSw3IEBAIFdJLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9N VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogICAgICAgICAgICAgICAgIGF0dHJT cGFuRWxlbWVudC5hcHBlbmRDaGlsZChhdHRyVmFsdWVFbGVtZW50KTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfSBlbHNlIGlmIChuYW1lID09PSAic3Jjc2V0IikgewotICAgICAgICAgICAgbGV0 IGJhc2VVUkwgPSBub2RlLm93bmVyRG9jdW1lbnQgPyBub2RlLm93bmVyRG9jdW1lbnQuZG9jdW1l bnRVUkwgOiBudWxsOworICAgICAgICAgICAgbGV0IGJhc2VVUkwgPSBub2RlLmZyYW1lID8gbm9k ZS5mcmFtZS51cmwgOiBudWxsOwogICAgICAgICAgICAgYXR0clZhbHVlRWxlbWVudCA9IGF0dHJT cGFuRWxlbWVudC5jcmVhdGVDaGlsZCgic3BhbiIsICJodG1sLWF0dHJpYnV0ZS12YWx1ZSIpOwog CiAgICAgICAgICAgICAvLyBMZWFkaW5nIHdoaXRlc3BhY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKaW5k ZXggZjNhNTVlN2QyNGIxZTI5Yzk1ZWVlZmEyYWVmMjg1ZDk2Yjg4MWZkZi4uNTE4N2IzMDc0YzE2 MjIzYzkwNDg5MWM2OTM1MGY2NTY4Y2IzNDU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwpAQCAtMTQ1 LDExICsxNDUsMTAgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVu ZHMgV0kuVmlldwogCiAgICAgICAgIGxldCBpbnNwZWN0ZWROb2RlID0gV0kuZG9tTWFuYWdlci5p bnNwZWN0ZWROb2RlOwogICAgICAgICBpZiAoaW5zcGVjdGVkTm9kZSkgewotICAgICAgICAgICAg bGV0IGZyYW1lID0gaW5zcGVjdGVkTm9kZS5vd25lckRvY3VtZW50LmZyYW1lOworICAgICAgICAg ICAgbGV0IGZyYW1lID0gaW5zcGVjdGVkTm9kZS5mcmFtZTsKICAgICAgICAgICAgIGlmIChmcmFt ZSkgewogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9zaG91bGRBdXRvbWF0aWNhbGx5U2VsZWN0 RXhlY3V0aW9uQ29udGV4dCkKICAgICAgICAgICAgICAgICAgICAgZXhlY3V0aW9uQ29udGV4dCA9 IGZyYW1lLnBhZ2VFeGVjdXRpb25Db250ZXh0OwotCiAgICAgICAgICAgICAgICAgcHJlZmVycmVk TmFtZSA9IHRoaXMuX3ByZWZlcnJlZE5hbWVGb3JGcmFtZShmcmFtZSk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxl RGVjbGFyYXRpb25TZWN0aW9uLmpzCmluZGV4IDY3ZjZhNzcyZDA0ZGU2NDQ0NTg4ZDQ2ZTI5YTJi YTQ5NTY3NDUyMzkuLmIwNGY5MjM5MDBhZjAwZWFhMDljMjA0NmNlNzVhYTEzNjBmODY5MmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVh ZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5qcwpAQCAtNDkzLDEzICs0OTMsMTggQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbiA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMK IAogICAgIF9oaWdobGlnaHROb2Rlc1dpdGhTZWxlY3RvcigpCiAgICAgeworICAgICAgICBsZXQg bm9kZSA9IHRoaXMuX3N0eWxlLm5vZGU7CisKICAgICAgICAgaWYgKCF0aGlzLl9zdHlsZS5vd25l clJ1bGUpIHsKLSAgICAgICAgICAgIFdJLmRvbU1hbmFnZXIuaGlnaGxpZ2h0RE9NTm9kZSh0aGlz Ll9zdHlsZS5ub2RlLmlkKTsKKyAgICAgICAgICAgIFdJLmRvbU1hbmFnZXIuaGlnaGxpZ2h0RE9N Tm9kZShub2RlLmlkKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAg IGxldCBzZWxlY3RvclRleHQgPSB0aGlzLl9zZWxlY3RvckVsZW1lbnQudGV4dENvbnRlbnQudHJp bSgpOwotICAgICAgICBXSS5kb21NYW5hZ2VyLmhpZ2hsaWdodFNlbGVjdG9yKHNlbGVjdG9yVGV4 dCwgdGhpcy5fc3R5bGUubm9kZS5vd25lckRvY3VtZW50LmZyYW1lSWRlbnRpZmllcik7CisgICAg ICAgIGlmIChub2RlLmZyYW1lKQorICAgICAgICAgICAgV0kuZG9tTWFuYWdlci5oaWdobGlnaHRT ZWxlY3RvcihzZWxlY3RvclRleHQsIG5vZGUuZnJhbWUuaWQpOworICAgICAgICBlbHNlCisgICAg ICAgICAgICBXSS5kb21NYW5hZ2VyLmhpZ2hsaWdodFNlbGVjdG9yKHNlbGVjdG9yVGV4dCk7CiAg ICAgfQogCiAgICAgX2hpZGVET01Ob2RlSGlnaGxpZ2h0KCkK