164349 2016-11-02 16:34:59 -0700 Web Inspector: Modify FolderTreeElement to have a Collection as a its represented object 2016-11-03 11:45:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 145906 1 hi hi bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1247557 0 hi 2016-11-02 16:34:59 -0700 In order to allow folder's to be selectable and show content, it it necessary for them to know what content to display. Now that we have the general WI.Collection model object, we can leverage this by making all WI.FolderTreeElement instances have a representedObject that is a WI.Collection of all its children. 1247560 1 webkit-bug-importer 2016-11-02 16:35:20 -0700 <rdar://problem/29078775> 1247562 2 293712 hi 2016-11-02 16:39:49 -0700 Created attachment 293712 Patch 1247568 3 293712 timothy 2016-11-02 16:45:44 -0700 Comment on attachment 293712 Patch Matt, can you review this. It touches code you added, re: countChildrenCallback. 1247765 4 293712 mattbaker 2016-11-03 11:20:32 -0700 Comment on attachment 293712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=293712&action=review r=me, use of Collection really makes this code cleaner! > Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js:28 > + constructor(title, representedObject) Nice cleanup. > Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js:35 > + super(classNames, title, subtitle, representedObject, hasChildren); Just naming the bool is probably sufficient, but I don't feel too strongly about it. > Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js:56 > + for (let [key, value] of Object.entries(WebInspector.Resource.Type)) { Object.entries, cool! 1247775 5 293712 commit-queue 2016-11-03 11:45:11 -0700 Comment on attachment 293712 Patch Clearing flags on attachment: 293712 Committed r208337: <http://trac.webkit.org/changeset/208337> 1247776 6 commit-queue 2016-11-03 11:45:15 -0700 All reviewed patches have been landed. Closing bug. 293712 2016-11-02 16:39:49 -0700 2016-11-03 11:45:11 -0700 Patch bug-164349-20161102163551.patch text/plain 17017 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNlMzcwMjg1OTIxNDg1YzE5YmJhM2Y5MWEzZGYx MmMzNDRiM2U5YWIuLmY2NmY4MmExYWQ0M2Y0MGFlZmNiNTBkMWU3Mzg1NDBjYWY5NDgyZWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE2LTExLTAyICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE1vZGlmeSBGb2xkZXJUcmVlRWxlbWVudCB0byBoYXZlIGEgQ29sbGVjdGlvbiBhcyBh IGl0cyByZXByZXNlbnRlZCBvYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NDM0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJUcmVlRWxlbWVudC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudCk6CisgICAgICAgIE5v dyBhY2NlcHRzIGEgcmVwcmVzZW50ZWRPYmplY3QgcGFyYW1ldGVyLCB3aGljaCBtdXN0IGJlIGEg V2ViSW5zcGVjdG9yLkNvbGxlY3Rpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJp emVkVHJlZUVsZW1lbnQucHJvdG90eXBlLnJlZ2lzdGVyRm9sZGVyaXplU2V0dGluZ3MpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRl UGFyZW50U3RhdHVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1l bnQucHJvdG90eXBlLl9wYXJlbnRUcmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zZXR0 aW5nc0ZvclJlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJp emVkVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zaG91bGRHcm91cEludG9Gb2xkZXJzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQpOgorICAgICAgICBSZXdvcmsg dGhlIGxvZ2ljIGZvciBjcmVhdGluZyBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQgc28g dGhhdCBpdGVtcyBmb3IgdGhlCisgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0IHBhcmFtZXRlciBt YXkgYmUgcGFzc2VkIGluIHZpYSByZWdpc3RlckZvbGRlcml6ZVNldHRpbmdzLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1l VHJlZUVsZW1lbnQuKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVF bGVtZW50Lm1ha2VDaGlsZENvdW50Q2FsbGJhY2spOiBEZWxldGVkLgorICAgICAgICBSZXdvcmsg bG9naWMgZm9yIGNhbGxpbmcgcmVnaXN0ZXJGb2xkZXJpemVTZXR0aW5ncyB0byBzdXBwb3J0IHRo ZSByZXByZXNlbnRlZE9iamVjdAorICAgICAgICBwYXJhbWV0ZXIuICBBbHNvIGNoYW5nZWQgY2Fs bHMgdG8gV2ViSW5zcGVjdG9yLkZyYW1lIHRvIHN1cHBvcnQgdGhlCisgICAgICAgIFdlYkluc3Bl Y3Rvci5Db2xsZWN0aW9uIGNsYXNzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9S ZXNvdXJjZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNp ZGViYXJQYW5lbC5wcm90b3R5cGUudHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9zY3Jp cHRXYXNBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwu cHJvdG90eXBlLl9zY3JpcHRzQ2xlYXJlZCk6CisgICAgICAgIENyZWF0ZSBXZWJJbnNwZWN0b3Iu Q29sbGVjdGlvbiBpbnN0YW5jZXMgb2YgU2NyaXB0IG1vZGVsIG9iamVjdHMgZm9yIGFkZGl0aW9u YWwgZm9sZGVycworICAgICAgICBjcmVhdGVkIGJ5IHRoZSBSZXNvdXJjZXMgc2lkZWJhcjoKKyAg ICAgICAgIC0gQW5vbnltb3VzIFNjcmlwdHMKKyAgICAgICAgIC0gRXh0ZW5zaW9uIFNjcmlwdHMK KyAgICAgICAgIC0gRXh0cmEgU2NyaXB0cworCiAyMDE2LTExLTAyICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW5jbHVkZSBE ZWJ1Z2dlckFnZW50IGluIFdvcmtlcnMgLSBzZWUsIHBhdXNlLCBhbmQgc3RlcCB0aHJvdWdoIHNj cmlwdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZvbGRlclRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRm9sZGVyVHJlZUVsZW1lbnQuanMKaW5kZXggNmVlNWQ4MjRjMjdhMDk1ZjA4 OWJlMmU1ZWU4NzVjMTBjNDVhZTgxNi4uN2ViMTBmZGYwZTgxYTAxMzA4YmM0ZDIwOTJiMzg4MjA4 MGQ1ZWVmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRm9sZGVyVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyVHJlZUVsZW1lbnQuanMKQEAgLTI1LDIyICsyNSwxNSBA QAogCiBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQgPSBjbGFzcyBGb2xkZXJUcmVlRWxl bWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQKIHsKLSAgICBjb25z dHJ1Y3Rvcih0aXRsZSwgc3VidGl0bGUsIGFkZGl0aW9uYWxDbGFzc05hbWVzLCByZXByZXNlbnRl ZE9iamVjdCkKKyAgICBjb25zdHJ1Y3Rvcih0aXRsZSwgcmVwcmVzZW50ZWRPYmplY3QpCiAgICAg ewotICAgICAgICB2YXIgY2xhc3NOYW1lczsKLSAgICAgICAgaWYgKCFhZGRpdGlvbmFsQ2xhc3NO YW1lcykKLSAgICAgICAgICAgIGNsYXNzTmFtZXMgPSBbXTsKLSAgICAgICAgZWxzZSBpZiAoYWRk aXRpb25hbENsYXNzTmFtZXMuY29uc3RydWN0b3IgPT09IEFycmF5KQotICAgICAgICAgICAgY2xh c3NOYW1lcyA9IGFkZGl0aW9uYWxDbGFzc05hbWVzOwotICAgICAgICBlbHNlIGlmICh0eXBlb2Yg YWRkaXRpb25hbENsYXNzTmFtZXMgPT09ICJzdHJpbmciKQotICAgICAgICAgICAgY2xhc3NOYW1l cyA9IFthZGRpdGlvbmFsQ2xhc3NOYW1lc107CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFyZXBy ZXNlbnRlZE9iamVjdCB8fCByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rv ci5Db2xsZWN0aW9uKTsKIAotICAgICAgICBjbGFzc05hbWVzLnVuc2hpZnQoV2ViSW5zcGVjdG9y LkZvbGRlclRyZWVFbGVtZW50LkZvbGRlckljb25TdHlsZUNsYXNzTmFtZSk7Ci0KLSAgICAgICAg c3VwZXIoY2xhc3NOYW1lcywgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCwgdHJ1 ZSk7CisgICAgICAgIGNvbnN0IGNsYXNzTmFtZXMgPSBbV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVF bGVtZW50LkZvbGRlckljb25TdHlsZUNsYXNzTmFtZV07CisgICAgICAgIGNvbnN0IHN1YnRpdGxl ID0gbnVsbDsKKyAgICAgICAgY29uc3QgaGFzQ2hpbGRyZW4gPSB0cnVlOworICAgICAgICBzdXBl cihjbGFzc05hbWVzLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0LCBoYXNDaGls ZHJlbik7CiAgICAgfQotCi0gICAgLy8gTm8gTWV0aG9kcyBvciBQcm9wZXJ0aWVzCiB9OwogCiBX ZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQuRm9sZGVySWNvblN0eWxlQ2xhc3NOYW1lID0g ImZvbGRlci1pY29uIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcwppbmRleCA5 MDMwZjRkOWY3YTJiMWNmOGM0MjY3MGRiZDQyMmQwNmZmODg5ZDVmLi5iMTdlN2U3YTM3NThjYzdi ZTIxNzg1M2MwOTllN2Q1M2QwYWI1YjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVFbGVt ZW50LmpzCkBAIC01MSwyMCArNTEsMTggQEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxl bWVudCA9IGNsYXNzIEZvbGRlcml6ZWRUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3AKICAgICAg ICAgdGhpcy5fZm9sZGVyU2V0dGluZ3NLZXkgPSB4OwogICAgIH0KIAotICAgIHJlZ2lzdGVyRm9s ZGVyaXplU2V0dGluZ3ModHlwZSwgZm9sZGVyRGlzcGxheU5hbWUsIHZhbGlkYXRlUmVwcmVzZW50 ZWRPYmplY3RDYWxsYmFjaywgY291bnRDaGlsZHJlbkNhbGxiYWNrLCB0cmVlRWxlbWVudENvbnN0 cnVjdG9yKQorICAgIHJlZ2lzdGVyRm9sZGVyaXplU2V0dGluZ3ModHlwZSwgZGlzcGxheU5hbWUs IHJlcHJlc2VudGVkT2JqZWN0LCB0cmVlRWxlbWVudENvbnN0cnVjdG9yKQogICAgIHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQodHlwZSk7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZvbGRlckRp c3BsYXlOYW1lKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodHlwZW9mIHZhbGlkYXRlUmVwcmVz ZW50ZWRPYmplY3RDYWxsYmFjayA9PT0gImZ1bmN0aW9uIik7Ci0gICAgICAgIGNvbnNvbGUuYXNz ZXJ0KHR5cGVvZiBjb3VudENoaWxkcmVuQ2FsbGJhY2sgPT09ICJmdW5jdGlvbiIpOworICAgICAg ICBjb25zb2xlLmFzc2VydChkaXNwbGF5TmFtZSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJl cHJlc2VudGVkT2JqZWN0KTsKICAgICAgICAgY29uc29sZS5hc3NlcnQodHlwZW9mIHRyZWVFbGVt ZW50Q29uc3RydWN0b3IgPT09ICJmdW5jdGlvbiIpOwogCi0gICAgICAgIHZhciBzZXR0aW5ncyA9 IHsKKyAgICAgICAgbGV0IHNldHRpbmdzID0gewogICAgICAgICAgICAgdHlwZSwKLSAgICAgICAg ICAgIGZvbGRlckRpc3BsYXlOYW1lLAotICAgICAgICAgICAgdmFsaWRhdGVSZXByZXNlbnRlZE9i amVjdENhbGxiYWNrLAotICAgICAgICAgICAgY291bnRDaGlsZHJlbkNhbGxiYWNrLAotICAgICAg ICAgICAgdHJlZUVsZW1lbnRDb25zdHJ1Y3RvcgorICAgICAgICAgICAgZGlzcGxheU5hbWUsCisg ICAgICAgICAgICByZXByZXNlbnRlZE9iamVjdCwKKyAgICAgICAgICAgIHRyZWVFbGVtZW50Q29u c3RydWN0b3IsCiAgICAgICAgIH07CiAKICAgICAgICAgdGhpcy5fZm9sZGVyaXplU2V0dGluZ3NN YXAuc2V0KHR5cGUsIHNldHRpbmdzKTsKQEAgLTE0Nyw5ICsxNDUsOSBAQCBXZWJJbnNwZWN0b3Iu Rm9sZGVyaXplZFRyZWVFbGVtZW50ID0gY2xhc3MgRm9sZGVyaXplZFRyZWVFbGVtZW50IGV4dGVu ZHMgV2ViSW5zcAogCiAgICAgdXBkYXRlUGFyZW50U3RhdHVzKCkKICAgICB7Ci0gICAgICAgIHZh ciBoYXNDaGlsZHJlbiA9IGZhbHNlOwotICAgICAgICBmb3IgKHZhciBzZXR0aW5ncyBvZiB0aGlz Ll9mb2xkZXJpemVTZXR0aW5nc01hcC52YWx1ZXMoKSkgewotICAgICAgICAgICAgaWYgKHNldHRp bmdzLmNvdW50Q2hpbGRyZW5DYWxsYmFjaygpKSB7CisgICAgICAgIGxldCBoYXNDaGlsZHJlbiA9 IGZhbHNlOworICAgICAgICBmb3IgKGxldCBzZXR0aW5ncyBvZiB0aGlzLl9mb2xkZXJpemVTZXR0 aW5nc01hcC52YWx1ZXMoKSkgeworICAgICAgICAgICAgaWYgKHNldHRpbmdzLnJlcHJlc2VudGVk T2JqZWN0Lml0ZW1zLnNpemUpIHsKICAgICAgICAgICAgICAgICBoYXNDaGlsZHJlbiA9IHRydWU7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CkBAIC0yNzIsMTAgKzI3MCwx MCBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50ID0gY2xhc3MgRm9sZGVyaXpl ZFRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcAogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuX2ZvbGRlclNldHRpbmdzS2V5ICE9PSAiIik7CiAKLSAgICAgICAgZnVuY3Rpb24gY3JlYXRl Rm9sZGVyVHJlZUVsZW1lbnQodHlwZSwgZGlzcGxheU5hbWUpCisgICAgICAgIGZ1bmN0aW9uIGNy ZWF0ZUZvbGRlclRyZWVFbGVtZW50KHNldHRpbmdzKQogICAgICAgICB7Ci0gICAgICAgICAgICBs ZXQgZm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50 KGRpc3BsYXlOYW1lKTsKLSAgICAgICAgICAgIGxldCBmb2xkZXJFeHBhbmRlZFNldHRpbmcgPSBu ZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcodHlwZSArICItZm9sZGVyLWV4cGFuZGVkLSIgKyB0aGlz Ll9mb2xkZXJTZXR0aW5nc0tleSwgZmFsc2UpOworICAgICAgICAgICAgbGV0IGZvbGRlclRyZWVF bGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudChzZXR0aW5ncy5kaXNw bGF5TmFtZSwgc2V0dGluZ3MucmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgbGV0IGZv bGRlckV4cGFuZGVkU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyhzZXR0aW5ncy50 eXBlICsgIi1mb2xkZXItZXhwYW5kZWQtIiArIHRoaXMuX2ZvbGRlclNldHRpbmdzS2V5LCBmYWxz ZSk7CiAgICAgICAgICAgICB0aGlzLl9mb2xkZXJFeHBhbmRlZFNldHRpbmdNYXAuc2V0KGZvbGRl clRyZWVFbGVtZW50LCBmb2xkZXJFeHBhbmRlZFNldHRpbmcpOwogCiAgICAgICAgICAgICBpZiAo Zm9sZGVyRXhwYW5kZWRTZXR0aW5nLnZhbHVlKQpAQCAtMjk2LDcgKzI5NCw3IEBAIFdlYkluc3Bl Y3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQgPSBjbGFzcyBGb2xkZXJpemVkVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIGlmIChmb2xkZXIpCiAgICAgICAgICAgICByZXR1cm4g Zm9sZGVyOwogCi0gICAgICAgIGZvbGRlciA9IGNyZWF0ZUZvbGRlclRyZWVFbGVtZW50LmNhbGwo dGhpcywgc2V0dGluZ3MudHlwZSwgc2V0dGluZ3MuZm9sZGVyRGlzcGxheU5hbWUpOworICAgICAg ICBmb2xkZXIgPSBjcmVhdGVGb2xkZXJUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHNldHRpbmdzKTsK ICAgICAgICAgdGhpcy5fZm9sZGVyVHlwZU1hcC5zZXQoc2V0dGluZ3MudHlwZSwgZm9sZGVyKTsK ICAgICAgICAgcmV0dXJuIGZvbGRlcjsKICAgICB9CkBAIC0zMTMsOCArMzExLDggQEAgV2ViSW5z cGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudCA9IGNsYXNzIEZvbGRlcml6ZWRUcmVlRWxlbWVu dCBleHRlbmRzIFdlYkluc3AKIAogICAgIF9zZXR0aW5nc0ZvclJlcHJlc2VudGVkT2JqZWN0KHJl cHJlc2VudGVkT2JqZWN0KQogICAgIHsKLSAgICAgICAgZm9yICh2YXIgc2V0dGluZ3Mgb2YgdGhp cy5fZm9sZGVyaXplU2V0dGluZ3NNYXAudmFsdWVzKCkpIHsKLSAgICAgICAgICAgIGlmIChzZXR0 aW5ncy52YWxpZGF0ZVJlcHJlc2VudGVkT2JqZWN0Q2FsbGJhY2socmVwcmVzZW50ZWRPYmplY3Qp KQorICAgICAgICBmb3IgKGxldCBzZXR0aW5ncyBvZiB0aGlzLl9mb2xkZXJpemVTZXR0aW5nc01h cC52YWx1ZXMoKSkgeworICAgICAgICAgICAgaWYgKHNldHRpbmdzLnJlcHJlc2VudGVkT2JqZWN0 LnR5cGVWZXJpZmllcihyZXByZXNlbnRlZE9iamVjdCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu IHNldHRpbmdzOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBudWxsOwpAQCAtMzY5LDcgKzM2 Nyw3IEBAIFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQgPSBjbGFzcyBGb2xkZXJp emVkVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwCiAKICAgICAgICAgLy8gSXRlcmF0ZSBvdmVy IGFsbCB0aGUgYXZhaWxhYmxlIGNoaWxkIG9iamVjdCB0eXBlcy4KICAgICAgICAgZm9yICh2YXIg c2V0dGluZ3Mgb2YgdGhpcy5fZm9sZGVyaXplU2V0dGluZ3NNYXAudmFsdWVzKCkpIHsKLSAgICAg ICAgICAgIGlmIChwdXNoQ2F0ZWdvcnkoc2V0dGluZ3MuY291bnRDaGlsZHJlbkNhbGxiYWNrKCkp KQorICAgICAgICAgICAgaWYgKHB1c2hDYXRlZ29yeShzZXR0aW5ncy5yZXByZXNlbnRlZE9iamVj dC5pdGVtcy5zaXplKSkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQog ICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCBkMWFh MWE3NmU0ODZjNzFlMDEyNDE3YTRhMzVkOTk4OTUyMjgyODIxLi45YjhmMmVkMDRmOGZjMTdmYzM1 ODhkNTY4NGU4ZjE1Y2U3ODNiZTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTQ5 LDQ0ICs0OSwxMyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudCA9IGNsYXNzIEZyYW1l VHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuUmVzbwogICAgICAgICB0aGlzLnNob3Vs ZFJlZnJlc2hDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgIHRoaXMuZm9sZGVyU2V0dGluZ3NLZXkg PSB0aGlzLl9mcmFtZS51cmwuaGFzaDsKIAotICAgICAgICB0aGlzLnJlZ2lzdGVyRm9sZGVyaXpl U2V0dGluZ3MoImZyYW1lcyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJhbWVzIiksCi0gICAg ICAgICAgICAocmVwcmVzZW50ZWRPYmplY3QpID0+IHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLkZyYW1lLAotICAgICAgICAgICAgKCkgPT4gdGhpcy5mcmFtZS5jaGls ZEZyYW1lQ29sbGVjdGlvbi5pdGVtcy5zaXplLAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkZy YW1lVHJlZUVsZW1lbnQKLSAgICAgICAgKTsKLQotICAgICAgICB0aGlzLnJlZ2lzdGVyRm9sZGVy aXplU2V0dGluZ3MoImZsb3dzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGbG93cyIpLAotICAg ICAgICAgICAgKHJlcHJlc2VudGVkT2JqZWN0KSA9PiByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5Db250ZW50RmxvdywKLSAgICAgICAgICAgICgpID0+IHRoaXMuZnJh bWUuZG9tVHJlZS5jb250ZW50Rmxvd0NvbGxlY3Rpb24uaXRlbXMuc2l6ZSwKLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5Db250ZW50Rmxvd1RyZWVFbGVtZW50Ci0gICAgICAgICk7Ci0KLSAgICAg ICAgdGhpcy5yZWdpc3RlckZvbGRlcml6ZVNldHRpbmdzKCJleHRyYS1zY3JpcHRzIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJFeHRyYSBTY3JpcHRzIiksCi0gICAgICAgICAgICAocmVwcmVzZW50 ZWRPYmplY3QpID0+IHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNj cmlwdCAmJiByZXByZXNlbnRlZE9iamVjdC5keW5hbWljYWxseUFkZGVkU2NyaXB0RWxlbWVudCwK LSAgICAgICAgICAgICgpID0+IHRoaXMuZnJhbWUuZXh0cmFTY3JpcHRDb2xsZWN0aW9uLml0ZW1z LnNpemUsCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuU2NyaXB0VHJlZUVsZW1lbnQKLSAgICAg ICAgKTsKLQotICAgICAgICBmdW5jdGlvbiBtYWtlVmFsaWRhdGVDYWxsYmFjayhyZXNvdXJjZVR5 cGUpIHsKLSAgICAgICAgICAgIHJldHVybiBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkgewot ICAgICAgICAgICAgICAgIHJldHVybiByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYklu c3BlY3Rvci5SZXNvdXJjZSAmJiByZXByZXNlbnRlZE9iamVjdC50eXBlID09PSByZXNvdXJjZVR5 cGU7Ci0gICAgICAgICAgICB9OwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gbWFrZUNo aWxkQ291bnRDYWxsYmFjayhmcmFtZSwgcmVzb3VyY2VUeXBlKSB7Ci0gICAgICAgICAgICByZXR1 cm4gZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGZyYW1lLnJlc291cmNlQ29s bGVjdGlvbkZvclR5cGUocmVzb3VyY2VUeXBlKS5pdGVtcy5zaXplOwotICAgICAgICAgICAgfTsK LSAgICAgICAgfQorICAgICAgICB0aGlzLnJlZ2lzdGVyRm9sZGVyaXplU2V0dGluZ3MoImZyYW1l cyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJhbWVzIiksIHRoaXMuX2ZyYW1lLmNoaWxkRnJh bWVDb2xsZWN0aW9uLCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudCk7CisgICAgICAgIHRo aXMucmVnaXN0ZXJGb2xkZXJpemVTZXR0aW5ncygiZmxvd3MiLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkZsb3dzIiksIHRoaXMuX2ZyYW1lLmRvbVRyZWUuY29udGVudEZsb3dDb2xsZWN0aW9uLCBX ZWJJbnNwZWN0b3IuQ29udGVudEZsb3dUcmVlRWxlbWVudCk7CisgICAgICAgIHRoaXMucmVnaXN0 ZXJGb2xkZXJpemVTZXR0aW5ncygiZXh0cmEtc2NyaXB0cyIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRXh0cmEgU2NyaXB0cyIpLCB0aGlzLl9mcmFtZS5leHRyYVNjcmlwdENvbGxlY3Rpb24sIFdl Ykluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCk7CiAKLSAgICAgICAgZm9yICh2YXIga2V5IGlu IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlKSB7Ci0gICAgICAgICAgICB2YXIgdmFsdWUgPSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZVtrZXldOwotICAgICAgICAgICAgdmFyIGZvbGRlck5h bWUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuZGlzcGxheU5hbWVGb3JUeXBlKHZhbHVlLCB0cnVl KTsKLSAgICAgICAgICAgIHRoaXMucmVnaXN0ZXJGb2xkZXJpemVTZXR0aW5ncyhrZXksIGZvbGRl ck5hbWUsCi0gICAgICAgICAgICAgICAgbWFrZVZhbGlkYXRlQ2FsbGJhY2sodmFsdWUpLAotICAg ICAgICAgICAgICAgIG1ha2VDaGlsZENvdW50Q2FsbGJhY2sodGhpcy5mcmFtZSwgdmFsdWUpLAot ICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50Ci0gICAgICAg ICAgICApOworICAgICAgICBmb3IgKGxldCBba2V5LCB2YWx1ZV0gb2YgT2JqZWN0LmVudHJpZXMo V2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUpKSB7CisgICAgICAgICAgICBsZXQgZm9sZGVyTmFt ZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5kaXNwbGF5TmFtZUZvclR5cGUodmFsdWUsIHRydWUp OworICAgICAgICAgICAgdGhpcy5yZWdpc3RlckZvbGRlcml6ZVNldHRpbmdzKGtleSwgZm9sZGVy TmFtZSwgdGhpcy5fZnJhbWUucmVzb3VyY2VDb2xsZWN0aW9uRm9yVHlwZSh2YWx1ZSksIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50KTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMu dXBkYXRlUGFyZW50U3RhdHVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCmlu ZGV4IDU5NDIzNDk3MjNhMTcyZGM0MDNjOThlMmNkMTExYjBjZTExM2ZjMTYuLmFiN2RmZmVhZGMw NDRjNjQzNTNhMTU0NzllYjg1OTY2NTg5YTY0YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJh clBhbmVsLmpzCkBAIC0xNzEsMTQgKzE3MSwxOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRl YmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJjZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwog ICAgICAgICAvLyB3aW5kb3cuZXZhbCgpIG9yIGJyb3dzZXIgZmVhdHVyZXMgbGlrZSBBdXRvIEZp bGwgYW5kIFJlYWRlci4gVGhleSBhcmUgbm90IG5vcm1hbGx5IGFkZGVkIHRvIHRoZSBzaWRlYmFy LCBidXQgc2luY2UKICAgICAgICAgLy8gd2UgaGF2ZSBhIFNjcmlwdENvbnRlbnRWaWV3IGFza2lu ZyBmb3IgdGhlIHRyZWUgZWxlbWVudCB3ZSB3aWxsIG1ha2UgYSBTY3JpcHRUcmVlRWxlbWVudCBv biBkZW1hbmQgYW5kIGFkZCBpdC4KIAotICAgICAgICBpZiAoIXRoaXMuX2Fub255bW91c1Njcmlw dHNGb2xkZXJUcmVlRWxlbWVudCkKLSAgICAgICAgICAgIHRoaXMuX2Fub255bW91c1NjcmlwdHNG b2xkZXJUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQoV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJBbm9ueW1vdXMgU2NyaXB0cyIpKTsKKyAgICAgICAgaWYgKCF0 aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgIGxl dCBjb2xsZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5Db2xsZWN0aW9uKFdlYkluc3BlY3Rvci5D b2xsZWN0aW9uLlR5cGVWZXJpZmllci5TY3JpcHQpOworICAgICAgICAgICAgdGhpcy5fYW5vbnlt b3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVl RWxlbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFub255bW91cyBTY3JpcHRzIiksIGNvbGxl Y3Rpb24pOworICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9hbm9ueW1vdXNTY3JpcHRz Rm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KSB7CiAgICAgICAgICAgICB2YXIgaW5kZXggPSBpbnNl cnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24odGhpcy5fYW5vbnltb3Vz U2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LCB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZS5jaGlsZHJl biwgdGhpcy5fY29tcGFyZVRyZWVFbGVtZW50cyk7CiAgICAgICAgICAgICB0aGlzLmNvbnRlbnRU cmVlT3V0bGluZS5pbnNlcnRDaGlsZCh0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVs ZW1lbnQsIGluZGV4KTsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX2Fub255bW91c1Njcmlw dHNGb2xkZXJUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdC5hZGQocmVwcmVzZW50ZWRPYmpl Y3QpOworCiAgICAgICAgIHZhciBzY3JpcHRUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3Iu U2NyaXB0VHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOwogICAgICAgICB0aGlzLl9hbm9u eW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc2NyaXB0VHJlZUVsZW1l bnQpOwogCkBAIC0yOTMsMjIgKzI5NywzMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFy UGFuZWwgPSBjbGFzcyBSZXNvdXJjZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIGluc2VydEludG9Ub3BM ZXZlbCA9IGZhbHNlOworICAgICAgICBsZXQgaW5zZXJ0SW50b1RvcExldmVsID0gZmFsc2U7Cisg ICAgICAgIGxldCBwYXJlbnRGb2xkZXJUcmVlRWxlbWVudCA9IG51bGw7CiAKICAgICAgICAgaWYg KHNjcmlwdC5pbmplY3RlZCkgewotICAgICAgICAgICAgaWYgKCF0aGlzLl9leHRlbnNpb25TY3Jp cHRzRm9sZGVyVHJlZUVsZW1lbnQpCi0gICAgICAgICAgICAgICAgdGhpcy5fZXh0ZW5zaW9uU2Ny aXB0c0ZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVu dChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4dGVuc2lvbiBTY3JpcHRzIikpOwotICAgICAgICAg ICAgdmFyIHBhcmVudEZvbGRlclRyZWVFbGVtZW50ID0gdGhpcy5fZXh0ZW5zaW9uU2NyaXB0c0Zv bGRlclRyZWVFbGVtZW50OworICAgICAgICAgICAgaWYgKCF0aGlzLl9leHRlbnNpb25TY3JpcHRz Rm9sZGVyVHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICBsZXQgY29sbGVjdGlvbiA9IG5l dyBXZWJJbnNwZWN0b3IuQ29sbGVjdGlvbihXZWJJbnNwZWN0b3IuQ29sbGVjdGlvbi5UeXBlVmVy aWZpZXIuU2NyaXB0KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9leHRlbnNpb25TY3JpcHRzRm9s ZGVyVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50KFdlYklu c3BlY3Rvci5VSVN0cmluZygiRXh0ZW5zaW9uIFNjcmlwdHMiKSwgY29sbGVjdGlvbik7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIHBhcmVudEZvbGRlclRyZWVFbGVtZW50ID0gdGhpcy5f ZXh0ZW5zaW9uU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50OwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dhYmxlVHlwZSA9PT0gV2ViSW5zcGVjdG9y LkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQgJiYgIVdlYkluc3BlY3Rvci5oYXNFeHRyYURvbWFp bnMpCiAgICAgICAgICAgICAgICAgaW5zZXJ0SW50b1RvcExldmVsID0gdHJ1ZTsKICAgICAgICAg ICAgIGVsc2UgewotICAgICAgICAgICAgICAgIGlmICghdGhpcy5fZXh0cmFTY3JpcHRzRm9sZGVy VHJlZUVsZW1lbnQpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2V4dHJhU2NyaXB0c0ZvbGRl clRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudChXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkV4dHJhIFNjcmlwdHMiKSk7Ci0gICAgICAgICAgICAgICAgdmFyIHBh cmVudEZvbGRlclRyZWVFbGVtZW50ID0gdGhpcy5fZXh0cmFTY3JpcHRzRm9sZGVyVHJlZUVsZW1l bnQ7CisgICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9leHRyYVNjcmlwdHNGb2xkZXJUcmVlRWxl bWVudCkgeworICAgICAgICAgICAgICAgICAgICBsZXQgY29sbGVjdGlvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuQ29sbGVjdGlvbihXZWJJbnNwZWN0b3IuQ29sbGVjdGlvbi5UeXBlVmVyaWZpZXIuU2Ny aXB0KTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZXh0cmFTY3JpcHRzRm9sZGVyVHJlZUVs ZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50KFdlYkluc3BlY3Rvci5V SVN0cmluZygiRXh0cmEgU2NyaXB0cyIpLCBjb2xsZWN0aW9uKTsKKyAgICAgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgICAgICBwYXJlbnRGb2xkZXJUcmVlRWxlbWVudCA9IHRoaXMuX2V4dHJh U2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAg ICAgICAgcGFyZW50Rm9sZGVyVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QuYWRkKHNjcmlw dCk7CisKICAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5T Y3JpcHRUcmVlRWxlbWVudChzY3JpcHQpOwogCiAgICAgICAgIGlmIChpbnNlcnRJbnRvVG9wTGV2 ZWwpIHsKQEAgLTM0NiwxOCArMzU5LDI0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQ YW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAg ICAgIGlmICh0aGlzLl9leHRlbnNpb25TY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQpIHsKICAgICAg ICAgICAgIGlmICh0aGlzLl9leHRlbnNpb25TY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQucGFyZW50 KQogICAgICAgICAgICAgICAgIHRoaXMuX2V4dGVuc2lvblNjcmlwdHNGb2xkZXJUcmVlRWxlbWVu dC5wYXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5fZXh0ZW5zaW9uU2NyaXB0c0ZvbGRlclRyZWVFbGVt ZW50LCBzdXBwcmVzc09uRGVzZWxlY3QsIHN1cHByZXNzU2VsZWN0U2libGluZyk7CisKKyAgICAg ICAgICAgIHRoaXMuX2V4dGVuc2lvblNjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5yZXByZXNlbnRl ZE9iamVjdC5jbGVhcigpOwogICAgICAgICAgICAgdGhpcy5fZXh0ZW5zaW9uU2NyaXB0c0ZvbGRl clRyZWVFbGVtZW50ID0gbnVsbDsKICAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLl9leHRy YVNjcmlwdHNGb2xkZXJUcmVlRWxlbWVudCkgewogICAgICAgICAgICAgaWYgKHRoaXMuX2V4dHJh U2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50LnBhcmVudCkKICAgICAgICAgICAgICAgICB0aGlzLl9l eHRyYVNjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5fZXh0 cmFTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQsIHN1cHByZXNzT25EZXNlbGVjdCwgc3VwcHJlc3NT ZWxlY3RTaWJsaW5nKTsKKworICAgICAgICAgICAgdGhpcy5fZXh0cmFTY3JpcHRzRm9sZGVyVHJl ZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QuY2xlYXIoKTsKICAgICAgICAgICAgIHRoaXMuX2V4 dHJhU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50ID0gbnVsbDsKICAgICAgICAgfQogCiAgICAgICAg IGlmICh0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQpIHsKICAgICAgICAg ICAgIGlmICh0aGlzLl9hbm9ueW1vdXNTY3JpcHRzRm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KQog ICAgICAgICAgICAgICAgIHRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5w YXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRyZWVFbGVtZW50 LCBzdXBwcmVzc09uRGVzZWxlY3QsIHN1cHByZXNzU2VsZWN0U2libGluZyk7CisKKyAgICAgICAg ICAgIHRoaXMuX2Fub255bW91c1NjcmlwdHNGb2xkZXJUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9i amVjdC5jbGVhcigpOwogICAgICAgICAgICAgdGhpcy5fYW5vbnltb3VzU2NyaXB0c0ZvbGRlclRy ZWVFbGVtZW50ID0gbnVsbDsKICAgICAgICAgfQogCg==