120884 2013-09-06 12:45:19 -0700 Web Inspector: Lint JavaScript and CSS for minor issues 2013-09-06 22:33:54 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 925780 0 joepeck 2013-09-06 12:45:19 -0700 I ran JSHint / CSSLint and caught some minor issues. 925782 1 webkit-bug-importer 2013-09-06 12:45:51 -0700 <rdar://problem/14931854> 925783 2 210780 joepeck 2013-09-06 12:46:24 -0700 Created attachment 210780 [PATCH] Proposed Fix 926102 3 commit-queue 2013-09-06 22:32:56 -0700 The commit-queue encountered the following flaky tests while processing attachment 210780: http/tests/inspector/inspect-element.html bug 78869 (author: pfeldman@chromium.org) fast/regions/autoheight-singleregion-breakbeforealways.html bug 120924 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-secondregion-breakoutside.html bug 120925 (author: mihnea@adobe.com) fast/regions/autoheight-singleregion-breakafteralways-maxheight.html bug 120926 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-lastregion-overflowauto-breaksignored.html bug 120927 (author: mihnea@adobe.com) fast/regions/autowidth-normalflow-minmaxwidth.html bug 120928 (author: mihnea@adobe.com) fast/regions/autoheight-singleregion-overflowauto.html bug 120929 (author: mihnea@adobe.com) fast/regions/autoheight-allregions.html bug 120930 (author: mihnea@adobe.com) fast/regions/autoheight-definedheight-changenotdetected.html bug 120931 (author: mihnea@adobe.com) fast/regions/autoheight-vertical-rl.html bug 120932 (author: mihnea@adobe.com) fast/regions/autowidth-normalflow-minwidth.html bug 120933 (author: mihnea@adobe.com) fast/regions/autoheight-singleregion-breakafteralways.html bug 120934 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-secondregion.html bug 120935 (author: mihnea@adobe.com) fast/regions/autoheight-singleregion-breakaftermargin.html bug 120936 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-horizontal-bt.html bug 120937 (author: mihnea@adobe.com) fast/regions/autoheight-middleregion.html bug 120938 (author: mihnea@adobe.com) fast/regions/autoheight-singleregion-multiplebreaks.html bug 120939 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-singleregion-overflowauto-breaksignored.html bug 120940 (author: mihnea@adobe.com) fast/regions/autoheight-breakbeforealways.html bug 120941 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-firstregion-breakalways.html bug 120942 (author: mihnea@adobe.com) fast/regions/autoheight-allregions-nobreaks.html bug 120943 (author: mihnea@adobe.com) fast/regions/autoheight-dynamic-update.html bug 120944 (author: achicu@adobe.com) fast/regions/autoheight-breakafteralways-maxheight.html bug 120945 (authors: mihnea@adobe.com and stavila@adobe.com) fast/regions/autoheight-lastregion-overflowauto.html bug 120946 (author: mihnea@adobe.com) fast/regions/autoheight-maxheight-region.html bug 120947 (author: mihnea@adobe.com) fast/regions/autoheight-vertical-lr.html bug 120948 (author: mihnea@adobe.com) fast/inline/layout-after-inserting-nested-br.html bug 120755 (author: robert@webkit.org) fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html bug 120755 (author: betravis@adobe.com) fast/shapes/shape-inside/shape-inside-overflow.html bug 120949 (authors: betravis@adobe.com and zoltan@webkit.org) animations/cross-fade-background-image.html bug 120950 (authors: krit@webkit.org and thorton@apple.com) The commit-queue is continuing to process your patch. 926126 4 210780 commit-queue 2013-09-06 22:33:52 -0700 Comment on attachment 210780 [PATCH] Proposed Fix Clearing flags on attachment: 210780 Committed r155241: <http://trac.webkit.org/changeset/155241> 926128 5 commit-queue 2013-09-06 22:33:54 -0700 All reviewed patches have been landed. Closing bug. 210780 2013-09-06 12:46:24 -0700 2013-09-06 22:33:51 -0700 [PATCH] Proposed Fix lint.patch text/plain 34037 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA0MjZlMDkuLjkxOWY5ZGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEzLTA5LTA2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGludCBK YXZhU2NyaXB0IGFuZCBDU1MgZm9yIG1pbm9yIGlzc3VlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSlMsIGNhdWdodCBhIGJ1bmNoIG9mIG1pc3Npbmcg c2VtaWNvbG9ucyBidXQgYXQgbGVhc3Qgb25lIHBvc3NpYmxlCisgICAgICAgIGlzc3VlIHdpdGgg ZHVwbGljYXRlIG9iamVjdCBsaXRlcmFsIGtleXMgaW4gQ1NTS2V5d29yZENvbXBsZXRpb25zLgor CisgICAgICAgIENTUywgY2F1c2Ugc29tZSBkdXBsaWNhdGUgcHJvcGVydGllcywgYW4gaW52YWxp ZCBwcm9wZXJ0eSB2YWx1ZSwKKyAgICAgICAgYW5kIHNvbWUgIjBweCIgPT4gIjAiIGNsZWFudXAu CisKKzIwMTMtMDktMDYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBEb3dubG9hZCBBcmNoaXZlIGJ1dHRvbiBpbmNvcnJlY3Rs eSBzdHlsZWQgd2hlbiBkaXNhYmxlZCBhbmQgdHJlZSBlbGVtZW50IGlzIG5vdC1zZWxlY3RlZAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwODY2CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0FwcGxpY2F0 aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcuanMKaW5kZXggZjE0ZjBl ZC4uZjE3MmIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcu anMKQEAgLTE4OCw3ICsxODgsNyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1l Q29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIGZ1bmN0aW9uIGxv Y2FsZUNvbXBhcmUoZmllbGQsIHJlc291cmNlMSwgcmVzb3VyY2UyKQogICAgICAgICB7Ci0gICAg ICAgICAgICAgcmV0dXJuIHNvcnREaXJlY3Rpb24gKiAocmVzb3VyY2UxW2ZpZWxkXSArICIiKS5s b2NhbGVDb21wYXJlKHJlc291cmNlMltmaWVsZF0gKyAiIikKKyAgICAgICAgICAgICByZXR1cm4g c29ydERpcmVjdGlvbiAqIChyZXNvdXJjZTFbZmllbGRdICsgIiIpLmxvY2FsZUNvbXBhcmUocmVz b3VyY2UyW2ZpZWxkXSArICIiKTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBjb21wYXJhdG9y OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQm90dG9t VXBQcm9maWxlRGF0YUdyaWRUcmVlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQm90dG9tVXBQcm9maWxlRGF0YUdyaWRUcmVlLmpzCmluZGV4IGE4MzM0NWUuLjg5OWY1 MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0JvdHRv bVVwUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Cb3R0b21VcFByb2ZpbGVEYXRhR3JpZFRyZWUuanMKQEAgLTExMyw3ICsxMTMs NyBAQCBXZWJJbnNwZWN0b3IuQm90dG9tVXBQcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gSWYgbm90LCBhZGQg aXQgYXMgYSB0cnVlIGFuY2VzdG9yLgogICAgICAgICAgICAgICAgIC8vIEluIGhlYXZ5IG1vZGUs IHdlIHRha2Ugb3VyIHZpc3VhbCBpZGVudGl0eSBmcm9tIGFuY2VzdG9yIG5vZGUuLi4KLSAgICAg ICAgICAgICAgICB2YXIgY2hpbGQgPSBuZXcgV2ViSW5zcGVjdG9yLkJvdHRvbVVwUHJvZmlsZURh dGFHcmlkTm9kZSh0aGlzLnByb2ZpbGVWaWV3LCBhbmNlc3RvciwgdGhpcy50cmVlKTsKKyAgICAg ICAgICAgICAgICBjaGlsZCA9IG5ldyBXZWJJbnNwZWN0b3IuQm90dG9tVXBQcm9maWxlRGF0YUdy aWROb2RlKHRoaXMucHJvZmlsZVZpZXcsIGFuY2VzdG9yLCB0aGlzLnRyZWUpOwogCiAgICAgICAg ICAgICAgICAgaWYgKGFuY2VzdG9yICE9PSBmb2N1c05vZGUpIHsKICAgICAgICAgICAgICAgICAg ICAgLy8gYnV0IHRoZSBhY3R1YWwgc3RhdGlzdGljcyBmcm9tIHRoZSAicm9vdCIgbm9kZSAoYm90 dG9tIG9mIHRoZSBjYWxsc3RhY2spLgpAQCAtMTc0LDcgKzE3NCw3IEBAIFdlYkluc3BlY3Rvci5C b3R0b21VcFByb2ZpbGVEYXRhR3JpZFRyZWUgPSBmdW5jdGlvbigvKlByb2ZpbGVWaWV3Ki8gYVBy b2ZpbGVWaWV3CiAgICAgICAgICAgICAgICAgdmFyIHRvdGFsVGltZUFjY291bnRlZEZvciA9IGZh bHNlOwogCiAgICAgICAgICAgICAgICAgaWYgKCF2aXNpdGVkTm9kZXMpIHsKLSAgICAgICAgICAg ICAgICAgICAgdmlzaXRlZE5vZGVzID0ge30KKyAgICAgICAgICAgICAgICAgICAgdmlzaXRlZE5v ZGVzID0ge307CiAgICAgICAgICAgICAgICAgICAgIHZpc2l0ZWRQcm9maWxlTm9kZXNGb3JDYWxs VUlEW3Byb2ZpbGVOb2RlLmNhbGxVSURdID0gdmlzaXRlZE5vZGVzOwogICAgICAgICAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFRoZSB0b3RhbCB0aW1lIGZvciB0aGlz IG5vZGUgaGFzIGFscmVhZHkgYmVlbiBhY2NvdW50ZWQgZm9yIGlmZiBvbmUgb2YgaXQncyBwYXJl bnRzIGhhcyBhbHJlYWR5IGJlZW4gdmlzaXRlZC4KQEAgLTE5NSw3ICsxOTUsNyBAQCBXZWJJbnNw ZWN0b3IuQm90dG9tVXBQcm9maWxlRGF0YUdyaWRUcmVlID0gZnVuY3Rpb24oLypQcm9maWxlVmll dyovIGFQcm9maWxlVmlldwogCiAgICAgICAgICAgICB2YXIgY2hpbGRyZW4gPSBwcm9maWxlTm9k ZS5jaGlsZHJlbjsKICAgICAgICAgICAgIGlmIChjaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAg ICAgICAgICBwcm9maWxlTm9kZUdyb3Vwcy5wdXNoKHBhcmVudFByb2ZpbGVOb2Rlcy5jb25jYXQo W3Byb2ZpbGVOb2RlXSkpCisgICAgICAgICAgICAgICAgcHJvZmlsZU5vZGVHcm91cHMucHVzaChw YXJlbnRQcm9maWxlTm9kZXMuY29uY2F0KFtwcm9maWxlTm9kZV0pKTsKICAgICAgICAgICAgICAg ICBwcm9maWxlTm9kZUdyb3Vwcy5wdXNoKGNoaWxkcmVuKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQm94 TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmNzcwppbmRleCA3YTg4NTg4Li45ZmY0 ZjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Cb3hN b2RlbERldGFpbHNTZWN0aW9uUm93LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmNzcwpAQCAtOTgsNyArOTgsNiBA QAogICAgIHBhZGRpbmc6IDNweDsKICAgICBtYXJnaW46IDNweDsKICAgICBtaW4td2lkdGg6IDgw cHg7Ci0gICAgdGV4dC1hbGlnbjogY2VudGVyOwogICAgIG92ZXJmbG93OiB2aXNpYmxlOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CcmVha3Bv aW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQnJlYWtwb2ludC5q cwppbmRleCAxZWZmNmM1Li45ZTYzOGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CcmVha3BvaW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0JyZWFrcG9pbnQuanMKQEAgLTQzMCw3ICs0MzAsNyBAQCBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgX3BvcG92ZXJBY3Rpb25zSW5zZXJ0 QnJlYWtwb2ludEFjdGlvblZpZXc6IGZ1bmN0aW9uKGJyZWFrcG9pbnRBY3Rpb25WaWV3LCBpbmRl eCkKICAgICB7CiAgICAgICAgIGlmIChpbmRleCA9PT0gLTEpCi0gICAgICAgICAgICB0aGlzLl9h Y3Rpb25zQ29udGFpbmVyLmFwcGVuZENoaWxkKGJyZWFrcG9pbnRBY3Rpb25WaWV3LmVsZW1lbnQp CisgICAgICAgICAgICB0aGlzLl9hY3Rpb25zQ29udGFpbmVyLmFwcGVuZENoaWxkKGJyZWFrcG9p bnRBY3Rpb25WaWV3LmVsZW1lbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIHZhciBu ZXh0RWxlbWVudCA9IHRoaXMuX2FjdGlvbnNDb250YWluZXIuY2hpbGRyZW5baW5kZXggKyAxXSB8 fCBudWxsOwogICAgICAgICAgICAgdGhpcy5fYWN0aW9uc0NvbnRhaW5lci5pbnNlcnRCZWZvcmUo YnJlYWtwb2ludEFjdGlvblZpZXcuZWxlbWVudCwgbmV4dEVsZW1lbnQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTQ29sb3JQaWNrZXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9DU1NDb2xvclBpY2tlci5qcwppbmRl eCA1NjU1OTViLi4zNDcyMWE5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ1NTQ29sb3JQaWNrZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ1NTQ29sb3JQaWNrZXIuanMKQEAgLTEwNCw3ICsxMDQsNyBAQCBXZWJJ bnNwZWN0b3IuQ1NTQ29sb3JQaWNrZXIgPSBmdW5jdGlvbigpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgICAgICBpZiAob25zdGFydCkKLSAgICAgICAgICAgICAgICBvbnN0YXJ0 KGVsZW1lbnQsIGUpCisgICAgICAgICAgICAgICAgb25zdGFydChlbGVtZW50LCBlKTsKIAogICAg ICAgICAgICAgZHJhZ2dpbmcgPSB0cnVlOwogICAgICAgICAgICAgbWF4SGVpZ2h0ID0gZWxlbWVu dC5jbGllbnRIZWlnaHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMKaW5kZXggNWI3MDU4Mi4uMGUw NGFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NT S2V5d29yZENvbXBsZXRpb25zLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcwpAQCAtMjksNyArMjksNyBAQAogICogT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zID0ge30K K1dlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMgPSB7fTsKIAogV2ViSW5zcGVjdG9y LkNTU0tleXdvcmRDb21wbGV0aW9ucy5mb3JQcm9wZXJ0eSA9IGZ1bmN0aW9uKHByb3BlcnR5TmFt ZSkKIHsKQEAgLTE2Miw5ICsxNjIsNiBAQCBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRp b25zLl9wcm9wZXJ0eUtleXdvcmRNYXAgPSB7CiAgICAgIm1hcmdpbi10b3AtY29sbGFwc2UiOiBb CiAgICAgICAgICJjb2xsYXBzZSIsICJzZXBhcmF0ZSIsICJkaXNjYXJkIgogICAgIF0sCi0gICAg Im1heC1oZWlnaHQiOiBbCi0gICAgICAgICJub25lIgotICAgIF0sCiAgICAgIi13ZWJraXQtYm94 LW9yaWVudCI6IFsKICAgICAgICAgImhvcml6b250YWwiLCAidmVydGljYWwiLCAiaW5saW5lLWF4 aXMiLCAiYmxvY2stYXhpcyIKICAgICBdLApAQCAtNTE0LDkgKzUxMSw2IEBAIFdlYkluc3BlY3Rv ci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuX3Byb3BlcnR5S2V5d29yZE1hcCA9IHsKICAgICAiLXdl YmtpdC1mb250LXNtb290aGluZyI6IFsKICAgICAgICAgIm5vbmUiLCAiYXV0byIsICJhbnRpYWxp YXNlZCIsICJzdWJwaXhlbC1hbnRpYWxpYXNlZCIKICAgICBdLAotICAgICItd2Via2l0LWh5cGhl bnMiOiBbCi0gICAgICAgICJub25lIiwgIm1hbnVhbCIsICJhdXRvIgotICAgIF0sCiAgICAgImJv cmRlciI6IFsKICAgICAgICAgIm5vbmUiLCAiaGlkZGVuIiwgImluc2V0IiwgImdyb292ZSIsICJy aWRnZSIsICJvdXRzZXQiLCAiZG90dGVkIiwgImRhc2hlZCIsICJzb2xpZCIsICJkb3VibGUiCiAg ICAgXSwKQEAgLTkwNSw0ICs4OTksNCBAQCBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRp b25zLl9wcm9wZXJ0eUtleXdvcmRNYXAgPSB7CiAgICAgIi13ZWJraXQtb3ZlcmZsb3ctc2Nyb2xs aW5nIjogWwogICAgICAgICAiYXV0byIsICJ0b3VjaCIKICAgICBdCi19Cit9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTU3R5bGVEZXRhaWxzU2lk ZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKaW5kZXggMWU4YTA2MS4uZGY2MmMyZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTU3R5bGVEZXRhaWxz U2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCkBAIC0yMywxMCArMjMsNiBAQAogICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLS5zaWRlYmFyID4gLnBhbmVs LmRldGFpbHMuY3NzLXN0eWxlIHsKLSAgICBvdmVyZmxvdzogbm9uZTsKLX0KLQogLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgPiAubmF2aWdhdGlvbi1iYXIgewogICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKICAgICB0b3A6IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yQ29tcGxldGlvbkNvbnRyb2xsZXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yQ29tcGxldGlvbkNv bnRyb2xsZXIuanMKaW5kZXggYmQ3NDE5YS4uYzI3ZTE2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvckNvbXBsZXRpb25Db250cm9sbGVy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvZGVNaXJyb3JD b21wbGV0aW9uQ29udHJvbGxlci5qcwpAQCAtMTY5LDcgKzE2OSw3IEBAIFdlYkluc3BlY3Rvci5D b2RlTWlycm9yQ29tcGxldGlvbkNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9mb3JjZWQgPSBmYWxzZTsKIAogICAgICAgICBpZiAodGhpcy5fY29tcGxldGlvbkRlbGF5VGlt ZW91dCkgewotICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMuX2NvbXBsZXRpb25EZWxheVRp bWVvdXQpCisgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fY29tcGxldGlvbkRlbGF5VGlt ZW91dCk7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY29tcGxldGlvbkRlbGF5VGltZW91dDsK ICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db2xvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbG9y LmpzCmluZGV4IDA4NmRjMWIuLjdkY2NhMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbG9yLmpzCkBAIC00NTMsNyArNDUzLDcgQEAgV2ViSW5zcGVjdG9yLkNv bG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfcmdiYVRvSFNMQTogZnVuY3Rpb24ocmdi YSwgYWxwaGEpCiAgICAgewotICAgICAgICB2YXIgaHNsID0gdGhpcy5fcmdiVG9IU0wocmdiYSkK KyAgICAgICAgdmFyIGhzbCA9IHRoaXMuX3JnYlRvSFNMKHJnYmEpOwogICAgICAgICBoc2wucHVz aChhbHBoYSk7CiAgICAgICAgIHJldHVybiBoc2w7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnNvbGVNZXNzYWdlLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZU1lc3NhZ2UuanMKaW5kZXggNDA3 ODYzMy4uNzE4ODY1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29uc29sZU1lc3NhZ2UuanMKQEAgLTkyLDcgKzkyLDcgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UgPSB7CiAgICAgTmV0d29yazogIm5ldHdvcmsi LAogICAgIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsCiAgICAgT3RoZXI6ICJvdGhlciIKLX0K K307CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZSA9IHsKICAgICBM b2c6ICJsb2ciLApAQCAtMTA0LDcgKzEwNCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZSA9IHsKICAgICBFbmRHcm91cDogImVuZEdyb3VwIiwKICAgICBBc3NlcnQ6 ICJhc3NlcnQiLAogICAgIFJlc3VsdDogInJlc3VsdCIKLX0KK307CiAKIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwgPSB7CiAgICAgVGlwOiAidGlwIiwKQEAgLTExMiw0 ICsxMTIsNCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsID0gewog ICAgIFdhcm5pbmc6ICJ3YXJuaW5nIiwKICAgICBFcnJvcjogImVycm9yIiwKICAgICBEZWJ1Zzog ImRlYnVnIgotfQorfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnNvbGVNZXNzYWdlSW1wbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnNvbGVNZXNzYWdlSW1wbC5qcwppbmRleCA0ODQ3ZjcxLi4yOTg2NTU2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlTWVz c2FnZUltcGwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u c29sZU1lc3NhZ2VJbXBsLmpzCkBAIC0zNDksNyArMzQ5LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAKICAgICBfZm9ybWF0V2l0aFN1YnN0aXR1dGlv blN0cmluZzogZnVuY3Rpb24ocGFyYW1ldGVycywgZm9ybWF0dGVkUmVzdWx0KQogICAgIHsKLSAg ICAgICAgdmFyIGZvcm1hdHRlcnMgPSB7fQorICAgICAgICB2YXIgZm9ybWF0dGVycyA9IHt9Owog CiAgICAgICAgIGZ1bmN0aW9uIHBhcmFtZXRlckZvcm1hdHRlcihmb3JjZSwgb2JqKQogICAgICAg ICB7CkBAIC02ODgsOCArNjg4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgaWYgKGZyYW1lLnVybCkKICAgICAgICAgICAg ICAgICAgICAgY2xpcGJvYXJkU3RyaW5nICs9ICIgKCIgKyBXZWJJbnNwZWN0b3IuZGlzcGxheU5h bWVGb3JVUkwoZnJhbWUudXJsKSArICIsIGxpbmUgIiArIGZyYW1lLmxpbmVOdW1iZXIgKyAiKSI7 CiAgICAgICAgICAgICB9KTsKLSAgICAgICAgfQotICAgICAgICBlbHNlIHsKKyAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgIHZhciByZXBlYXRTdHJpbmcgPSB0aGlzLnJlcGVhdENvdW50ID4g MSA/ICJ4IiArIHRoaXMucmVwZWF0Q291bnQgOiAiIjsKIAogICAgICAgICAgICAgdmFyIHVybExp bmUgPSAiIjsKQEAgLTcxMCw3ICs3MDksNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJ bXBsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICByZXR1cm4gY2xpcGJvYXJkU3RyaW5nOwogICAg IH0KLQogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udGV4dE1lbnUuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250ZXh0TWVudS5qcwppbmRleCAy NmVhY2M5OS4uZTA0YjM3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udGV4dE1lbnUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udGV4dE1lbnUuanMKQEAgLTI0MSw3ICsyNDEsOCBAQCBXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnUucHJvdG90eXBlID0gewogLyoqCiAgKiBAaW50ZXJmYWNlCiAgKi8KLVdlYklu c3BlY3Rvci5Db250ZXh0TWVudS5Qcm92aWRlciA9IGZ1bmN0aW9uKCkgeyAKK1dlYkluc3BlY3Rv ci5Db250ZXh0TWVudS5Qcm92aWRlciA9IGZ1bmN0aW9uKCkKK3sKIH0KIAogV2ViSW5zcGVjdG9y LkNvbnRleHRNZW51LlByb3ZpZGVyLnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTU5vZGVTdHlsZXMuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01Ob2RlU3R5bGVzLmpzCmluZGV4IGVhMDQ5MDIu LmQ1YzU4MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0RPTU5vZGVTdHlsZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRE9NTm9kZVN0eWxlcy5qcwpAQCAtMTQzLDcgKzE0Myw3IEBAIFdlYkluc3BlY3Rvci5ET01O b2RlU3R5bGVzLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBpZiAoaW5oZXJpdGVkUnVs ZUluZm8uaW5saW5lU3R5bGUgfHwgaW5oZXJpdGVkUnVsZUluZm8ubWF0Y2hlZFJ1bGVzLmxlbmd0 aCkKICAgICAgICAgICAgICAgICAgICAgdGhpcy5faW5oZXJpdGVkUnVsZXMucHVzaChpbmhlcml0 ZWRSdWxlSW5mbyk7CiAKLSAgICAgICAgICAgICAgICBjdXJyZW50Tm9kZSA9IGN1cnJlbnROb2Rl LnBhcmVudE5vZGUKKyAgICAgICAgICAgICAgICBjdXJyZW50Tm9kZSA9IGN1cnJlbnROb2RlLnBh cmVudE5vZGU7CiAgICAgICAgICAgICAgICAgKytpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01UcmVl RWxlbWVudFBhdGhDb21wb25lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9ET01UcmVlRWxlbWVudFBhdGhDb21wb25lbnQuanMKaW5kZXggODMwYWY5Yy4uMzBkNTFk YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRE9NVHJl ZUVsZW1lbnRQYXRoQ29tcG9uZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0RPTVRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcwpAQCAtMzgsNyArMzgsNyBA QCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50ID0gZnVuY3Rpb24oZG9t VHJlZUVsZW1lbnQsIHJlcHJlc2VudGVkTwogICAgIGNhc2UgTm9kZS5URVhUX05PREU6CiAgICAg ICAgIGNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudFBhdGhDb21wb25lbnQu RE9NVGV4dE5vZGVJY29uU3R5bGVDbGFzc05hbWU7CiAgICAgICAgIHRpdGxlID0gIlwiIiArIG5v ZGUubm9kZVZhbHVlKCkudHJpbUVuZCgzMikgKyAiXCIiOwotICAgICAgICBicmVhaworICAgICAg ICBicmVhazsKIAogICAgIGNhc2UgTm9kZS5DT01NRU5UX05PREU6CiAgICAgICAgIGNsYXNzTmFt ZSA9IFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudFBhdGhDb21wb25lbnQuRE9NQ29tbWVudElj b25TdHlsZUNsYXNzTmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0RPTVRyZWVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvRE9NVHJlZU1hbmFnZXIuanMKaW5kZXggNzU0NDgyMC4uODE4MjRkYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRE9NVHJlZU1hbmFnZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRE9NVHJlZU1hbmFn ZXIuanMKQEAgLTUzLDcgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLkV2ZW50 ID0gewogICAgIENoaWxkTm9kZUNvdW50VXBkYXRlZDogImRvbS10cmVlLW1hbmFnZXItY2hpbGQt bm9kZS1jb3VudC11cGRhdGVkIiwKICAgICBET01Ob2RlV2FzSW5zcGVjdGVkOiAiZG9tLXRyZWUt bWFuYWdlci1kb20tbm9kZS13YXMtaW5zcGVjdGVkIiwKICAgICBJbnNwZWN0TW9kZVN0YXRlQ2hh bmdlZDogImRvbS10cmVlLW1hbmFnZXItaW5zcGVjdC1tb2RlLXN0YXRlLWNoYW5nZWQiCi19Cit9 OwogCiBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgIC8qKgpA QCAtMTIyLDEyICsxMjIsMTEgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIGlmICghY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIHJldHVybiBmdW5jdGlvbihlcnJvciwgcmVzdWx0KQotICAgICAgICB7CisgICAg ICAgIHJldHVybiBmdW5jdGlvbihlcnJvciwgcmVzdWx0KSB7CiAgICAgICAgICAgICBpZiAoZXJy b3IpCiAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiRXJyb3IgZHVyaW5nIERPTUFnZW50 IG9wZXJhdGlvbjogIiArIGVycm9yKTsKICAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yID8gbnVs bCA6IHJlc3VsdCk7Ci0gICAgICAgIH0KKyAgICAgICAgfTsKICAgICB9LAogCiAgICAgLyoqCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5j c3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5jc3MKaW5k ZXggZjJkZTVhMS4uYmEwMjhhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGF0YUdyaWQuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0RhdGFHcmlkLmNzcwpAQCAtNzAsNyArNzAsNyBAQAogCiAgICAgYmFja2dyb3Vu ZC1pbWFnZTogLXdlYmtpdC1saW5lYXItZ3JhZGllbnQodG9wLCByZ2JhKDAsIDAsIDAsIDAuMiks IHJnYmEoMCwgMCwgMCwgMC4yKSksIC13ZWJraXQtbGluZWFyLWdyYWRpZW50KHRvcCwgdHJhbnNw YXJlbnQsIHRyYW5zcGFyZW50KSwKICAgICAgICAgLXdlYmtpdC1saW5lYXItZ3JhZGllbnQodG9w LCB3aGl0ZSwgd2hpdGUgMjUlLCByZ2IoMjQ0LCAyNDQsIDI0NCkgNTAlLCByZ2IoMjM2LCAyMzYs IDIzNikgNTAlLCByZ2IoMjM3LCAyMzcsIDIzNykpOwotICAgIGJhY2tncm91bmQtc2l6ZTogMXB4 IDExcHgsIDBweCAwcHgsIDEwMCUgMTAwJTsKKyAgICBiYWNrZ3JvdW5kLXNpemU6IDFweCAxMXB4 LCAwIDAsIDEwMCUgMTAwJTsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBsZWZ0IDJweCwgcmln aHQgMnB4LCBjZW50ZXI7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGF0YUdyaWQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5qcwppbmRleCAw NjdjODFmLi5lNDIzY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9EYXRhR3JpZC5qcwpAQCAtMTkyLDcgKzE5Miw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5FdmVudCA9IHsKICAgICBEaWRMYXlvdXQ6ICJkYXRhZ3JpZC1kaWQtbGF5b3V0IiwKICAgICBT b3J0Q2hhbmdlZDogImRhdGFncmlkLXNvcnQtY2hhbmdlZCIsCiAgICAgU2VsZWN0ZWROb2RlQ2hh bmdlZDogImRhdGFncmlkLXNlbGVjdGVkLW5vZGUtY2hhbmdlZCIKLX0KK307CiAKIC8qKgogICog QHBhcmFtIHtBcnJheS48c3RyaW5nPn0gY29sdW1uTmFtZXMKQEAgLTEyODYsNyArMTI4Niw3IEBA IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QgPSB7CiAgICAgTmVhcmVzdDogIm5l YXJlc3QiLAogICAgIEZpcnN0OiAiZmlyc3QiLAogICAgIExhc3Q6ICJsYXN0IgotfQorfTsKIAog V2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu T2JqZWN0LnByb3RvdHlwZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGF0YWJhc2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0RhdGFiYXNlQ29udGVudFZpZXcuanMKaW5kZXggM2JlNjc2ZC4uN2Jl NDk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGF0 YWJhc2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9EYXRhYmFzZUNvbnRlbnRWaWV3LmpzCkBAIC00NSw3ICs0NSw3IEBAIFdlYkluc3BlY3Rv ci5EYXRhYmFzZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiAKIFdl Ykluc3BlY3Rvci5EYXRhYmFzZUNvbnRlbnRWaWV3LkV2ZW50ID0gewogICAgIFNjaGVtYVVwZGF0 ZWQ6ICJTY2hlbWFVcGRhdGVkIgotfQorfTsKIAogV2ViSW5zcGVjdG9yLkRhdGFiYXNlQ29udGVu dFZpZXcucHJvdG90eXBlID0gewogICAgIGNvbnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuRGF0YWJh c2VDb250ZW50VmlldywKQEAgLTE1Miw3ICsxNTIsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgX2FwcGVuZEVycm9yUXVlcnlSZXN1bHQ6IGZ1 bmN0aW9uKHF1ZXJ5LCBlcnJvclRleHQpCiAgICAgewogICAgICAgICB2YXIgcmVzdWx0RWxlbWVu dCA9IHRoaXMuX2FwcGVuZFF1ZXJ5UmVzdWx0KHF1ZXJ5KTsKLSAgICAgICAgcmVzdWx0RWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJlcnJvciIpCisgICAgICAgIHJlc3VsdEVsZW1lbnQuY2xhc3NMaXN0 LmFkZCgiZXJyb3IiKTsKICAgICAgICAgcmVzdWx0RWxlbWVudC50ZXh0Q29udGVudCA9IGVycm9y VGV4dDsKIAogICAgICAgICB0aGlzLl9wcm9tcHRFbGVtZW50LnNjcm9sbEludG9WaWV3KGZhbHNl KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVn Z2VyU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggYWJkMjg0OS4uODhiOGQzNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVidWdnZXJTaWRlYmFyUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVidWdnZXJT aWRlYmFyUGFuZWwuanMKQEAgLTQ5OSw3ICs0OTksNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJT aWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgYUxvY2F0aW9uID0gYS5icmVh a3BvaW50LnNvdXJjZUNvZGVMb2NhdGlvbjsKICAgICAgICAgdmFyIGJMb2NhdGlvbiA9IGIuYnJl YWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb247CiAKLSAgICAgICAgdmFyIGNvbXBhcmlzb25SZXN1 bHQgPSBhTG9jYXRpb24uZGlzcGxheUxpbmVOdW1iZXIgLSBiTG9jYXRpb24uZGlzcGxheUxpbmVO dW1iZXIKKyAgICAgICAgdmFyIGNvbXBhcmlzb25SZXN1bHQgPSBhTG9jYXRpb24uZGlzcGxheUxp bmVOdW1iZXIgLSBiTG9jYXRpb24uZGlzcGxheUxpbmVOdW1iZXI7CiAgICAgICAgIGlmIChjb21w YXJpc29uUmVzdWx0ICE9PSAwKQogICAgICAgICAgICAgcmV0dXJuIGNvbXBhcmlzb25SZXN1bHQ7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0VkaXRp bmdTdXBwb3J0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRWRpdGlu Z1N1cHBvcnQuanMKaW5kZXggYzJmZTQ3MS4uMTE5Mjk5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRWRpdGluZ1N1cHBvcnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRWRpdGluZ1N1cHBvcnQuanMKQEAgLTgzLDcg KzgzLDcgQEAgV2ViSW5zcGVjdG9yLmlzRXZlbnRUYXJnZXRBbkVkaXRhYmxlRmllbGQgPSBmdW5j dGlvbihldmVudCkKIFdlYkluc3BlY3Rvci5FZGl0aW5nQ29uZmlnID0gZnVuY3Rpb24oY29tbWl0 SGFuZGxlciwgY2FuY2VsSGFuZGxlciwgY29udGV4dCkKIHsKICAgICB0aGlzLmNvbW1pdEhhbmRs ZXIgPSBjb21taXRIYW5kbGVyOwotICAgIHRoaXMuY2FuY2VsSGFuZGxlciA9IGNhbmNlbEhhbmRs ZXIKKyAgICB0aGlzLmNhbmNlbEhhbmRsZXIgPSBjYW5jZWxIYW5kbGVyOwogICAgIHRoaXMuY29u dGV4dCA9IGNvbnRleHQ7CiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmNzcwpp bmRleCBkMTQzODJkLi4yYzc0YTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Gb250UmVzb3VyY2VDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRm9udFJlc291cmNlQ29udGVudFZpZXcuY3NzCkBA IC0zMCwxMCArMzAsNiBAQAogCiAgICAgb3ZlcmZsb3cteDogaGlkZGVuOwogICAgIG92ZXJmbG93 LXk6IGF1dG87Ci0KLSAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7Ci0KLSAgICAtd2Via2l0LWp1 c3RpZnktY29udGVudDogY2VudGVyOwogfQogCiAuY29udGVudC12aWV3LnJlc291cmNlLmZvbnQg LnByZXZpZXcgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRm9ybWF0dGVyQ29udGVudEJ1aWxkZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5qcwppbmRleCA0NTk2ODgwLi43MmQ5 YTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Gb3Jt YXR0ZXJDb250ZW50QnVpbGRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5qcwpAQCAtMjAyLDcgKzIwMiw3IEBAIEZv cm1hdHRlckNvbnRlbnRCdWlsZGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGluZGVudCA9 IHRoaXMuX2luZGVudDsKICAgICAgICAgZG8gewogICAgICAgICAgICAgaWYgKGluZGVudCA+PSBt YXhDYWNoZUluZGVudCkKLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmQodGhpcy5faW5kZW50 Q2FjaGVbbWF4Q2FjaGVJbmRlbnRdKQorICAgICAgICAgICAgICAgIHRoaXMuX2FwcGVuZCh0aGlz Ll9pbmRlbnRDYWNoZVttYXhDYWNoZUluZGVudF0pOwogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIHRoaXMuX2FwcGVuZCh0aGlzLl9pbmRlbnRDYWNoZVtpbmRlbnRdKTsKICAgICAg ICAgICAgIGluZGVudCAtPSBtYXhDYWNoZUluZGVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Zvcm1hdHRlclNvdXJjZU1hcC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Zvcm1hdHRlclNvdXJjZU1hcC5qcwppbmRleCBi NThkMjJhLi5kMmI2MTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Gb3JtYXR0ZXJTb3VyY2VNYXAuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvRm9ybWF0dGVyU291cmNlTWFwLmpzCkBAIC03MSw3ICs3MSw3IEBAIFdl Ykluc3BlY3Rvci5Gb3JtYXR0ZXJTb3VyY2VNYXAucHJvdG90eXBlID0gewogICAgICAgICAgICAg dmFyIGNvbHVtbk51bWJlciA9IHBvc2l0aW9uOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2 YXIgY29sdW1uTnVtYmVyID0gcG9zaXRpb24gLSBsaW5lRW5kaW5nc1tsaW5lTnVtYmVyIC0gMV0g LSAxOwotICAgICAgICByZXR1cm4ge2xpbmVOdW1iZXI6bGluZU51bWJlciwgY29sdW1uTnVtYmVy OmNvbHVtbk51bWJlcn07CisgICAgICAgIHJldHVybiB7bGluZU51bWJlcjogbGluZU51bWJlciwg Y29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXJ9OwogICAgIH0sCiAKICAgICBfY29udmVydFBvc2l0 aW9uOiBmdW5jdGlvbihwb3NpdGlvbnMxLCBwb3NpdGlvbnMyLCBwb3NpdGlvbkluUG9zaXRpb24x KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRnJhbWVS ZXNvdXJjZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9G cmFtZVJlc291cmNlTWFuYWdlci5qcwppbmRleCA1NDM0NjEwLi42YTg2NDg0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9GcmFtZVJlc291cmNlTWFuYWdl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9GcmFtZVJlc291 cmNlTWFuYWdlci5qcwpAQCAtOTYsNyArOTYsNyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJj ZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gTWFrZSBhIG5ldyByZXNvdXJj ZSAod2hpY2ggd2lsbCBtYWtlIHRoZSBmcmFtZSkuIE1hcmsgd2lsbCBtYXJrIGl0IGFzIGxvYWRl ZCBhdCB0aGUgZW5kIHRvbyBzaW5jZSB3ZQogICAgICAgICAgICAgLy8gZG9uJ3QgZXhwZWN0IGFu eSBtb3JlIGV2ZW50cyBhYm91dCB0aGUgbG9hZCBmaW5pc2hpbmcgZm9yIHRoZXNlIGZyYW1lcy4K ICAgICAgICAgICAgIHZhciBmcmFtZVJlc291cmNlID0gdGhpcy5fYWRkTmV3UmVzb3VyY2VUb0Zy YW1lKG51bGwsIGZyYW1lUGF5bG9hZC5pZCwgZnJhbWVQYXlsb2FkLmxvYWRlcklkLCBmcmFtZVBh eWxvYWQudXJsLCBudWxsLCBudWxsLCBudWxsLCBudWxsLCBudWxsLCBmcmFtZVBheWxvYWQubmFt ZSwgZnJhbWVQYXlsb2FkLnNlY3VyaXR5T3JpZ2luKTsKLSAgICAgICAgICAgIHZhciBmcmFtZSA9 IGZyYW1lUmVzb3VyY2UucGFyZW50RnJhbWU7CisgICAgICAgICAgICBmcmFtZSA9IGZyYW1lUmVz b3VyY2UucGFyZW50RnJhbWU7CiAgICAgICAgICAgICBmcmFtZVdhc0xvYWRlZEluc3RhbnRseSA9 IHRydWU7CiAKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZyYW1lKTsKQEAgLTEyNiw3ICsx MjYsNyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgY29uc29sZS5hc3NlcnQocGFyZW50RnJhbWUpOwogCiAgICAgICAgICAgICBp ZiAoZnJhbWUgPT09IHRoaXMuX21haW5GcmFtZSkKLSAgICAgICAgICAgICAgICB0aGlzLl9tYWlu RnJhbWUgPSBudWxsCisgICAgICAgICAgICAgICAgdGhpcy5fbWFpbkZyYW1lID0gbnVsbDsKIAog ICAgICAgICAgICAgaWYgKGZyYW1lLnBhcmVudEZyYW1lICE9PSBwYXJlbnRGcmFtZSkKICAgICAg ICAgICAgICAgICBwYXJlbnRGcmFtZS5hZGRDaGlsZEZyYW1lKGZyYW1lKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0dlbmVyYWxUcmVlRWxlbWVudC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0dlbmVyYWxUcmVlRWxlbWVu dC5qcwppbmRleCAzNzE4OTFmLi4xMWMxYmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9HZW5lcmFsVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvR2VuZXJhbFRyZWVFbGVtZW50LmpzCkBAIC0yNzks MTMgKzI3OSwxMyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKIAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgY2FsbEZpcnN0QW5jZXN0b3JGdW5jdGlvbjog ZnVuY3Rpb24oZnVuY3Rpb25OYW1lLCBhcmd1bWVudHMpCisgICAgY2FsbEZpcnN0QW5jZXN0b3JG dW5jdGlvbjogZnVuY3Rpb24oZnVuY3Rpb25OYW1lLCBhcmdzKQogICAgIHsKICAgICAgICAgLy8g Q2FsbCB0aGUgZmlyc3QgYW5jZXN0b3IgdGhhdCBpbXBsZW1lbnRzIGEgZnVuY3Rpb24gbmFtZWQg ZnVuY3Rpb25OYW1lIChpZiBhbnkpLgogICAgICAgICB2YXIgY3VycmVudE5vZGUgPSB0aGlzLnBh cmVudDsKICAgICAgICAgd2hpbGUgKGN1cnJlbnROb2RlKSB7CiAgICAgICAgICAgICBpZiAodHlw ZW9mIGN1cnJlbnROb2RlW2Z1bmN0aW9uTmFtZV0gPT09ICJmdW5jdGlvbiIpIHsKLSAgICAgICAg ICAgICAgICBjdXJyZW50Tm9kZVtmdW5jdGlvbk5hbWVdLmFwcGx5KGN1cnJlbnROb2RlLCBhcmd1 bWVudHMpOworICAgICAgICAgICAgICAgIGN1cnJlbnROb2RlW2Z1bmN0aW9uTmFtZV0uYXBwbHko Y3VycmVudE5vZGUsIGFyZ3MpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbnNw ZWN0b3JCYWNrZW5kLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5z cGVjdG9yQmFja2VuZC5qcwppbmRleCBmMmJmMTdmLi4zZjFiODcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbnNwZWN0b3JCYWNrZW5kLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0luc3BlY3RvckJhY2tlbmQuanMK QEAgLTI4NCw3ICsyODQsNyBAQCBJbnNwZWN0b3JCYWNrZW5kQ2xhc3MucHJvdG90eXBlID0gewog CiAgICAgICAgIGlmICghdGhpcy5fcGVuZGluZ1Jlc3BvbnNlc0NvdW50KSB7CiAgICAgICAgICAg ICB2YXIgc2NyaXB0cyA9IHRoaXMuX3NjcmlwdHM7Ci0gICAgICAgICAgICB0aGlzLl9zY3JpcHRz ID0gW10KKyAgICAgICAgICAgIHRoaXMuX3NjcmlwdHMgPSBbXTsKICAgICAgICAgICAgIGZvciAo dmFyIGlkID0gMDsgaWQgPCBzY3JpcHRzLmxlbmd0aDsgKytpZCkKICAgICAgICAgICAgICAgICAg c2NyaXB0c1tpZF0uY2FsbCh0aGlzKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSmF2YVNjcmlwdFByb2ZpbGVWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSmF2YVNjcmlwdFByb2ZpbGVWaWV3Lmpz CmluZGV4IDllNGQ0MTQuLjQ5NDViMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0phdmFTY3JpcHRQcm9maWxlVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9KYXZhU2NyaXB0UHJvZmlsZVZpZXcuanMKQEAgLTM5 Myw3ICszOTMsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFByb2ZpbGVWaWV3LnByb3RvdHlw ZSA9IHsKIAogICAgIF9leGNsdWRlQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAg ICAgICB2YXIgc2VsZWN0ZWROb2RlID0gdGhpcy5kYXRhR3JpZC5zZWxlY3RlZE5vZGUKKyAgICAg ICAgdmFyIHNlbGVjdGVkTm9kZSA9IHRoaXMuZGF0YUdyaWQuc2VsZWN0ZWROb2RlOwogCiAgICAg ICAgIGlmICghc2VsZWN0ZWROb2RlKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5ZXJUcmVlU2lkZWJhclBhbmVs LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xheWVyVHJlZVNpZGVi YXJQYW5lbC5jc3MKaW5kZXggZTI2MDkxNi4uNjM5NzAzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5ZXJUcmVlU2lkZWJhclBhbmVsLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9MYXllclRyZWVTaWRlYmFyUGFu ZWwuY3NzCkBAIC04MCw3ICs4MCw3IEBACiAKIC5sYXllci10cmVlLnBhbmVsIC5kYXRhLWdyaWQg ewogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKLSAgICB0b3A6IDBweDsKKyAgICB0b3A6IDA7CiAg ICAgd2lkdGg6IDEwMCU7CiAgICAgaGVpZ2h0OiAxMDAlOwogICAgIC8qIFR1cm4gb2ZmIHRoZSBk ZWZhdWx0IGJvcmRlcnMsIHdlIHdhbnQgdG8gc25hcCB0byBlZGdlcy4gKi8KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmNzcwpp bmRleCAzMWEzNmE1Li5iNmVkN2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Mb2dDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTG9nQ29udGVudFZpZXcuY3NzCkBAIC0xMDksNyArMTA5LDcgQEAK ICAgICBib3JkZXItcmFkaXVzOiA3cHg7CiAKICAgICBmbG9hdDogbGVmdDsKLSAgICBtYXJnaW4t dG9wOiAwcHg7CisgICAgbWFyZ2luLXRvcDogMDsKICAgICBtYXJnaW4tbGVmdDogMnB4OwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Mb2dDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRl bnRWaWV3LmpzCmluZGV4IDE5Y2MzZmUuLjVkYWVjZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0yNzQsNyAr Mjc0LDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgICAgIGlmIChpbmRleCA+IDApCi0gICAgICAg ICAgICAgICAgZGF0YSArPSAiXG4iCisgICAgICAgICAgICAgICAgZGF0YSArPSAiXG4iOwogICAg ICAgICAgICAgZGF0YSArPSBtZXNzYWdlT2JqZWN0LnRvQ2xpcGJvYXJkU3RyaW5nKGlzUHJlZml4 T3B0aW9uYWwpOwogICAgICAgICB9KTsKIApAQCAtODU2LDcgKzg1Niw3IEBAIFdlYkluc3BlY3Rv ci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9tYXRjaGlu Z1NlYXJjaEVsZW1lbnRzID0gW107CiAgICAgICAgICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5j bGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5TZWFyY2hJblByb2dy ZXNzU3R5bGVDbGFzc05hbWUpOwogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9OworICAg ICAgICB9CiAKICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuTG9nQ29udGVudFZpZXcuU2VhcmNoSW5Qcm9ncmVzc1N0eWxlQ2xhc3NOYW1lKTsK IApAQCAtOTA0LDcgKzkwNCw3IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB9KTsKIAogICAgICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVk U2VhcmNoTWF0Y2ggJiYgIXRoaXMuX3NlbGVjdGVkU2VhcmNoTWF0aElzVmFsaWQgJiYgdGhpcy5f c2VsZWN0ZWRTZWFyY2hNYXRjaC5tZXNzYWdlID09PSBtZXNzYWdlKSB7Ci0gICAgICAgICAgICAg ICAgdGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRoSXNWYWxpZCA9IHRoaXMuX3Jhbmdlc092ZXJsYXAo dGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRjaC5yYW5nZSwgcmFuZ2UpCisgICAgICAgICAgICAgICAg dGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRoSXNWYWxpZCA9IHRoaXMuX3Jhbmdlc092ZXJsYXAodGhp cy5fc2VsZWN0ZWRTZWFyY2hNYXRjaC5yYW5nZSwgcmFuZ2UpOwogICAgICAgICAgICAgICAgIGlm ICh0aGlzLl9zZWxlY3RlZFNlYXJjaE1hdGhJc1ZhbGlkKSB7CiAgICAgICAgICAgICAgICAgICAg IGRlbGV0ZSB0aGlzLl9zZWxlY3RlZFNlYXJjaE1hdGNoOwogICAgICAgICAgICAgICAgICAgICB0 aGlzLl9oaWdobGlnaHRTZWFyY2hNYXRjaEF0SW5kZXgodGhpcy5fc2VhcmNoTWF0Y2hlcy5sZW5n dGggLSAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L05hdmlnYXRpb25CYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9O YXZpZ2F0aW9uQmFyLmpzCmluZGV4IGMxM2M5YTguLmMxMmE3ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05hdmlnYXRpb25CYXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlvbkJhci5qcwpAQCAtNDI2 LDcgKzQyNiw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyLnByb3RvdHlwZSA9IHsKIAog ICAgIF9jYWxjdWxhdGVNaW5pbXVtV2lkdGg6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZh ciB3YXNDb2xsYXBzZWQgPSB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucyhXZWJJbnNw ZWN0b3IuTmF2aWdhdGlvbkJhci5Db2xsYXBzZWRTdHlsZUNsYXNzTmFtZSkKKyAgICAgICAgdmFy IHdhc0NvbGxhcHNlZCA9IHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmNvbnRhaW5zKFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uQmFyLkNvbGxhcHNlZFN0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICAv LyBBZGQgdGhlIGNvbGxhcHNlZCBzdHlsZSBjbGFzcyB0byBjYWxjdWxhdGUgdGhlIHdpZHRoIG9m IHRoZSBpdGVtcyB3aGVuIHRoZXkgYXJlIGNvbGxhcHNlZC4KICAgICAgICAgaWYgKCF3YXNDb2xs YXBzZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCBjNzEyZWI1Li5iODNiMjUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZpZ2F0aW9u U2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTM0NCw3ICszNDQsNyBAQCBXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBzY3Jv bGxUb3AgPSB0aGlzLl9jb250ZW50RWxlbWVudC5zY3JvbGxUb3A7CiAKICAgICAgICAgdmFyIHRv cENvdmVyYWdlID0gTWF0aC5taW4oc2Nyb2xsVG9wLCBlZGdlVGhyZXNob2xkKTsKLSAgICAgICAg dmFyIGJvdHRvbUNvdmVyYWdlID0gTWF0aC5tYXgoMCwgKG9mZnNldEhlaWdodCArIHNjcm9sbFRv cCkgLSAoc2Nyb2xsSGVpZ2h0IC0gZWRnZVRocmVzaG9sZCkpCisgICAgICAgIHZhciBib3R0b21D b3ZlcmFnZSA9IE1hdGgubWF4KDAsIChvZmZzZXRIZWlnaHQgKyBzY3JvbGxUb3ApIC0gKHNjcm9s bEhlaWdodCAtIGVkZ2VUaHJlc2hvbGQpKTsKIAogICAgICAgICBpZiAodGhpcy5fdG9wT3ZlcmZs b3dTaGFkb3dFbGVtZW50KQogICAgICAgICAgICAgdGhpcy5fdG9wT3ZlcmZsb3dTaGFkb3dFbGVt ZW50LnN0eWxlLm9wYWNpdHkgPSAodG9wQ292ZXJhZ2UgLyBlZGdlVGhyZXNob2xkKS50b0ZpeGVk KDEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmV0 d29ya1RpbWVsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05l dHdvcmtUaW1lbGluZS5jc3MKaW5kZXggNTEwOGZhNi4uOWQ0OTc2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmV0d29ya1RpbWVsaW5lLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3b3JrVGltZWxpbmUuY3Nz CkBAIC03NSw3ICs3NSw3IEBACiAgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC43KTsKICAgICB0 ZXh0LXNoYWRvdzogbm9uZTsKICAgICB0ZXh0LWFsaWduOiByaWdodDsKLSAgICBtYXJnaW4tcmln aHQ6IDBweDsKKyAgICBtYXJnaW4tcmlnaHQ6IDA7CiB9CiAKIC5uZXR3b3JrLWdyYXBoLWxhYmVs LmJlZm9yZTo6YWZ0ZXIgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvT2JqZWN0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv T2JqZWN0LmpzCmluZGV4IGE2OGRhOTYuLjJjM2FiMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL09iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9PYmplY3QuanMKQEAgLTI2LDcgKzI2LDggQEAKIC8qKgogICog QGNvbnN0cnVjdG9yCiAgKi8KLVdlYkluc3BlY3Rvci5PYmplY3QgPSBmdW5jdGlvbigpIHsKK1dl Ykluc3BlY3Rvci5PYmplY3QgPSBmdW5jdGlvbigpCit7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvZmlsZURhdGFHcmlkVHJlZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb2ZpbGVEYXRhR3JpZFRy ZWUuanMKaW5kZXggOThmNzFjMS4uZmU0YTQxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzCkBAIC0z NzksNyArMzc5LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZFRyZWUucHJvcGVydHlD b21wYXJhdG9yID0gZnVuY3Rpb24oLypTdHJpbmcqLyBwcm9wZXIKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIDE7CiAKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH07CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjb21wYXJhdG9y ID0gZnVuY3Rpb24obGhzLCByaHMpCiAgICAgICAgICAgICB7CkBAIC0zOTAsNyArMzkwLDcgQEAg V2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZFRyZWUucHJvcGVydHlDb21wYXJhdG9yID0gZnVu Y3Rpb24oLypTdHJpbmcqLyBwcm9wZXIKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDE7CiAK ICAgICAgICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH07 CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLnByb3BlcnR5Q29tcGFyYXRvcnNbKGlzQXNjZW5k aW5nID8gMSA6IDApXVtwcm9wZXJ0eV0gPSBjb21wYXJhdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TZWFyY2hSZXN1bHRUcmVlRWxl bWVudC5qcwppbmRleCBlYzI0NWQ1Li5kNjY4ZDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TZWFyY2hSZXN1bHRUcmVlRWxlbWVu dC5qcwpAQCAtNzksNyArNzksNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoUmVzdWx0VHJlZUVsZW1l bnQudHJ1bmNhdGVBbmRIaWdobGlnaHRUaXRsZSA9IGZ1bmN0aW9uKHRpdGxlLAogICAgIGhpZ2hs aWdodGVkVGl0bGUuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobW9kaWZpZWRU aXRsZS5zdWJzdHJpbmcoMCwgc2VhcmNoVGVybUluZGV4KSkpOwogCiAgICAgdmFyIGhpZ2hsaWdo dFNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgaGlnaGxpZ2h0U3Bh bi5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuSGlnaGxp Z2h0ZWRTdHlsZUNsYXNzTmFtZQorICAgIGhpZ2hsaWdodFNwYW4uY2xhc3NOYW1lID0gV2ViSW5z cGVjdG9yLlNlYXJjaFJlc3VsdFRyZWVFbGVtZW50LkhpZ2hsaWdodGVkU3R5bGVDbGFzc05hbWU7 CiAgICAgaGlnaGxpZ2h0U3Bhbi5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSht b2RpZmllZFRpdGxlLnN1YnN0cmluZyhzZWFyY2hUZXJtSW5kZXgsIHNlYXJjaFRlcm1JbmRleCAr IHNlYXJjaFRlcm0ubGVuZ3RoKSkpOwogICAgIGhpZ2hsaWdodGVkVGl0bGUuYXBwZW5kQ2hpbGQo aGlnaGxpZ2h0U3Bhbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvU291cmNlQ29kZVRleHRFZGl0b3IuanMKaW5kZXggNjZhZDkxNi4uODdm MzExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU291 cmNlQ29kZVRleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvU291cmNlQ29kZVRleHRFZGl0b3IuanMKQEAgLTIxOSw3ICsyMTksNyBAQCBXZWJJbnNw ZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgIF9hZGRCcmVha3Bv aW50V2l0aEVkaXRvckxpbmVJbmZvOiBmdW5jdGlvbihicmVha3BvaW50LCBsaW5lSW5mbykKICAg ICB7CiAgICAgICAgIGlmICghdGhpcy5fYnJlYWtwb2ludE1hcFtsaW5lSW5mby5saW5lTnVtYmVy XSkKLSAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYXBbbGluZUluZm8ubGluZU51bWJlcl0g PSB7fQorICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludE1hcFtsaW5lSW5mby5saW5lTnVtYmVy XSA9IHt9OwogCiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYXBbbGluZUluZm8ubGluZU51bWJl cl1bbGluZUluZm8uY29sdW1uTnVtYmVyXSA9IGJyZWFrcG9pbnQ7CiAgICAgfSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RleHRFZGl0b3IuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXh0RWRpdG9yLmpzCmluZGV4IDI5 ZTIyNDUuLjJiNGVkNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1RleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVGV4dEVkaXRvci5qcwpAQCAtNjQsNyArNjQsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVk aXRvciA9IGZ1bmN0aW9uKGVsZW1lbnQsIG1pbWVUeXBlLCBkZWxlZ2F0ZSkKICAgICB0aGlzLl9z ZWFyY2hSZXN1bHRzID0gW107CiAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0g LTE7CiAKLSAgICB0aGlzLl9mb3JtYXR0ZWQgPSBmYWxzZQorICAgIHRoaXMuX2Zvcm1hdHRlZCA9 IGZhbHNlOwogICAgIHRoaXMuX2Zvcm1hdHRlclNvdXJjZU1hcCA9IG51bGw7CiAKICAgICB0aGlz Ll9kZWxlZ2F0ZSA9IGRlbGVnYXRlIHx8IG51bGw7CkBAIC0xMDIzLDcgKzEwMjMsNyBAQCBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChsaW5lTnVtYmVy ICE9PSB1bmRlZmluZWQpIHsKICAgICAgICAgICAgIC8vIFdlIGhhdmUgYSBuZXcgbGluZSB0aGF0 IHdpbGwgbm93IHNob3cgdGhlIGRyYWdnZWQgYnJlYWtwb2ludC4KICAgICAgICAgICAgIHZhciBu ZXdDb2x1bW5CcmVha3BvaW50cyA9IHt9OwotICAgICAgICAgICAgdmFyIGNvbHVtbk51bWJlciA9 IChsaW5lTnVtYmVyID09PSB0aGlzLl9saW5lTnVtYmVyV2l0aE1vdXNlZERvd25CcmVha3BvaW50 ID8gdGhpcy5fY29sdW1uTnVtYmVyV2l0aERyYWdnZWRCcmVha3BvaW50IDogMCkKKyAgICAgICAg ICAgIHZhciBjb2x1bW5OdW1iZXIgPSAobGluZU51bWJlciA9PT0gdGhpcy5fbGluZU51bWJlcldp dGhNb3VzZWREb3duQnJlYWtwb2ludCA/IHRoaXMuX2NvbHVtbk51bWJlcldpdGhEcmFnZ2VkQnJl YWtwb2ludCA6IDApOwogICAgICAgICAgICAgbmV3Q29sdW1uQnJlYWtwb2ludHNbY29sdW1uTnVt YmVyXSA9IHRoaXMuX2RyYWdnaW5nQnJlYWtwb2ludEluZm87CiAgICAgICAgICAgICB0aGlzLl9w cmV2aW91c0NvbHVtbkJyZWFrcG9pbnRJbmZvID0gdGhpcy5fYWxsQ29sdW1uQnJlYWtwb2ludElu Zm9Gb3JMaW5lKGxpbmVOdW1iZXIpOwogICAgICAgICAgICAgdGhpcy5fc2V0Q29sdW1uQnJlYWtw b2ludEluZm9Gb3JMaW5lKGxpbmVOdW1iZXIsIG5ld0NvbHVtbkJyZWFrcG9pbnRzKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lRGVjb3Jh dGlvbnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZURl Y29yYXRpb25zLmpzCmluZGV4IDNhMDQzOWUuLjA1OGNmNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lRGVjb3JhdGlvbnMuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVEZWNvcmF0aW9ucy5q cwpAQCAtMzUsNyArMzUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVEZWNvcmF0aW9ucyA9IGZ1 bmN0aW9uKCkKICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2hlYWRlckVsZW1l bnQpOwogCiAgICAgdGhpcy5fbWFya2Vyc0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICB0aGlzLl9tYXJrZXJzRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0 b3IuVGltZWxpbmVEZWNvcmF0aW9ucy5FdmVudE1hcmtlcnNFbGVtZW50U3R5bGVDbGFzc05hbWUK KyAgICB0aGlzLl9tYXJrZXJzRWxlbWVudC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxp bmVEZWNvcmF0aW9ucy5FdmVudE1hcmtlcnNFbGVtZW50U3R5bGVDbGFzc05hbWU7CiAgICAgdGhp cy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9tYXJrZXJzRWxlbWVudCk7CiAKICAgICB0aGlz LmNsZWFyKCk7CkBAIC02Miw3ICs2Miw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURlY29yYXRp b25zLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBoZWFkZXJFbGVtZW50KCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLl9oZWFkZXJFbGVtZW50CisgICAgICAgIHJldHVybiB0aGlzLl9oZWFk ZXJFbGVtZW50OwogICAgIH0sCiAKICAgICBjbGVhcjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVFdmVudE1hcmtlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lRXZlbnRNYXJr ZXIuanMKaW5kZXggMTZiYWFlZi4uMzhmMTI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVFdmVudE1hcmtlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZUV2ZW50TWFya2VyLmpzCkBAIC0z OCw3ICszOCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50TWFya2VyLlR5cGUgPSB7CiAg ICAgTG9hZEV2ZW50OiAibG9hZC1ldmVudCIsCiAgICAgRE9NQ29udGVudEV2ZW50OiAiZG9tLWNv bnRlbnQtZXZlbnQiLAogICAgIFRpbWVTdGFtcDogInRpbWVzdGFtcCIKLX0KK307CiAKIFdlYklu c3BlY3Rvci5UaW1lbGluZUV2ZW50TWFya2VyLnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3Rv cjogV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZXNDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lc0NvbnRlbnRWaWV3Lmpz CmluZGV4IDdhMjdhM2EuLjc5MDVhNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lc0NvbnRlbnRWaWV3LmpzCkBAIC0yNjQs NyArMjY0LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lc0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9 IHsKIAogICAgICAgICAvLyBSZXN0b3JlIHNjcm9sbCBwb3NpdG9uIG5vdyB0aGF0IHdlIGFyZSBi YWNrIGluIHRoZSBkb2N1bWVudC4KICAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnREYXRhR3JpZC5f c2F2ZWRJc1Njcm9sbGVkVG9MYXN0Um93KQotICAgICAgICAgICAgdGhpcy5fY3VycmVudERhdGFH cmlkLnNjcm9sbFRvTGFzdFJvdygpCisgICAgICAgICAgICB0aGlzLl9jdXJyZW50RGF0YUdyaWQu c2Nyb2xsVG9MYXN0Um93KCk7CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuX2N1cnJlbnREYXRhR3Jp ZC5fc2F2ZWRTY3JvbGxUb3ApCiAgICAgICAgICAgICB0aGlzLl9jdXJyZW50RGF0YUdyaWQuc2Ny b2xsQ29udGFpbmVyLnNjcm9sbFRvcCA9IHRoaXMuX2N1cnJlbnREYXRhR3JpZC5fc2F2ZWRTY3Jv bGxUb3A7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1V0aWxp dGllcy5qcwppbmRleCAzMjJlMjYwLi4xM2QzNTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVXRpbGl0aWVzLmpzCkBAIC03MjMsNyArNzIzLDcgQEAgT2Jq ZWN0LmRlZmluZVByb3BlcnR5KFN0cmluZy5wcm90b3R5cGUsICJoYXNoIiwKICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCB0aGlzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgY3Vy cmVudENoYXJhY3RlciA9IHRoaXNbaV0uY2hhckNvZGVBdCgwKTsKICAgICAgICAgICAgIGlmIChw ZW5kaW5nQ2hhcmFjdGVyID09PSBudWxsKSB7Ci0gICAgICAgICAgICAgICAgcGVuZGluZ0NoYXJh Y3RlciA9IGN1cnJlbnRDaGFyYWN0ZXIKKyAgICAgICAgICAgICAgICBwZW5kaW5nQ2hhcmFjdGVy ID0gY3VycmVudENoYXJhY3RlcjsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgIH0KIAo=