73321 2011-11-29 07:44:43 -0800 Web Inspector: split Preferences into Preferences and Capabilities. 2011-11-29 08:01:47 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 510763 0 pfeldman 2011-11-29 07:44:43 -0800 Part of the Preferences defined in Settings.js are in fact backend capabilities. Split them into two separate objects for further capabilities refactoring. 510765 1 116966 pfeldman 2011-11-29 07:50:28 -0800 Created attachment 116966 Patch 510772 2 pfeldman 2011-11-29 08:01:47 -0800 Committed r101381: <http://trac.webkit.org/changeset/101381> 116966 2011-11-29 07:50:28 -0800 2011-11-29 07:52:53 -0800 Patch bug-73321-20111129195026.patch text/plain 28621 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NhMTk2MzMzYjFjNTcx ODE1MDI1YjY5NTIzNmIwMGFkNTRmNDBhYy4uNDFiYzhmZDk2ZThjYTU1MDNjMmI3MTFiN2YyNDg5 NDhkOTI3YjZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ1IEBACiAyMDExLTExLTI5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBzcGxpdCBQcmVmZXJlbmNlcyBpbnRvIFByZWZlcmVuY2VzIGFuZCBDYXBhYmlsaXRpZXMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzMyMQorCisg ICAgICAgIFBhcnQgb2YgdGhlIFByZWZlcmVuY2VzIGRlZmluZWQgaW4gU2V0dGluZ3MuanMgYXJl IGluIGZhY3QgYmFja2VuZCBjYXBhYmlsaXRpZXMuCisgICAgICAgIFNwbGl0IHRoZW0gaW50byB0 d28gc2VwYXJhdGUgb2JqZWN0cyBmb3IgZnVydGhlciBjYXBhYmlsaXRpZXMgcmVmYWN0b3Jpbmcu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLndh c1Nob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZS5f cG9wdWxhdGVDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrSXRlbVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0l0ZW1WaWV3KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuX2NyZWF0ZVRhYmxlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuc3dpdGNoVG9EZXRh aWxlZFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlw ZS5zd2l0Y2hUb0JyaWVmVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1Zp ZXcucHJvdG90eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbHMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLnJlZnJlc2hSZXNvdXJjZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmdldCBkYXRhLmZv cm1hdE1pbGxpc2Vjb25kcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl Vmlldy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX2VuYWJsZURl dGFpbGVkSGVhcFByb2ZpbGVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5wb3B1bGF0 ZUltYWdlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLndhc1No b3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jbGVh ckludGVyZmFjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzU2NyZWVuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzOgorCisyMDExLTExLTI5ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Z29vZ2xlLmNvbT4KKwogICAgICAgICBOb3QgcmV2aWV3ZWQ6IGZpeGluZyBjbGFuZyBidWlsZC4K IAogICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCYXNlQWdlbnQuaDoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggZDdkMmRmM2I4MWRkNTE3NzYwMGUyNzE1NmI2NTcxNDJhOGY1ZTY1 MS4uYjFhMTM3MjQ4YmEwYTZjMGQyNTM0YmM0Njk3YWJiMWUxNWRkZGY2MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0xMS0yOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc3BsaXQg UHJlZmVyZW5jZXMgaW50byBQcmVmZXJlbmNlcyBhbmQgQ2FwYWJpbGl0aWVzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzMjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9qcy9EZXZUb29scy5q czoKKwogMjAxMS0xMS0yOSAgSmluZyBaaGFvICA8amluZ3poYW9AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIEFzc2VydGlvbiBmYWlscyB3aGVuIG9wZW5pbmcgdHdvIHBvcHVwIG1lbnVzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMK aW5kZXggNmE3MTQ3YzQ3NTYxOGJmZDY1MjJjNTNhZmY5ZDA1NWYzNTNiZGYxZS4uMDc1OTY4YzAy MTA4MjhkOGY3NGFmNDIxZWEwYTYyMzg4ODQ4M2MxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwpAQCAtODksNyArODksNyBA QCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICAvKioKICAgICAgICAgICogQHBhcmFtIHtQcm90b2NvbC5FcnJvcn0gZXJyb3IKLSAgICAgICAg ICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gY2FwYWJpbGl0aWVzCisgICAgICAgICAqIEBwYXJh bSB7QXJyYXkuPE1ldGFBZ2VudC5Eb21haW5DYXBhYmlsaXRpZXM+fSBjYXBhYmlsaXRpZXMKICAg ICAgICAgICovCiAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yLCBjYXBhYmlsaXRpZXMp CiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRWxlbWVudHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNQYW5lbC5qcwppbmRleCA4Y2ExOTQzODg4NmYwN2QzOTNmNDU0ZTYzZDU0YWQ1NzQ0 YmQ2N2JlLi5lMjZhMmZlMGY4Zjc5ZDYxZGViYzlmYjc1ZTVkOWQ3OTYzNDQ3YmYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz CkBAIC03MCw3ICs3MCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsID0gZnVuY3Rpb24o KQogICAgIHRoaXMuc2lkZWJhclBhbmVzLnN0eWxlcyA9IG5ldyBXZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUodGhpcy5zaWRlYmFyUGFuZXMuY29tcHV0ZWRTdHlsZSk7CiAgICAgdGhpcy5z aWRlYmFyUGFuZXMubWV0cmljcyA9IG5ldyBXZWJJbnNwZWN0b3IuTWV0cmljc1NpZGViYXJQYW5l KCk7CiAgICAgdGhpcy5zaWRlYmFyUGFuZXMucHJvcGVydGllcyA9IG5ldyBXZWJJbnNwZWN0b3Iu UHJvcGVydGllc1NpZGViYXJQYW5lKCk7Ci0gICAgaWYgKFByZWZlcmVuY2VzLm5hdGl2ZUluc3Ry dW1lbnRhdGlvbkVuYWJsZWQpCisgICAgaWYgKENhcGFiaWxpdGllcy5uYXRpdmVJbnN0cnVtZW50 YXRpb25FbmFibGVkKQogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5kb21CcmVha3BvaW50cyA9 IFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50c1NpZGViYXJQYW5lOwogICAgIHRoaXMuc2lkZWJh clBhbmVzLmV2ZW50TGlzdGVuZXJzID0gbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1Np ZGViYXJQYW5lKCk7CiAKQEAgLTEzNyw3ICsxMzcsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy50cmVlT3V0bGluZS5yb290RE9N Tm9kZSkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZXF1ZXN0RG9jdW1lbnQo KTsKIAotICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxl ZCkKKyAgICAgICAgaWYgKENhcGFiaWxpdGllcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVk KQogICAgICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5zaWRl YmFyUGFuZXMuZG9tQnJlYWtwb2ludHMuZWxlbWVudCwgdGhpcy5zaWRlYmFyUGFuZXMuZXZlbnRM aXN0ZW5lcnMuZWxlbWVudCk7CiAgICAgfSwKIApAQCAtMjAxLDcgKzIwMSw3IEBAIFdlYkluc3Bl Y3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogCi0gICAgICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25F bmFibGVkKQorICAgICAgICBpZiAoQ2FwYWJpbGl0aWVzLm5hdGl2ZUluc3RydW1lbnRhdGlvbkVu YWJsZWQpCiAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5kb21CcmVha3BvaW50cy5yZXN0 b3JlQnJlYWtwb2ludHMoKTsKIAogICAgICAgICAvKioKQEAgLTMxOSw3ICszMTksNyBAQCBXZWJJ bnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBfcG9wdWxhdGVDb250 ZXh0TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUsIG5vZGUpCiAgICAgewotICAgICAgICBpZiAo UHJlZmVyZW5jZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxlZCkgeworICAgICAgICBpZiAo Q2FwYWJpbGl0aWVzLm5hdGl2ZUluc3RydW1lbnRhdGlvbkVuYWJsZWQpIHsKICAgICAgICAgICAg IC8vIEFkZCBkZWJidWdpbmctcmVsYXRlZCBhY3Rpb25zCiAgICAgICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAgICAgICAgIHZhciBwYW5lID0gdGhpcy5zaWRlYmFy UGFuZXMuZG9tQnJlYWtwb2ludHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtJdGVtVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya0l0ZW1WaWV3LmpzCmluZGV4IDZmNjYxN2ZmNTFiOTU2ZGYwNThi YjVkOTcxOWZmYWYwYzcxZjE2MGMuLjIwYTc4ZDkxMzYzZTFmZTY5NzcxYjk2NjQ2MWJhMGE2YWI3 MWUyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya0l0ZW1WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya0l0ZW1WaWV3LmpzCkBAIC00NywxMiArNDcsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtJdGVtVmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHRoaXMuYXBwZW5kVGFiKCJwcmV2 aWV3IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmV2aWV3IiksIHByZXZpZXdWaWV3KTsKICAg ICB0aGlzLmFwcGVuZFRhYigicmVzcG9uc2UiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc3Bv bnNlIiksIHJlc3BvbnNlVmlldyk7CiAKLSAgICBpZiAoUHJlZmVyZW5jZXMuc2hvd0Nvb2tpZXNU YWIpIHsKKyAgICBpZiAoQ2FwYWJpbGl0aWVzLnNob3dDb29raWVzVGFiKSB7CiAgICAgICAgIHRo aXMuX2Nvb2tpZXNWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvb2tpZXNWaWV3KHJl c291cmNlKTsKICAgICAgICAgdGhpcy5hcHBlbmRUYWIoImNvb2tpZXMiLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNvb2tpZXMiKSwgdGhpcy5fY29va2llc1ZpZXcpOwogICAgIH0KIAotICAgIGlm IChQcmVmZXJlbmNlcy5zaG93VGltaW5nVGFiKSB7CisgICAgaWYgKENhcGFiaWxpdGllcy5zaG93 VGltaW5nVGFiKSB7CiAgICAgICAgIHZhciB0aW1pbmdWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRpbWluZ1ZpZXcocmVzb3VyY2UpOwogICAgICAgICB0aGlzLmFwcGVuZFRhYigidGlt aW5nIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1pbmciKSwgdGltaW5nVmlldyk7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcwppbmRleCBjM2VkZWM3NGUzNmQwNGU3NDQ1OTQ1YmQ0ZDRkMWNiMzVlMWIyOTQyLi4xNGI3 NjI5ZmEyMjkwNzZkZjc4NzBlNGIzNmU0MTZmMTUyOTA3YzgwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMTM5LDcgKzEz OSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX2Ny ZWF0ZVRhYmxlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgY29sdW1uczsKLSAgICAg ICAgaWYgKFByZWZlcmVuY2VzLnNob3dOZXR3b3JrUGFuZWxJbml0aWF0b3JDb2x1bW4pCisgICAg ICAgIGlmIChDYXBhYmlsaXRpZXMuc2hvd05ldHdvcmtQYW5lbEluaXRpYXRvckNvbHVtbikKICAg ICAgICAgICAgIGNvbHVtbnMgPSB7bmFtZToge30sIG1ldGhvZDoge30sIHN0YXR1czoge30sIHR5 cGU6IHt9LCBpbml0aWF0b3I6IHt9LCBzaXplOiB7fSwgdGltZToge30sIHRpbWVsaW5lOiB7fX07 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNvbHVtbnMgPSB7bmFtZToge30sIG1ldGhvZDog e30sIHN0YXR1czoge30sIHR5cGU6IHt9LCBzaXplOiB7fSwgdGltZToge30sIHRpbWVsaW5lOiB7 fX07CkBAIC0xNjAsNyArMTYwLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgY29sdW1ucy50eXBlLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAg Y29sdW1ucy50eXBlLndpZHRoID0gIjYlIjsKIAotICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2hv d05ldHdvcmtQYW5lbEluaXRpYXRvckNvbHVtbikgeworICAgICAgICBpZiAoQ2FwYWJpbGl0aWVz LnNob3dOZXR3b3JrUGFuZWxJbml0aWF0b3JDb2x1bW4pIHsKICAgICAgICAgICAgIGNvbHVtbnMu aW5pdGlhdG9yLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJJbml0aWF0b3IiKTsKICAg ICAgICAgICAgIGNvbHVtbnMuaW5pdGlhdG9yLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgICAg IGNvbHVtbnMuaW5pdGlhdG9yLndpZHRoID0gIjEwJSI7CkBAIC0xNzgsNyArMTc4LDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBjb2x1bW5z LnRpbWVsaW5lLnRpdGxlID0gIiI7CiAgICAgICAgIGNvbHVtbnMudGltZWxpbmUuc29ydGFibGUg PSBmYWxzZTsKLSAgICAgICAgaWYgKFByZWZlcmVuY2VzLnNob3dOZXR3b3JrUGFuZWxJbml0aWF0 b3JDb2x1bW4pCisgICAgICAgIGlmIChDYXBhYmlsaXRpZXMuc2hvd05ldHdvcmtQYW5lbEluaXRp YXRvckNvbHVtbikKICAgICAgICAgICAgIGNvbHVtbnMudGltZWxpbmUud2lkdGggPSAiNDAlIjsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgY29sdW1ucy50aW1lbGluZS53aWR0aCA9ICI1MCUi OwpAQCAtODMxLDcgKzgzMSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3dDb2x1bW4oIm1ldGhvZCIpOwogICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zaG93Q29sdW1uKCJzdGF0dXMiKTsKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuc2hvd0NvbHVtbigidHlwZSIpOwotICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2hv d05ldHdvcmtQYW5lbEluaXRpYXRvckNvbHVtbikKKyAgICAgICAgaWYgKENhcGFiaWxpdGllcy5z aG93TmV0d29ya1BhbmVsSW5pdGlhdG9yQ29sdW1uKQogICAgICAgICAgICAgdGhpcy5fZGF0YUdy aWQuc2hvd0NvbHVtbigiaW5pdGlhdG9yIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3dD b2x1bW4oInNpemUiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2hvd0NvbHVtbigidGltZSIp OwpAQCAtODQyLDExICs4NDIsMTEgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgd2lkdGhzLm1ldGhvZCA9IDY7CiAgICAgICAgIHdpZHRocy5zdGF0 dXMgPSA2OwogICAgICAgICB3aWR0aHMudHlwZSA9IDY7Ci0gICAgICAgIGlmIChQcmVmZXJlbmNl cy5zaG93TmV0d29ya1BhbmVsSW5pdGlhdG9yQ29sdW1uKQorICAgICAgICBpZiAoQ2FwYWJpbGl0 aWVzLnNob3dOZXR3b3JrUGFuZWxJbml0aWF0b3JDb2x1bW4pCiAgICAgICAgICAgICB3aWR0aHMu aW5pdGlhdG9yID0gMTA7CiAgICAgICAgIHdpZHRocy5zaXplID0gNjsKICAgICAgICAgd2lkdGhz LnRpbWUgPSA2OwotICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2hvd05ldHdvcmtQYW5lbEluaXRp YXRvckNvbHVtbikKKyAgICAgICAgaWYgKENhcGFiaWxpdGllcy5zaG93TmV0d29ya1BhbmVsSW5p dGlhdG9yQ29sdW1uKQogICAgICAgICAgICAgd2lkdGhzLnRpbWVsaW5lID0gNDA7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIHdpZHRocy50aW1lbGluZSA9IDUwOwpAQCAtODYyLDcgKzg2Miw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oIm1ldGhvZCIpOwogICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5oaWRlQ29sdW1uKCJzdGF0dXMiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVt bigidHlwZSIpOwotICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2hvd05ldHdvcmtQYW5lbEluaXRp YXRvckNvbHVtbikKKyAgICAgICAgaWYgKENhcGFiaWxpdGllcy5zaG93TmV0d29ya1BhbmVsSW5p dGlhdG9yQ29sdW1uKQogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigiaW5p dGlhdG9yIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGVDb2x1bW4oInNpemUiKTsKICAg ICAgICAgdGhpcy5fZGF0YUdyaWQuaGlkZUNvbHVtbigidGltZSIpOwpAQCAtOTQwLDcgKzk0MCw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0 b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlNhdmUgYWxsIGFzIEhBUiIgOiAiU2F2ZSBB bGwgYXMgSEFSIiksIHRoaXMuX2V4cG9ydEFsbC5iaW5kKHRoaXMpKTsKICAgICAgICAgfQogCi0g ICAgICAgIGlmIChQcmVmZXJlbmNlcy5jYW5DbGVhckNhY2hlQW5kQ29va2llcykgeworICAgICAg ICBpZiAoQ2FwYWJpbGl0aWVzLmNhbkNsZWFyQ2FjaGVBbmRDb29raWVzKSB7CiAgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNh c2VNZW51VGl0bGVzKCkgPyAiQ2xlYXIgYnJvd3NlciBjYWNoZSIgOiAiQ2xlYXIgQnJvd3NlciBD YWNoZSIpLCB0aGlzLl9jbGVhckJyb3dzZXJDYWNoZS5iaW5kKHRoaXMpKTsKICAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rv ci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQ2xlYXIgYnJvd3NlciBjb29raWVzIiA6ICJD bGVhciBCcm93c2VyIENvb2tpZXMiKSwgdGhpcy5fY2xlYXJCcm93c2VyQ29va2llcy5iaW5kKHRo aXMpKTsKQEAgLTE2ODYsNyArMTY4Niw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWRO b2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbWV0aG9kQ2VsbCA9IHRoaXMuX2NyZWF0 ZURpdkluVEQoIm1ldGhvZCIpOwogICAgICAgICB0aGlzLl9zdGF0dXNDZWxsID0gdGhpcy5fY3Jl YXRlRGl2SW5URCgic3RhdHVzIik7CiAgICAgICAgIHRoaXMuX3R5cGVDZWxsID0gdGhpcy5fY3Jl YXRlRGl2SW5URCgidHlwZSIpOwotICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2hvd05ldHdvcmtQ YW5lbEluaXRpYXRvckNvbHVtbikKKyAgICAgICAgaWYgKENhcGFiaWxpdGllcy5zaG93TmV0d29y a1BhbmVsSW5pdGlhdG9yQ29sdW1uKQogICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbCA9 IHRoaXMuX2NyZWF0ZURpdkluVEQoImluaXRpYXRvciIpOwogICAgICAgICB0aGlzLl9zaXplQ2Vs bCA9IHRoaXMuX2NyZWF0ZURpdkluVEQoInNpemUiKTsKICAgICAgICAgdGhpcy5fdGltZUNlbGwg PSB0aGlzLl9jcmVhdGVEaXZJblREKCJ0aW1lIik7CkBAIC0xNzgwLDcgKzE3ODAsNyBAQCBXZWJJ bnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhp cy5fcmVmcmVzaFN0YXR1c0NlbGwoKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaFR5cGVDZWxsKCk7 Ci0gICAgICAgIGlmIChQcmVmZXJlbmNlcy5zaG93TmV0d29ya1BhbmVsSW5pdGlhdG9yQ29sdW1u KQorICAgICAgICBpZiAoQ2FwYWJpbGl0aWVzLnNob3dOZXR3b3JrUGFuZWxJbml0aWF0b3JDb2x1 bW4pCiAgICAgICAgICAgICB0aGlzLl9yZWZyZXNoSW5pdGlhdG9yQ2VsbCgpOwogICAgICAgICB0 aGlzLl9yZWZyZXNoU2l6ZUNlbGwoKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaFRpbWVDZWxsKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVE YXRhR3JpZFRyZWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVEYXRhR3JpZFRyZWUuanMKaW5kZXggMmU4YTVhODg0ZmYxMzc1YWExYzVmZDJhMTViZDA3MTk1 Y2Y4N2UyZC4uYzMwODg0NjQ0NThkMmEyYjM1NmNjNzgxN2JlMGFlMjliOWFiOGRlNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRU cmVlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZURh dGFHcmlkVHJlZS5qcwpAQCAtNTAsNyArNTAsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZURhdGFH cmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBmdW5jdGlvbiBmb3JtYXRNaWxs aXNlY29uZHModGltZSkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIE51bWJlci5zZWNv bmRzVG9TdHJpbmcodGltZSAvIDEwMDAsICFQcmVmZXJlbmNlcy5zYW1wbGluZ0NQVVByb2ZpbGVy KTsKKyAgICAgICAgICAgIHJldHVybiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHRpbWUgLyAxMDAw LCAhQ2FwYWJpbGl0aWVzLnNhbXBsaW5nQ1BVUHJvZmlsZXIpOwogICAgICAgICB9CiAKICAgICAg ICAgdmFyIGRhdGEgPSB7fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUHJvZmlsZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Byb2ZpbGVWaWV3LmpzCmluZGV4IDU5YjZlZTUwOTllMjQxZjA4ZTNkZmQ0ODg5MjFiYTBj ZjJiYTU3NTEuLjc0Y2QzYjJlNjZhY2QzODk2MjIyNjI1YTgxNTk4N2E5MThiMmIxYTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwpA QCAtNDIsNyArNDIsNyBAQCBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcgPSBmdW5jdGlvbihw cm9maWxlKQogICAgICAgICAgICAgICAgICAgICAiY2FsbHMiOiB7IHRpdGxlOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkNhbGxzIiksIHdpZHRoOiAiNTRweCIsIHNvcnRhYmxlOiB0cnVlIH0sCiAg ICAgICAgICAgICAgICAgICAgICJmdW5jdGlvbiI6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiRnVuY3Rpb24iKSwgZGlzY2xvc3VyZTogdHJ1ZSwgc29ydGFibGU6IHRydWUgfSB9Owog Ci0gICAgaWYgKFByZWZlcmVuY2VzLnNhbXBsaW5nQ1BVUHJvZmlsZXIpIHsKKyAgICBpZiAoQ2Fw YWJpbGl0aWVzLnNhbXBsaW5nQ1BVUHJvZmlsZXIpIHsKICAgICAgICAgZGVsZXRlIGNvbHVtbnMu YXZlcmFnZTsKICAgICAgICAgZGVsZXRlIGNvbHVtbnMuY2FsbHM7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4 IGJhMDgyMTEyYmNmM2YxMWI2MDJiODNjYzFjZTRkNDMwNDc0YmQ3MmIuLjFiZDJjMTBiYjVkM2Zh ZDQ1OTYzYmRkYzM5NmZmNGQ5MjA2NjdkYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTExOSw3ICsxMTksNyBAQCBX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuZW5hYmxl VG9nZ2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oIiIsICJlbmFi bGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlUHJvZmlsaW5nLmJpbmQodGhp cyksIGZhbHNlKTsKLSAgICBpZiAoUHJlZmVyZW5jZXMucHJvZmlsZXJBbHdheXNFbmFibGVkKQor ICAgIGlmIChDYXBhYmlsaXRpZXMucHJvZmlsZXJBbHdheXNFbmFibGVkKQogICAgICAgICB0aGlz LmVuYWJsZVRvZ2dsZUJ1dHRvbi5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogCiAg ICAgdGhpcy5jbGVhclJlc3VsdHNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1 dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIGFsbCBwcm9maWxlcy4iKSwgImNsZWFy LXN0YXR1cy1iYXItaXRlbSIpOwpAQCAtMTMxLDE2ICsxMzEsMTYgQEAgV2ViSW5zcGVjdG9yLlBy b2ZpbGVzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy53ZWxjb21lVmlldyA9IG5ldyBXZWJJ bnNwZWN0b3IuV2VsY29tZVZpZXcoInByb2ZpbGVzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJX ZWxjb21lIHRvIHRoZSBQcm9maWxlcyBwYW5lbCIpKTsKIAogICAgIHRoaXMuX3Byb2ZpbGVzID0g W107Ci0gICAgdGhpcy5fcHJvZmlsZXJFbmFibGVkID0gUHJlZmVyZW5jZXMucHJvZmlsZXJBbHdh eXNFbmFibGVkOworICAgIHRoaXMuX3Byb2ZpbGVyRW5hYmxlZCA9IENhcGFiaWxpdGllcy5wcm9m aWxlckFsd2F5c0VuYWJsZWQ7CiAgICAgdGhpcy5fcmVzZXQoKTsKIAogICAgIHRoaXMuX3JlZ2lz dGVyUHJvZmlsZVR5cGUobmV3IFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlwZSgpKTsKLSAgICBp ZiAoUHJlZmVyZW5jZXMuaGVhcFByb2ZpbGVyUHJlc2VudCkKKyAgICBpZiAoQ2FwYWJpbGl0aWVz LmhlYXBQcm9maWxlclByZXNlbnQpCiAgICAgICAgIHRoaXMuX3JlZ2lzdGVyUHJvZmlsZVR5cGUo bmV3IFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90UHJvZmlsZVR5cGUoKSk7CiAKICAgICBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyUHJvZmlsZXJEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0 b3IuUHJvZmlsZXJEaXNwYXRjaGVyKHRoaXMpKTsKIAotICAgIGlmIChQcmVmZXJlbmNlcy5wcm9m aWxlckFsd2F5c0VuYWJsZWQgfHwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnByb2ZpbGVyRW5hYmxl ZC5nZXQoKSkKKyAgICBpZiAoQ2FwYWJpbGl0aWVzLnByb2ZpbGVyQWx3YXlzRW5hYmxlZCB8fCBX ZWJJbnNwZWN0b3Iuc2V0dGluZ3MucHJvZmlsZXJFbmFibGVkLmdldCgpKQogICAgICAgICBQcm9m aWxlckFnZW50LmVuYWJsZSgpOwogICAgIGVsc2UgewogICAgICAgICBmdW5jdGlvbiBvblByb2Zp bGVyRW5lYmxlZChlcnJvciwgdmFsdWUpIHsKQEAgLTg4OSw3ICs4ODksNyBAQCBXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBwcm9maWxlVHlwZSA9 IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFByb2ZpbGVUeXBlKCk7CiAgICAgICAg IHByb2ZpbGVUeXBlLnRyZWVFbGVtZW50ID0gb2xkUHJvZmlsZVR5cGUudHJlZUVsZW1lbnQ7CiAg ICAgICAgIHRoaXMuX3Byb2ZpbGVUeXBlc0J5SWRNYXBbcHJvZmlsZVR5cGUuaWRdID0gcHJvZmls ZVR5cGU7Ci0gICAgICAgIFByZWZlcmVuY2VzLmRldGFpbGVkSGVhcFByb2ZpbGVzID0gdHJ1ZTsK KyAgICAgICAgQ2FwYWJpbGl0aWVzLmRldGFpbGVkSGVhcFByb2ZpbGVzID0gdHJ1ZTsKICAgICAg ICAgdGhpcy5kZXRhY2goKTsKICAgICAgICAgdGhpcy5zaG93KCk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggZGIwODA2Mzll ZjhmODk5ZTEwOWQwZTAzNTQ0YjhlYzA1M2UwOWU2OC4uOTU1MzRhYTk1MGRhMjhmYzVlNTgyODkx ODEwZGYyMjhhNTkyNjM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlLmpzCkBAIC04OTEsMTAgKzg5MSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpbWFnZS5zcmMgPSB0aGlzLl9jb250ZW50VVJM KCk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoUHJlZmVyZW5jZXMudXNlRGF0YVVSTEZvclJl c291cmNlSW1hZ2VJY29ucykKLSAgICAgICAgICAgIHRoaXMucmVxdWVzdENvbnRlbnQob25SZXNv dXJjZUNvbnRlbnQuYmluZCh0aGlzKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGltYWdl LnNyYyA9IHRoaXMudXJsOworICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KG9uUmVzb3VyY2VD b250ZW50LmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBpc0h0dHBGYW1pbHk6IGZ1bmN0aW9u KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKaW5kZXggNTdhNWY0MzZlODVlOTk1Yjk3M2RmYzhiYjI1ODg0ZGExMDMyMjEwYi4uMmYx M2E2MTcyMzI5NmRmM2I3MzBkMzFmNjZhOTg3MGQ3ZmY0ZWUzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTY4LDEzICs2 OCwxMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9u TW9kZWwpCiAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrID0gbmV3IFdlYkluc3BlY3Rv ci5DYWxsU3RhY2tTaWRlYmFyUGFuZSh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7CiAgICAgdGhp cy5zaWRlYmFyUGFuZXMuc2NvcGVjaGFpbiA9IG5ldyBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpblNp ZGViYXJQYW5lKCk7CiAgICAgdGhpcy5zaWRlYmFyUGFuZXMuanNCcmVha3BvaW50cyA9IG5ldyBX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUodGhpcy5fcHJlc2Vu dGF0aW9uTW9kZWwsIHRoaXMuX3Nob3dTb3VyY2VMaW5lLmJpbmQodGhpcykpOwotICAgIGlmIChQ cmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkKSB7CisgICAgaWYgKENhcGFi aWxpdGllcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkKSB7CiAgICAgICAgIHRoaXMuc2lk ZWJhclBhbmVzLmRvbUJyZWFrcG9pbnRzID0gV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRzU2lk ZWJhclBhbmU7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLnhockJyZWFrcG9pbnRzID0gbmV3 IFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAgICAgICAgIHRoaXMu c2lkZWJhclBhbmVzLmV2ZW50TGlzdGVuZXJCcmVha3BvaW50cyA9IG5ldyBXZWJJbnNwZWN0b3Iu RXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKICAgICB9CiAKLSAgICBpZiAo UHJlZmVyZW5jZXMuY2FuSW5zcGVjdFdvcmtlcnMgJiYgIVdlYkluc3BlY3Rvci5Xb3JrZXJNYW5h Z2VyLmlzV29ya2VyRnJvbnRlbmQoKSkgeworICAgIGlmIChDYXBhYmlsaXRpZXMuY2FuSW5zcGVj dFdvcmtlcnMgJiYgIVdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLmlzV29ya2VyRnJvbnRlbmQo KSkgewogICAgICAgICBXb3JrZXJBZ2VudC5zZXRXb3JrZXJJbnNwZWN0aW9uRW5hYmxlZCh0cnVl KTsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMud29ya2VyTGlzdCA9IG5ldyBXZWJJbnNwZWN0 b3IuV29ya2VyTGlzdFNpZGViYXJQYW5lKFdlYkluc3BlY3Rvci53b3JrZXJNYW5hZ2VyKTsKICAg ICB9IGVsc2UKQEAgLTEwMyw3ICsxMDMsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0g ZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAKICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv biA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAiZW5hYmxlLXRvZ2dsZS1z dGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRFdmVudExp c3RlbmVyKCJjbGljayIsIHRoaXMudG9nZ2xlRGVidWdnaW5nLCB0aGlzKTsKLSAgICBpZiAoUHJl ZmVyZW5jZXMuZGVidWdnZXJBbHdheXNFbmFibGVkKQorICAgIGlmIChDYXBhYmlsaXRpZXMuZGVi dWdnZXJBbHdheXNFbmFibGVkKQogICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5lbGVt ZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogCiAgICAgdGhpcy5fcGF1c2VPbkV4Y2VwdGlv bkJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAic2NyaXB0cy1w YXVzZS1vbi1leGNlcHRpb25zLXN0YXR1cy1iYXItaXRlbSIsIDMpOwpAQCAtMTE2LDcgKzExNiw3 IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2Rl bCkKICAgICB0aGlzLl9zY3JpcHRWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9zY3JpcHRWaWV3U3RhdHVzQmFySXRl bXNDb250YWluZXIuc3R5bGUuZGlzcGxheSA9ICJpbmxpbmUtYmxvY2siOwogCi0gICAgdGhpcy5f ZGVidWdnZXJFbmFibGVkID0gUHJlZmVyZW5jZXMuZGVidWdnZXJBbHdheXNFbmFibGVkOworICAg IHRoaXMuX2RlYnVnZ2VyRW5hYmxlZCA9IENhcGFiaWxpdGllcy5kZWJ1Z2dlckFsd2F5c0VuYWJs ZWQ7CiAKICAgICB0aGlzLl9yZXNldChmYWxzZSk7CiAKQEAgLTEzNyw3ICsxMzcsNyBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAg dGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRXhlY3V0aW9uTGluZUNoYW5nZWQsIHRoaXMu X2V4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LkV2ZW50cy5EZWJ1Z2dlclJlc2V0LCB0aGlzLl9yZXNldC5iaW5kKHRoaXMsIGZhbHNlKSk7CiAg ICAgCi0gICAgdmFyIGVuYWJsZURlYnVnZ2VyID0gUHJlZmVyZW5jZXMuZGVidWdnZXJBbHdheXNF bmFibGVkIHx8IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dlckVuYWJsZWQuZ2V0KCk7Cisg ICAgdmFyIGVuYWJsZURlYnVnZ2VyID0gQ2FwYWJpbGl0aWVzLmRlYnVnZ2VyQWx3YXlzRW5hYmxl ZCB8fCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGVidWdnZXJFbmFibGVkLmdldCgpOwogICAgIGlm IChlbmFibGVEZWJ1Z2dlcikKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZW5h YmxlRGVidWdnZXIoKTsKIApAQCAtMTc3LDcgKzE3Nyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgIHdhc1Nob3duOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLndhc1Nob3duLmNhbGwodGhpcyk7Ci0g ICAgICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkKQorICAg ICAgICBpZiAoQ2FwYWJpbGl0aWVzLm5hdGl2ZUluc3RydW1lbnRhdGlvbkVuYWJsZWQpCiAgICAg ICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnNpZGViYXJQYW5l cy5kb21CcmVha3BvaW50cy5lbGVtZW50LCB0aGlzLnNpZGViYXJQYW5lcy54aHJCcmVha3BvaW50 cy5lbGVtZW50KTsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMud2F0Y2hFeHByZXNzaW9ucy5z aG93KCk7CiAgICAgfSwKQEAgLTgwMiw3ICs4MDIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnVw ZGF0ZShudWxsKTsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuc2NvcGVjaGFpbi51cGRhdGUo bnVsbCk7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMuY2xlYXJCcmVh a3BvaW50SGlnaGxpZ2h0KCk7Ci0gICAgICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVt ZW50YXRpb25FbmFibGVkKSB7CisgICAgICAgIGlmIChDYXBhYmlsaXRpZXMubmF0aXZlSW5zdHJ1 bWVudGF0aW9uRW5hYmxlZCkgewogICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuZG9tQnJl YWtwb2ludHMuY2xlYXJCcmVha3BvaW50SGlnaGxpZ2h0KCk7CiAgICAgICAgICAgICB0aGlzLnNp ZGViYXJQYW5lcy5ldmVudExpc3RlbmVyQnJlYWtwb2ludHMuY2xlYXJCcmVha3BvaW50SGlnaGxp Z2h0KCk7CiAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy54aHJCcmVha3BvaW50cy5jbGVh ckJyZWFrcG9pbnRIaWdobGlnaHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IGMyMWFjNjQ5ZjJlNDk0YWEyZTMzNDJhNzZmMmI3MTZm MjE2YjEwMmMuLjUxYjQyMGVhNDYyYTY3M2M1Yzk2MGRlZjkzNGFhY2I0OGMyZDljMGQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtMzcs MjcgKzM3LDI4IEBAIHZhciBQcmVmZXJlbmNlcyA9IHsKICAgICBtaW5TY3JpcHRzU2lkZWJhcldp ZHRoOiAyMDAsCiAgICAgc3R5bGVSdWxlc0V4cGFuZGVkU3RhdGU6IHt9LAogICAgIHNob3dNaXNz aW5nTG9jYWxpemVkU3RyaW5nczogZmFsc2UsCi0gICAgc2FtcGxpbmdDUFVQcm9maWxlcjogZmFs c2UsCiAgICAgc2hvd0NvbG9yTmlja25hbWVzOiB0cnVlLAorICAgIHNhdmVBc0F2YWlsYWJsZTog ZmFsc2UsCisgICAgdXNlTG93ZXJDYXNlTWVudVRpdGxlc09uV2luZG93czogZmFsc2UsCisgICAg aGFzRXh0ZW5zaW9uczogZmFsc2UsCisgICAgc2hhcmVkV29ya2Vyc0RlYnVnTm90ZTogdW5kZWZp bmVkLAorICAgIGxvY2FsaXplVUk6IHRydWUsCisgICAgYXBwbGljYXRpb25UaXRsZTogIldlYiBJ bnNwZWN0b3IgLSAlcyIKK30KKwordmFyIENhcGFiaWxpdGllcyA9IHsKKyAgICBzYW1wbGluZ0NQ VVByb2ZpbGVyOiBmYWxzZSwKICAgICBkZWJ1Z2dlckFsd2F5c0VuYWJsZWQ6IGZhbHNlLAogICAg IHByb2ZpbGVyQWx3YXlzRW5hYmxlZDogZmFsc2UsCiAgICAgbmF0aXZlSW5zdHJ1bWVudGF0aW9u RW5hYmxlZDogZmFsc2UsCi0gICAgdXNlRGF0YVVSTEZvclJlc291cmNlSW1hZ2VJY29uczogdHJ1 ZSwKICAgICBzaG93VGltaW5nVGFiOiBmYWxzZSwKICAgICBzaG93Q29va2llc1RhYjogZmFsc2Us Ci0gICAgZGVidWdNb2RlOiBmYWxzZSwKICAgICBoZWFwUHJvZmlsZXJQcmVzZW50OiBmYWxzZSwK ICAgICBkZXRhaWxlZEhlYXBQcm9maWxlczogZmFsc2UsCi0gICAgc2F2ZUFzQXZhaWxhYmxlOiBm YWxzZSwKLSAgICB1c2VMb3dlckNhc2VNZW51VGl0bGVzT25XaW5kb3dzOiBmYWxzZSwKICAgICBj YW5JbnNwZWN0V29ya2VyczogZmFsc2UsCiAgICAgY2FuQ2xlYXJDYWNoZUFuZENvb2tpZXM6IGZh bHNlLAogICAgIGNhbkRpc2FibGVDYWNoZTogZmFsc2UsCi0gICAgc2hvd05ldHdvcmtQYW5lbElu aXRpYXRvckNvbHVtbjogZmFsc2UsCi0gICAgaGF2ZUV4dGVuc2lvbnM6IGZhbHNlLAotICAgIHNo YXJlZFdvcmtlcnNEZWJ1Z05vdGU6IHVuZGVmaW5lZCwKLSAgICBsb2NhbGl6ZVVJOiB0cnVlLAot ICAgIGFwcGxpY2F0aW9uVGl0bGU6ICJXZWIgSW5zcGVjdG9yIC0gJXMiCisgICAgc2hvd05ldHdv cmtQYW5lbEluaXRpYXRvckNvbHVtbjogZmFsc2UKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwppbmRleCA2MjY4 YzI1ODI3NmNmNzNjZWMzNjgzZTVmMTU2OGRjZTU4MDAyZDZmLi45MjIxZjVmYjQ2YjJiY2Y3ZTc5 ODEzZThhYjhkMjlkNGJhOWE3ZTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKQEAgLTU5LDcgKzU5LDcgQEAgV2ViSW5z cGVjdG9yLlNldHRpbmdzU2NyZWVuID0gZnVuY3Rpb24oKQogICAgICAgICBdLCBXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MudGV4dEVkaXRvckluZGVudCkpOwogCiAgICAgcCA9IHRoaXMuX2FwcGVuZFNl Y3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXR3b3JrIiksIHRydWUpOwotICAgIGlmIChQ cmVmZXJlbmNlcy5jYW5EaXNhYmxlQ2FjaGUpCisgICAgaWYgKENhcGFiaWxpdGllcy5jYW5EaXNh YmxlQ2FjaGUpCiAgICAgICAgIHAuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0 aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzYWJsZSBjYWNoZSIpLCBXZWJJbnNwZWN0b3Iu c2V0dGluZ3MuY2FjaGVEaXNhYmxlZCkpOwogICAgIHAuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRl VXNlckFjdGlvbkNvbnRyb2woKSk7CiAKQEAgLTcxLDcgKzcxLDcgQEAgV2ViSW5zcGVjdG9yLlNl dHRpbmdzU2NyZWVuID0gZnVuY3Rpb24oKQogICAgIHAuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRl Q2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9nIFhNTEh0dHBSZXF1ZXN0 cyIpLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubW9uaXRvcmluZ1hIUkVuYWJsZWQpKTsKICAgICBw LmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0dGluZyhXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlByZXNlcnZlIGxvZyB1cG9uIG5hdmlnYXRpb24iKSwgV2ViSW5zcGVjdG9yLnNldHRp bmdzLnByZXNlcnZlQ29uc29sZUxvZykpOwogCi0gICAgaWYgKFByZWZlcmVuY2VzLmhhdmVFeHRl bnNpb25zKSB7CisgICAgaWYgKFByZWZlcmVuY2VzLmhhc0V4dGVuc2lvbnMpIHsKICAgICAgICAg dmFyIGhhbmRsZXJTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuSGFuZGxlclNlbGVjdG9yKFdl Ykluc3BlY3Rvci5vcGVuQW5jaG9yTG9jYXRpb25SZWdpc3RyeSk7CiAgICAgICAgIHAgPSB0aGlz Ll9hcHBlbmRTZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXh0ZW5zaW9ucyIpLCB0cnVl KTsKICAgICAgICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDdXN0b21TZXR0aW5nKFdlYklu c3BlY3Rvci5VSVN0cmluZygiT3BlbiBsaW5rcyBpbiIpLCBoYW5kbGVyU2VsZWN0b3IuZWxlbWVu dCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanMKaW5kZXggNDA2ZWYzZTRiYWRkMjk5NWY0ZGZjMTNhNmM1NmNjZGRh YjE5MTdmMS4uNzg5OTAzYzFlZGU4NGRjNzg2ODRkZDJmN2Q5N2E2YmYzZDljZmY5NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGVi YXJQYW5lLmpzCkBAIC04ODksOCArODg5LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGll c1NlY3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5lLCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAg IHRoaXMuX3NlbGVjdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsK ICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQudGV4dENvbnRlbnQgPSBzdHlsZVJ1bGUuc2VsZWN0 b3JUZXh0OwogICAgIHNlbGVjdG9yQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3NlbGVjdG9y RWxlbWVudCk7Ci0gICAgaWYgKFByZWZlcmVuY2VzLmRlYnVnTW9kZSkKLSAgICAgICAgdGhpcy5f c2VsZWN0b3JFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZGVidWdTaG93 U3R5bGUuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdmFyIG9wZW5CcmFjZSA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICBvcGVuQnJhY2UudGV4dENvbnRlbnQgPSAiIHsi OwpAQCAtMTEzNSwzOSArMTEzMyw2IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0 aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGl0ZW07CiAgICAgfSwKIAotICAgIF9k ZWJ1Z1Nob3dTdHlsZTogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICB2YXIgYm91bmRI YW5kbGVyOwotICAgICAgICBmdW5jdGlvbiByZW1vdmVTdHlsZUJveChlbGVtZW50LCBldmVudCkK LSAgICAgICAgewotICAgICAgICAgICAgaWYgKGV2ZW50LnRhcmdldCA9PT0gZWxlbWVudCkgewot ICAgICAgICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwotICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3Zl Q2hpbGQoZWxlbWVudCk7Ci0gICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWFp biIpLnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIGJvdW5kSGFuZGxlciwgdHJ1ZSk7 Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIWV2ZW50LnNoaWZ0S2V5KQotICAgICAgICAgICAg cmV0dXJuOwotCi0gICAgICAgIHZhciBjb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJz cGFuIik7Ci0gICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZChlbGVtZW50KTsKLSAgICAgICAg ZWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kID0gInllbGxvdyI7Ci0gICAgICAgIGVsZW1lbnQuc3R5 bGUuZGlzcGxheSA9ICJpbmxpbmUtYmxvY2siOwotICAgICAgICBjb250YWluZXIuc3R5bGUuY3Nz VGV4dCA9ICJ6LWluZGV4OiAyMDAwMDAwOyBwb3NpdGlvbjogYWJzb2x1dGU7IHRvcDogNTBweDsg bGVmdDogNTBweDsgd2hpdGUtc3BhY2U6IHByZTsgb3ZlcmZsb3c6IGF1dG87IGJhY2tncm91bmQ6 IHdoaXRlOyBmb250LWZhbWlseTogbW9ub3NwYWNlOyBmb250LXNpemU6IDEycHg7IGJvcmRlcjog MXB4IHNvbGlkIGJsYWNrOyBvcGFjaXR5OiAwLjg1OyAtd2Via2l0LXVzZXItc2VsZWN0OiB0ZXh0 OyBwYWRkaW5nOiAycHg7IjsKLSAgICAgICAgY29udGFpbmVyLnN0eWxlLndpZHRoID0gKGRvY3Vt ZW50LmJvZHkub2Zmc2V0V2lkdGggLSAxMDApICsgInB4IjsKLSAgICAgICAgY29udGFpbmVyLnN0 eWxlLmhlaWdodCA9IChkb2N1bWVudC5ib2R5Lm9mZnNldEhlaWdodCAtIDEwMCkgKyAicHgiOwot ICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGNvbnRhaW5lcik7Ci0gICAgICAgIGlm ICh0aGlzLnJ1bGUpCi0gICAgICAgICAgICBlbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5ydWxl LnNlbGVjdG9yVGV4dCArICIgeyIgKyAoKHRoaXMuc3R5bGVSdWxlLnN0eWxlLmNzc1RleHQgIT09 IHVuZGVmaW5lZCkgPyB0aGlzLnN0eWxlUnVsZS5zdHlsZS5jc3NUZXh0IDogIjxubyBjc3NUZXh0 PiIpICsgIn0iOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBlbGVtZW50LnRleHRDb250ZW50 ID0gdGhpcy5zdHlsZVJ1bGUuc3R5bGUuY3NzVGV4dDsKLSAgICAgICAgYm91bmRIYW5kbGVyID0g cmVtb3ZlU3R5bGVCb3guYmluZChudWxsLCBjb250YWluZXIpOwotICAgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgibWFpbiIpLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIGJvdW5k SGFuZGxlciwgdHJ1ZSk7Ci0gICAgfSwKLQogICAgIF9oYW5kbGVFbXB0eVNwYWNlRG91YmxlQ2xp Y2s6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKGV2ZW50LnRhcmdldC5oYXNT dHlsZUNsYXNzKCJoZWFkZXIiKSB8fCB0aGlzLmVsZW1lbnQuaGFzU3R5bGVDbGFzcygicmVhZC1v bmx5IikgfHwgZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIm1lZGlh IikpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKaW5kZXggYWI3MWQwMGM3YTU4MTAwMTg0Mjg4YmQwMzczODdjMzJmNjYyMWE0NS4uOWQ1Mjlk YzU2MjE5YTJkYzJkZjZjZGZiYTlhM2E3ODg2OTE3NmYwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTM1OCw3ICszNTgsNyBAQCBX ZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogICAgIHRoaXMuc2VhcmNoQ29u dHJvbGxlciA9IG5ldyBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlcigpOwogICAgIHRoaXMu YWR2YW5jZWRTZWFyY2hDb250cm9sbGVyID0gbmV3IFdlYkluc3BlY3Rvci5BZHZhbmNlZFNlYXJj aENvbnRyb2xsZXIoKTsKIAotICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRp b25FbmFibGVkKQorICAgIGlmIChDYXBhYmlsaXRpZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5h YmxlZCkKICAgICAgICAgdGhpcy5kb21CcmVha3BvaW50c1NpZGViYXJQYW5lID0gbmV3IFdlYklu c3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAKICAgICB0aGlzLl9jcmVhdGVQ YW5lbHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRv b2xzLmpzIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMKaW5kZXgg ZjYyNTJiZDRiYjNkNmRjNDJjOTk5OGQyYTY5Y2E0NjBjOGZmYzNlMi4uM2QzN2JlMGJlODBlZjU2 Y2Y0ODcxNGUzMjMyYTU0YzEwNmJjN2U2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvanMvRGV2VG9vbHMuanMKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv anMvRGV2VG9vbHMuanMKQEAgLTM1LDI1ICszNSwyNSBAQAogCiB7KGZ1bmN0aW9uICgpIHsKICAg ICBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID0gZmFsc2U7Ci0gICAgUHJlZmVyZW5jZXMu c2FtcGxpbmdDUFVQcm9maWxlciA9IHRydWU7Ci0gICAgUHJlZmVyZW5jZXMuaGVhcFByb2ZpbGVy UHJlc2VudCA9IHRydWU7Ci0gICAgUHJlZmVyZW5jZXMuZGV0YWlsZWRIZWFwUHJvZmlsZXMgPSB0 cnVlOwotICAgIFByZWZlcmVuY2VzLmRlYnVnZ2VyQWx3YXlzRW5hYmxlZCA9IHRydWU7Ci0gICAg UHJlZmVyZW5jZXMucHJvZmlsZXJBbHdheXNFbmFibGVkID0gdHJ1ZTsKLSAgICBQcmVmZXJlbmNl cy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkID0gdHJ1ZTsKLSAgICBQcmVmZXJlbmNlcy5m aWxlU3lzdGVtRW5hYmxlZCA9IGZhbHNlOwotICAgIFByZWZlcmVuY2VzLnNob3dUaW1pbmdUYWIg PSB0cnVlOwotICAgIFByZWZlcmVuY2VzLnNob3dDb29raWVzVGFiID0gdHJ1ZTsKICAgICBQcmVm ZXJlbmNlcy5zYXZlQXNBdmFpbGFibGUgPSB0cnVlOwogICAgIFByZWZlcmVuY2VzLnVzZUxvd2Vy Q2FzZU1lbnVUaXRsZXNPbldpbmRvd3MgPSB0cnVlOwotICAgIFByZWZlcmVuY2VzLmNhbkluc3Bl Y3RXb3JrZXJzID0gdHJ1ZTsKLSAgICBQcmVmZXJlbmNlcy5jYW5DbGVhckNhY2hlQW5kQ29va2ll cyA9IHRydWU7Ci0gICAgUHJlZmVyZW5jZXMuY2FuRGlzYWJsZUNhY2hlID0gdHJ1ZTsKLSAgICBQ cmVmZXJlbmNlcy5zaG93TmV0d29ya1BhbmVsSW5pdGlhdG9yQ29sdW1uID0gdHJ1ZTsKLSAgICBQ cmVmZXJlbmNlcy5oYXZlRXh0ZW5zaW9ucyA9IHRydWU7CisgICAgUHJlZmVyZW5jZXMuaGFzRXh0 ZW5zaW9ucyA9IHRydWU7CiAgICAgUHJlZmVyZW5jZXMuc2hhcmVkV29ya2Vyc0RlYnVnTm90ZSA9 ICJTaGFyZWQgd29ya2VycyBjYW4gYmUgaW5zcGVjdGVkIGluIHRoZSBUYXNrIE1hbmFnZXIiOwog ICAgIFByZWZlcmVuY2VzLmxvY2FsaXplVUkgPSBmYWxzZTsKICAgICBQcmVmZXJlbmNlcy5hcHBs aWNhdGlvblRpdGxlID0gIkRldmVsb3BlciBUb29scyAtICVzIjsKKworICAgIENhcGFiaWxpdGll cy5zYW1wbGluZ0NQVVByb2ZpbGVyID0gdHJ1ZTsKKyAgICBDYXBhYmlsaXRpZXMuaGVhcFByb2Zp bGVyUHJlc2VudCA9IHRydWU7CisgICAgQ2FwYWJpbGl0aWVzLmRldGFpbGVkSGVhcFByb2ZpbGVz ID0gdHJ1ZTsKKyAgICBDYXBhYmlsaXRpZXMuZGVidWdnZXJBbHdheXNFbmFibGVkID0gdHJ1ZTsK KyAgICBDYXBhYmlsaXRpZXMucHJvZmlsZXJBbHdheXNFbmFibGVkID0gdHJ1ZTsKKyAgICBDYXBh YmlsaXRpZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxlZCA9IHRydWU7CisgICAgQ2FwYWJp bGl0aWVzLnNob3dUaW1pbmdUYWIgPSB0cnVlOworICAgIENhcGFiaWxpdGllcy5zaG93Q29va2ll c1RhYiA9IHRydWU7CisgICAgQ2FwYWJpbGl0aWVzLmNhbkluc3BlY3RXb3JrZXJzID0gdHJ1ZTsK KyAgICBDYXBhYmlsaXRpZXMuY2FuQ2xlYXJDYWNoZUFuZENvb2tpZXMgPSB0cnVlOworICAgIENh cGFiaWxpdGllcy5jYW5EaXNhYmxlQ2FjaGUgPSB0cnVlOworICAgIENhcGFiaWxpdGllcy5zaG93 TmV0d29ya1BhbmVsSW5pdGlhdG9yQ29sdW1uID0gdHJ1ZTsKIH0pKCk7fQogCiAvKiogUGVuZGlu ZyBXZWJLaXQgdXBzdHJlYW0gYnkgYXBhdmxvdikuIEZpeGVzIGlmcmFtZSB2cyBkcmFnIHByb2Js ZW0uICovCg==