136658 2014-09-08 20:17:00 -0700 Web Inspector: Fix ESLint eqeqeq warnings 2014-09-09 10:34:46 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck jonowells timothy webkit-bug-importer oldest_to_newest 1034039 0 joepeck 2014-09-08 20:17:00 -0700 ESLint catches a number of "==" => "===" and "!=" => "!===" cases. However ESLint is failing on files with ES6 syntax (for..of) so I caught a few more by just searching around. 1034040 1 237832 joepeck 2014-09-08 20:17:47 -0700 Created attachment 237832 [PATCH] Proposed Fix 1034133 2 237832 commit-queue 2014-09-09 10:34:44 -0700 Comment on attachment 237832 [PATCH] Proposed Fix Clearing flags on attachment: 237832 Committed r173433: <http://trac.webkit.org/changeset/173433> 1034134 3 commit-queue 2014-09-09 10:34:46 -0700 All reviewed patches have been landed. Closing bug. 237832 2014-09-08 20:17:47 -0700 2014-09-09 10:34:44 -0700 [PATCH] Proposed Fix eqeqeq.patch text/plain 19273 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg4NWQyNjkuLmY3NmViODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ5IEBACiAyMDE0LTA5LTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IEVT TGludCBlcWVxZXEgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNjY1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUubXljYWxs YmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLnNl YXJjaFJlc3VsdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQnJlYWtwb2ludC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5jbGVhckFjdGlv bnMpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NVHJlZS5wcm90b3R5cGUuX3JlcXVlc3RSb290RE9NTm9kZS5yb290 T2JqZWN0QXZhaWxhYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlLnByb3RvdHlw ZS5fcmVxdWVzdFJvb3RET01Ob2RlLnJvb3RET01Ob2RlQXZhaWxhYmxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01UcmVlLnByb3RvdHlwZS5fcmVxdWVzdFJvb3RET01Ob2RlLmRpc3BhdGNo Q2FsbGJhY2tzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlLnByb3RvdHlwZS5fcmVx dWVzdFJvb3RET01Ob2RlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Qcm9iZVNl dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldC5wcm90b3R5cGUucmVtb3ZlUHJv YmUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0RGF0YVRhYmxlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGF0YVRhYmxlLnByb3RvdHlwZS5hZGRT YW1wbGVGb3JQcm9iZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9y QWRkaXRpb25zLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFn ZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250 ZW50Vmlldy5wcm90b3R5cGUuX2ZpbHRlckNvb2tpZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LmNvb2tpZU1hdGNoZXNSZXNvdXJjZVVSTCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NU3Rv cmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fZWRpdGluZ0NhbGxiYWNrKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVu dC5wcm90b3R5cGUuX3VwZGF0ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01U cmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZ1RhcmdldCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl90ZXh0Tm9kZUVkaXRpbmdDb21taXR0 ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9yZXNpemVyRHJhZ2dpbmcpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EYXRhYmFzZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcXVlcnlFcnJv cik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvblNpbXBsZVJv dy5qczoKKyAgICAgICAgKC52YWx1ZUVsZW1lbnRDbGlja2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9TbGlkZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2xpZGVyLnByb3RvdHlwZS5n ZXQgX21heFgpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanM6 CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90b3R5cGUuZXhwYW5kKToKKworMjAxNC0wOS0wOCAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEZpeCBFU0xpbnQgbm8tdHJhaWxpbmctc3BhY2VzIHdhcm5pbmdzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY2NTcKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJl ZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9ET01UcmVlTWFuYWdlci5qcwppbmRleCA1M2FhMmMxLi41ODk3Nzk3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVl TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcwpAQCAtMzIxLDcgKzMyMSw3IEBAIFdlYkluc3BlY3Rv ci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGNhbGxi YWNrKG51bGwpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgIGlmIChub2RlSWRzLmxlbmd0aCAhPSAxKQorICAgICAgICAgICAg ICAgIGlmIChub2RlSWRzLmxlbmd0aCAhPT0gMSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu OwogCiAgICAgICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5faWRUb0RPTU5vZGVbbm9kZUlkc1sw XV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0JyZWFrcG9pbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvQnJlYWtwb2ludC5qcwppbmRleCBmZjQ4MTFmLi5jNDgyMTdlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQnJlYWtwb2ludC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQnJlYWtwb2lu dC5qcwpAQCAtMzUxLDcgKzM1MSw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlw ZSA9IHsKICAgICAgICAgaWYgKCF0eXBlKQogICAgICAgICAgICAgdGhpcy5fYWN0aW9ucyA9IFtd OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9hY3Rpb25zID0gdGhpcy5fYWN0aW9u cy5maWx0ZXIoZnVuY3Rpb24oYWN0aW9uKSB7IGFjdGlvbi50eXBlICE9IHR5cGU7IH0pOworICAg ICAgICAgICAgdGhpcy5fYWN0aW9ucyA9IHRoaXMuX2FjdGlvbnMuZmlsdGVyKGZ1bmN0aW9uKGFj dGlvbikgeyBhY3Rpb24udHlwZSAhPT0gdHlwZTsgfSk7CiAKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuQWN0aW9uc0Rp ZENoYW5nZSk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9ET01UcmVlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKaW5kZXggOWUyYTZkNS4uY2U2Mzg0MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRy ZWUuanMKQEAgLTE0MCw3ICsxNDAsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZS5wcm90b3R5cGUg PSB7CiAgICAgICAgIGZ1bmN0aW9uIHJvb3RPYmplY3RBdmFpbGFibGUoZXJyb3IsIHJlc3VsdCkK ICAgICAgICAgewogICAgICAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHdlIGhhdmUgYmVlbiBp bnZhbGlkYXRlZCAoaWYgdGhlIGNhbGxiYWNrcyB3ZXJlIGNsZWFyZWQpLgotICAgICAgICAgICAg aWYgKCF0aGlzLl9wZW5kaW5nUm9vdERPTU5vZGVSZXF1ZXN0cyB8fCByZXF1ZXN0SWRlbnRpZmll ciAhPSB0aGlzLl9yZXF1ZXN0SWRlbnRpZmllcikKKyAgICAgICAgICAgIGlmICghdGhpcy5fcGVu ZGluZ1Jvb3RET01Ob2RlUmVxdWVzdHMgfHwgcmVxdWVzdElkZW50aWZpZXIgIT09IHRoaXMuX3Jl cXVlc3RJZGVudGlmaWVyKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAg aWYgKGVycm9yKSB7CkBAIC0xNjEsNyArMTYxLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWUucHJv dG90eXBlID0gewogICAgICAgICAgICAgcmVtb3RlT2JqZWN0LnJlbGVhc2UoKTsKIAogICAgICAg ICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHdlIGhhdmUgYmVlbiBpbnZhbGlkYXRlZCAoaWYgdGhl IGNhbGxiYWNrcyB3ZXJlIGNsZWFyZWQpLgotICAgICAgICAgICAgaWYgKCF0aGlzLl9wZW5kaW5n Um9vdERPTU5vZGVSZXF1ZXN0cyB8fCByZXF1ZXN0SWRlbnRpZmllciAhPSB0aGlzLl9yZXF1ZXN0 SWRlbnRpZmllcikKKyAgICAgICAgICAgIGlmICghdGhpcy5fcGVuZGluZ1Jvb3RET01Ob2RlUmVx dWVzdHMgfHwgcmVxdWVzdElkZW50aWZpZXIgIT09IHRoaXMuX3JlcXVlc3RJZGVudGlmaWVyKQog ICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgaWYgKCFub2RlSWQpIHsKQEAg LTE5Myw3ICsxOTMsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGZ1bmN0aW9uIGRpc3BhdGNoQ2FsbGJhY2tzKCkKICAgICAgICAgewogICAgICAgICAgICAg Ly8gQ2hlY2sgdG8gc2VlIGlmIHdlIGhhdmUgYmVlbiBpbnZhbGlkYXRlZCAoaWYgdGhlIGNhbGxi YWNrcyB3ZXJlIGNsZWFyZWQpLgotICAgICAgICAgICAgaWYgKCF0aGlzLl9wZW5kaW5nUm9vdERP TU5vZGVSZXF1ZXN0cyB8fCByZXF1ZXN0SWRlbnRpZmllciAhPSB0aGlzLl9yZXF1ZXN0SWRlbnRp ZmllcikKKyAgICAgICAgICAgIGlmICghdGhpcy5fcGVuZGluZ1Jvb3RET01Ob2RlUmVxdWVzdHMg fHwgcmVxdWVzdElkZW50aWZpZXIgIT09IHRoaXMuX3JlcXVlc3RJZGVudGlmaWVyKQogICAgICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlz Ll9wZW5kaW5nUm9vdERPTU5vZGVSZXF1ZXN0cy5sZW5ndGg7ICsraSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9iZVNldC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9iZVNldC5qcwppbmRl eCA0NmM0NDM4Li5lZGFmNzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0LmpzCkBAIC0xMDksNyArMTA5LDcgQEAgV2Vi SW5zcGVjdG9yLlByb2JlU2V0LnByb3RvdHlwZSA9IHsKICAgICByZW1vdmVQcm9iZTogZnVuY3Rp b24ocHJvYmUpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChwcm9iZSBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5Qcm9iZSwgIlRyaWVkIHRvIHJlbW92ZSBub24tcHJvYmUgIiwgcHJvYmUs ICIgdG8gcHJvYmUgZ3JvdXAiLCB0aGlzKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5f cHJvYmVzLmluZGV4T2YocHJvYmUpICE9IC0xLCAiVHJpZWQgdG8gcmVtb3ZlIHByb2JlIiwgcHJv YmUsICIgbm90IGluIGdyb3VwICIsIHRoaXMpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlz Ll9wcm9iZXMuaW5kZXhPZihwcm9iZSkgIT09IC0xLCAiVHJpZWQgdG8gcmVtb3ZlIHByb2JlIiwg cHJvYmUsICIgbm90IGluIGdyb3VwICIsIHRoaXMpOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0 aGlzLl9wcm9iZXNCeUlkZW50aWZpZXIuaGFzKHByb2JlLmlkKSwgIlRyaWVkIHRvIHJlbW92ZSBw cm9iZSIsIHByb2JlLCAiIG5vdCBpbiBncm91cCAiLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9w cm9iZXMuc3BsaWNlKHRoaXMuX3Byb2Jlcy5pbmRleE9mKHByb2JlKSwgMSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXREYXRh VGFibGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJv YmVTZXREYXRhVGFibGUuanMKaW5kZXggZmU5NTYxMy4uYzUzODE0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0RGF0YVRhYmxl LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9i ZVNldERhdGFUYWJsZS5qcwpAQCAtNzQsNyArNzQsNyBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXRE YXRhVGFibGUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgLy8gRWFnZXJseSBzYXZlIHRo ZSBmcmFtZSBpZiB0aGUgYmF0Y2ggaWRlbnRpZmllciBkaWZmZXJzLCBvciB3ZSBrbm93IHRoZSBm cmFtZSBpcyBmdWxsLgogICAgICAgICAvLyBDcmVhdGUgYSBuZXcgZnJhbWUgd2hlbiB0aGUgYmF0 Y2ggaWRlbnRpZmllciBkaWZmZXJzLgotICAgICAgICBpZiAoc2FtcGxlLmJhdGNoSWQgIT0gdGhp cy5fcHJldmlvdXNCYXRjaElkZW50aWZpZXIpIHsKKyAgICAgICAgaWYgKHNhbXBsZS5iYXRjaElk ICE9PSB0aGlzLl9wcmV2aW91c0JhdGNoSWRlbnRpZmllcikgewogICAgICAgICAgICAgaWYgKHRo aXMuX29wZW5GcmFtZSkgewogICAgICAgICAgICAgICAgIHRoaXMuX29wZW5GcmFtZS5maWxsTWlz c2luZ1ZhbHVlcyh0aGlzLl9wcm9iZVNldCk7CiAgICAgICAgICAgICAgICAgdGhpcy5hZGRGcmFt ZSh0aGlzLl9vcGVuRnJhbWUpOwpAQCAtODUsNyArODUsNyBAQCBXZWJJbnNwZWN0b3IuUHJvYmVT ZXREYXRhVGFibGUucHJvdG90eXBlID0gewogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMu X29wZW5GcmFtZSwgIlNob3VsZCBhbHdheXMgaGF2ZSBhbiBvcGVuIGZyYW1lIGJlZm9yZSBhZGRp bmcgc2FtcGxlLiIsIHRoaXMsIHByb2JlLCBzYW1wbGUpOwogICAgICAgICB0aGlzLl9vcGVuRnJh bWUuYWRkU2FtcGxlRm9yUHJvYmUocHJvYmUsIHNhbXBsZSk7Ci0gICAgICAgIGlmICh0aGlzLl9v cGVuRnJhbWUuY291bnQgPT0gdGhpcy5fcHJvYmVTZXQucHJvYmVzLmxlbmd0aCkgeworICAgICAg ICBpZiAodGhpcy5fb3BlbkZyYW1lLmNvdW50ID09PSB0aGlzLl9wcm9iZVNldC5wcm9iZXMubGVu Z3RoKSB7CiAgICAgICAgICAgICB0aGlzLmFkZEZyYW1lKHRoaXMuX29wZW5GcmFtZSk7CiAgICAg ICAgICAgICB0aGlzLl9vcGVuRnJhbWUgPSBudWxsOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRp b25zLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1p cnJvckFkZGl0aW9ucy5qcwppbmRleCA5NTVjZTFjLi5hMjFjODBiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25z LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVN aXJyb3JBZGRpdGlvbnMuanMKQEAgLTEzOSw3ICsxMzksNyBAQAogCiAgICAgICAgIC8vIFBhcnNl IGNoYXJhY3RlcnMgdW50aWwgdGhlIGVuZCBvZiB0aGUgc3RyZWFtL2xpbmUgb3IgYSBwcm9wZXIg ZW5kIHF1b3RlIGNoYXJhY3Rlci4KICAgICAgICAgd2hpbGUgKChjaCA9IHN0cmVhbS5uZXh0KCkp ICE9IG51bGwpIHsKLSAgICAgICAgICAgIGlmIChjaCA9PSBxdW90ZSAmJiAhZXNjYXBlZCkgewor ICAgICAgICAgICAgaWYgKGNoID09PSBxdW90ZSAmJiAhZXNjYXBlZCkgewogICAgICAgICAgICAg ICAgIHJlYWNoZWRFbmRPZlVSTCA9IHRydWU7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICB9CkBAIC0yNjEsNyArMjYxLDcgQEAKIAogICAgIENvZGVNaXJyb3IuZGVmaW5lRXh0 ZW5zaW9uKCJoYXNMaW5lQ2xhc3MiLCBmdW5jdGlvbihsaW5lLCB3aGVyZSwgY2xhc3NOYW1lKSB7 CiAgICAgICAgIC8vIFRoaXMgbWF0Y2hlcyB0aGUgYXJndW1lbnRzIHRvIGFkZExpbmVDbGFzcyBh bmQgcmVtb3ZlTGluZUNsYXNzLgotICAgICAgICB2YXIgY2xhc3NQcm9wZXJ0eSA9ICh3aGVyZSA9 PT0gInRleHQiID8gInRleHRDbGFzcyIgOiAod2hlcmUgPT0gImJhY2tncm91bmQiID8gImJnQ2xh c3MiIDogIndyYXBDbGFzcyIpKTsKKyAgICAgICAgdmFyIGNsYXNzUHJvcGVydHkgPSAod2hlcmUg PT09ICJ0ZXh0IiA/ICJ0ZXh0Q2xhc3MiIDogKHdoZXJlID09PSAiYmFja2dyb3VuZCIgPyAiYmdD bGFzcyIgOiAid3JhcENsYXNzIikpOwogICAgICAgICB2YXIgbGluZUluZm8gPSB0aGlzLmxpbmVJ bmZvKGxpbmUpOwogICAgICAgICBpZiAoIWxpbmVJbmZvKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtMzg2LDcgKzM4Niw3IEBACiAgICAgICAgICAgICB2YXIgbmV3TGVuZ3RoID0gYWx0 ZXJlZE51bWJlclN0cmluZy5sZW5ndGg7CiAKICAgICAgICAgICAgIC8vIEZpeCB1cCB0aGUgc2Vs ZWN0aW9uIHNvIGl0IGZvbGxvd3MgdGhlIGluY3JlYXNlIG9yIGRlY3JlYXNlIGluIHRoZSByZXBs YWNlbWVudCBsZW5ndGguCi0gICAgICAgICAgICBpZiAocHJldmlvdXNMZW5ndGggIT0gbmV3TGVu Z3RoKSB7CisgICAgICAgICAgICBpZiAocHJldmlvdXNMZW5ndGggIT09IG5ld0xlbmd0aCkgewog ICAgICAgICAgICAgICAgIGlmIChzZWxlY3Rpb25TdGFydC5saW5lID09PSBmcm9tLmxpbmUgJiYg c2VsZWN0aW9uU3RhcnQuY2ggPiBmcm9tLmNoKQogICAgICAgICAgICAgICAgICAgICBzZWxlY3Rp b25TdGFydC5jaCArPSBuZXdMZW5ndGggLSBwcmV2aW91c0xlbmd0aDsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDBjNGZkYTkuLjg0MDI2MmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0 b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMKQEAgLTE2OSw3ICsxNjksNyBA QCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIC8vIFRoZSBtYWluIHJlc291cmNlIGlzbid0IGFsd2F5cyBpbiB0aGUgbGlzdCBv ZiByZXNvdXJjZXMsIG1ha2Ugc3VyZSB0byBhZGQgaXQgdG8gdGhlIGxpc3Qgb2YgcmVzb3VyY2Vz CiAgICAgICAgICAgICAvLyB3ZSBnZXQgdGhlIFVSTHMgZnJvbS4KICAgICAgICAgICAgIHZhciBt YWluUmVzb3VyY2VVUkxDb21wb25lbnRzID0gZnJhbWVzW2ldLm1haW5SZXNvdXJjZS51cmxDb21w b25lbnRzOwotICAgICAgICAgICAgaWYgKG1haW5SZXNvdXJjZVVSTENvbXBvbmVudHMgJiYgbWFp blJlc291cmNlVVJMQ29tcG9uZW50cy5ob3N0ICYmIG1haW5SZXNvdXJjZVVSTENvbXBvbmVudHMu aG9zdCA9PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lmhvc3QpCisgICAgICAgICAgICBpZiAobWFp blJlc291cmNlVVJMQ29tcG9uZW50cyAmJiBtYWluUmVzb3VyY2VVUkxDb21wb25lbnRzLmhvc3Qg JiYgbWFpblJlc291cmNlVVJMQ29tcG9uZW50cy5ob3N0ID09PSB0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0Lmhvc3QpCiAgICAgICAgICAgICAgICAgcmVzb3VyY2VzRm9yRG9tYWluLnB1c2goZnJhbWVz W2ldLm1haW5SZXNvdXJjZS51cmwpOwogICAgICAgICB9CiAKQEAgLTI0OSw3ICsyNDksNyBAQCBX ZWJJbnNwZWN0b3IuY29va2llTWF0Y2hlc1Jlc291cmNlVVJMID0gZnVuY3Rpb24oY29va2llLCBy ZXNvdXJjZVVSTCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIChwYXJzZWRV UkwucGF0aC5zdGFydHNXaXRoKGNvb2tpZS5wYXRoKQotICAgICAgICAmJiAoIWNvb2tpZS5wb3J0 IHx8IHBhcnNlZFVSTC5wb3J0ID09IGNvb2tpZS5wb3J0KQorICAgICAgICAmJiAoIWNvb2tpZS5w b3J0IHx8IHBhcnNlZFVSTC5wb3J0ID09PSBjb29raWUucG9ydCkKICAgICAgICAgJiYgKCFjb29r aWUuc2VjdXJlIHx8IHBhcnNlZFVSTC5zY2hlbWUgPT09ICJodHRwcyIpKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFn ZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDU0NDUxN2MuLjJiMTM2YTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3Jh Z2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKQEAgLTE5MCw4ICsxOTAsOCBAQCBXZWJJ bnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFy IHByZXZpb3VzVmFsdWUgPSBvbGRUZXh0LnRyaW0oKTsKICAgICAgICAgdmFyIGVudGVyZWRWYWx1 ZSA9IG5ld1RleHQudHJpbSgpOwogICAgICAgICB2YXIgY29sdW1uSW5kZXggPSB0aGlzLl9kYXRh R3JpZC5vcmRlcmVkQ29sdW1ucy5pbmRleE9mKGNvbHVtbklkZW50aWZpZXIpOwotICAgICAgICB2 YXIgbWF5TW92ZVRvTmV4dFJvdyA9IG1vdmVEaXJlY3Rpb24gPT09ICJmb3J3YXJkIiAmJiBjb2x1 bW5JbmRleCA9PSB0aGlzLl9kYXRhR3JpZC5vcmRlcmVkQ29sdW1ucy5sZW5ndGggLSAxOwotICAg ICAgICB2YXIgbWF5TW92ZVRvUHJldmlvdXNSb3cgPSBtb3ZlRGlyZWN0aW9uID09PSAiYmFja3dh cmQiICYmIGNvbHVtbkluZGV4ID09IDA7CisgICAgICAgIHZhciBtYXlNb3ZlVG9OZXh0Um93ID0g bW92ZURpcmVjdGlvbiA9PT0gImZvcndhcmQiICYmIGNvbHVtbkluZGV4ID09PSB0aGlzLl9kYXRh R3JpZC5vcmRlcmVkQ29sdW1ucy5sZW5ndGggLSAxOworICAgICAgICB2YXIgbWF5TW92ZVRvUHJl dmlvdXNSb3cgPSBtb3ZlRGlyZWN0aW9uID09PSAiYmFja3dhcmQiICYmIGNvbHVtbkluZGV4ID09 PSAwOwogICAgICAgICB2YXIgd2lsbE1vdmVSb3cgPSBtYXlNb3ZlVG9OZXh0Um93IHx8IG1heU1v dmVUb1ByZXZpb3VzUm93OwogICAgICAgICB2YXIgc2hvdWxkQ29tbWl0Um93ID0gd2lsbE1vdmVS b3cgJiYga2V5Lmxlbmd0aCAmJiB2YWx1ZS5sZW5ndGg7CiAKQEAgLTIzMyw3ICsyMzMsNyBAQCBX ZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAg ICBlZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VDb250ZW50Vmlldy5EdXBsaWNhdGVLZXlTeWxlQ2xhc3NOYW1lKTsKIAotICAgICAgICBp ZiAoZWRpdGluZ05vZGUuX19wcmV2aW91c0tleVZhbHVlICE9IGtleSkKKyAgICAgICAgaWYgKGVk aXRpbmdOb2RlLl9fcHJldmlvdXNLZXlWYWx1ZSAhPT0ga2V5KQogICAgICAgICAgICAgZG9tU3Rv cmFnZS5yZW1vdmVJdGVtKGVkaXRpbmdOb2RlLl9fcHJldmlvdXNLZXlWYWx1ZSk7CiAKICAgICAg ICAgZG9tU3RvcmFnZS5zZXRJdGVtKGtleSwgdmFsdWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwpp bmRleCBlYjljNzk0Li4zNTBhNDE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtMzYsNyAr MzYsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihub2RlLCBlbGVt ZW50Q2xvc2VUYWcpCiAgICAgLy8gVGhlIHRpdGxlIHdpbGwgYmUgdXBkYXRlZCBpbiBvbmF0dGFj aC4KICAgICBUcmVlRWxlbWVudC5jYWxsKHRoaXMsICIiLCBub2RlLCBoYXNDaGlsZHJlbk92ZXJy aWRlKTsKIAotICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVUeXBlKCkgPT0gTm9k ZS5FTEVNRU5UX05PREUgJiYgIWVsZW1lbnRDbG9zZVRhZykKKyAgICBpZiAodGhpcy5yZXByZXNl bnRlZE9iamVjdC5ub2RlVHlwZSgpID09PSBOb2RlLkVMRU1FTlRfTk9ERSAmJiAhZWxlbWVudENs b3NlVGFnKQogICAgICAgICB0aGlzLl9jYW5BZGRBdHRyaWJ1dGVzID0gdHJ1ZTsKICAgICB0aGlz Ll9zZWFyY2hRdWVyeSA9IG51bGw7CiAgICAgdGhpcy5fZXhwYW5kZWRDaGlsZHJlbkxpbWl0ID0g V2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LkluaXRpYWxDaGlsZHJlbkxpbWl0OwpAQCAtMzcz LDcgKzM3Myw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuYWRqdXN0Q29sbGFwc2VkUmFuZ2UoKTsKIAogICAgICAgICB2YXIgbGFzdENo aWxkID0gdGhpcy5jaGlsZHJlbi5sYXN0VmFsdWU7Ci0gICAgICAgIGlmICh0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0Lm5vZGVUeXBlKCkgPT0gTm9kZS5FTEVNRU5UX05PREUgJiYgKCFsYXN0Q2hpbGQg fHwgIWxhc3RDaGlsZC5fZWxlbWVudENsb3NlVGFnKSkKKyAgICAgICAgaWYgKHRoaXMucmVwcmVz ZW50ZWRPYmplY3Qubm9kZVR5cGUoKSA9PT0gTm9kZS5FTEVNRU5UX05PREUgJiYgKCFsYXN0Q2hp bGQgfHwgIWxhc3RDaGlsZC5fZWxlbWVudENsb3NlVGFnKSkKICAgICAgICAgICAgIHRoaXMuaW5z ZXJ0Q2hpbGRFbGVtZW50KHRoaXMucmVwcmVzZW50ZWRPYmplY3QsIHRoaXMuY2hpbGRyZW4ubGVu Z3RoLCB0cnVlKTsKIAogICAgICAgICAvLyBXZSB3YW50IHRvIHJlc3RvcmUgdGhlIG9yaWdpbmFs IHNlbGVjdGlvbiBhbmQgdHJlZSBzY3JvbGwgcG9zaXRpb24gYWZ0ZXIgYSBmdWxsIHJlZnJlc2gs IGlmIHBvc3NpYmxlLgpAQCAtNTM2LDEwICs1MzYsMTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIF9zdGFydEVkaXRpbmdUYXJnZXQ6IGZ1bmN0aW9u KGV2ZW50VGFyZ2V0KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMudHJlZU91dGxpbmUuc2VsZWN0 ZWRET01Ob2RlKCkgIT0gdGhpcy5yZXByZXNlbnRlZE9iamVjdCkKKyAgICAgICAgaWYgKHRoaXMu dHJlZU91dGxpbmUuc2VsZWN0ZWRET01Ob2RlKCkgIT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3Qp CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmpl Y3Qubm9kZVR5cGUoKSAhPSBOb2RlLkVMRU1FTlRfTk9ERSAmJiB0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0Lm5vZGVUeXBlKCkgIT0gTm9kZS5URVhUX05PREUpCisgICAgICAgIGlmICh0aGlzLnJlcHJl c2VudGVkT2JqZWN0Lm5vZGVUeXBlKCkgIT09IE5vZGUuRUxFTUVOVF9OT0RFICYmIHRoaXMucmVw cmVzZW50ZWRPYmplY3Qubm9kZVR5cGUoKSAhPT0gTm9kZS5URVhUX05PREUpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgdmFyIHRleHROb2RlID0gZXZlbnRUYXJnZXQuZW5j bG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygiaHRtbC10ZXh0LW5vZGUiKTsKQEAgLTkzOSw3ICs5 MzksNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAg ICAgICAgLy8gV2Ugb25seSBzaG93IHRleHQgbm9kZXMgaW5saW5lIGluIGVsZW1lbnRzIGlmIHRo ZSBlbGVtZW50IG9ubHkKICAgICAgICAgICAgIC8vIGhhcyBhIHNpbmdsZSBjaGlsZCwgYW5kIHRo YXQgY2hpbGQgaXMgYSB0ZXh0IG5vZGUuCiAgICAgICAgICAgICB0ZXh0Tm9kZSA9IHRoaXMucmVw cmVzZW50ZWRPYmplY3QuZmlyc3RDaGlsZDsKLSAgICAgICAgfSBlbHNlIGlmICh0aGlzLnJlcHJl c2VudGVkT2JqZWN0Lm5vZGVUeXBlKCkgPT0gTm9kZS5URVhUX05PREUpCisgICAgICAgIH0gZWxz ZSBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlVHlwZSgpID09PSBOb2RlLlRFWFRfTk9E RSkKICAgICAgICAgICAgIHRleHROb2RlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdDsKIAogICAg ICAgICB0ZXh0Tm9kZS5zZXROb2RlVmFsdWUobmV3VGV4dCwgdGhpcy51cGRhdGVUaXRsZS5iaW5k KHRoaXMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RhdGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YUdyaWQuanMKaW5kZXggODdkMWI2YS4uZDFkMmNkYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKQEAg LTEwMjUsNyArMTAyNSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAg ICAgewogICAgICAgICB2YXIgY29sbGFwc2VyQ29sdW1uSWRlbnRpZmllciA9IG51bGw7CiAgICAg ICAgIGZvciAodmFyIFtpZGVudGlmaWVyLCBjb2x1bW5dIG9mIHRoaXMuY29sdW1ucykgewotICAg ICAgICAgICAgaWYgKGNvbHVtblsiY29sbGFwc2VzR3JvdXAiXSA9PSBjb2x1bW5Hcm91cCkgewor ICAgICAgICAgICAgaWYgKGNvbHVtblsiY29sbGFwc2VzR3JvdXAiXSA9PT0gY29sdW1uR3JvdXAp IHsKICAgICAgICAgICAgICAgICBjb2xsYXBzZXJDb2x1bW5JZGVudGlmaWVyID0gaWRlbnRpZmll cjsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KQEAgLTEyNjIsOSArMTI2 Miw5IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBs ZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKz0gZmlyc3RSb3dDZWxsc1tpXS5vZmZzZXRXaWR0aDsK IAogICAgICAgICAvLyBEaWZmZXJlbmNlcyBmb3Igb3RoZXIgcmVzaXplIG1ldGhvZHMKLSAgICAg ICAgaWYgKHRoaXMucmVzaXplTWV0aG9kID09IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVN ZXRob2QuTGFzdCkgeworICAgICAgICBpZiAodGhpcy5yZXNpemVNZXRob2QgPT09IFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuTGFzdCkgewogICAgICAgICAgICAgcmlnaHRDZWxs SW5kZXggPSB0aGlzLnJlc2l6ZXJFbGVtZW50cy5sZW5ndGg7Ci0gICAgICAgIH0gZWxzZSBpZiAo dGhpcy5yZXNpemVNZXRob2QgPT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6ZU1ldGhvZC5G aXJzdCkgeworICAgICAgICB9IGVsc2UgaWYgKHRoaXMucmVzaXplTWV0aG9kID09PSBXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuUmVzaXplTWV0aG9kLkZpcnN0KSB7CiAgICAgICAgICAgICBsZWZ0RWRn ZU9mUHJldmlvdXNDb2x1bW4gKz0gZmlyc3RSb3dDZWxsc1tsZWZ0Q2VsbEluZGV4XS5vZmZzZXRX aWR0aCAtIGZpcnN0Um93Q2VsbHNbMF0ub2Zmc2V0V2lkdGg7CiAgICAgICAgICAgICBsZWZ0Q2Vs bEluZGV4ID0gMDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlQ29udGVudFZpZXcuanMKaW5k ZXggMDdkYmRiMy4uMDNhNDJhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZUNvbnRlbnRWaWV3LmpzCkBA IC0xMzMsNyArMTMzLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlQ29udGVudFZpZXcucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKGVycm9yLm1lc3NhZ2UpCiAgICAgICAgICAgICB2 YXIgbWVzc2FnZSA9IGVycm9yLm1lc3NhZ2U7Ci0gICAgICAgIGVsc2UgaWYgKGVycm9yLmNvZGUg PT0gMikKKyAgICAgICAgZWxzZSBpZiAoZXJyb3IuY29kZSA9PT0gMikKICAgICAgICAgICAgIHZh ciBtZXNzYWdlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEYXRhYmFzZSBubyBsb25nZXIgaGFz IGV4cGVjdGVkIHZlcnNpb24uIik7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHZhciBtZXNz YWdlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBbiB1bmV4cGVjdGVkIGVycm9yICVzIG9jY3Vy cmVkLiIpLmZvcm1hdChlcnJvci5jb2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxlUm93LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25TaW1w bGVSb3cuanMKaW5kZXggZDZjN2UwZS4uOWU0OWNiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3cuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1Nl Y3Rpb25TaW1wbGVSb3cuanMKQEAgLTUyLDcgKzUyLDcgQEAgV2ViSW5zcGVjdG9yLkRldGFpbHNT ZWN0aW9uU2ltcGxlUm93ID0gZnVuY3Rpb24obGFiZWwsIHZhbHVlKSB7CiAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgdmFyIGN1cnJlbnRSYW5nZSA9IGN1cnJlbnRTZWxlY3Rpb24uZ2V0 UmFuZ2VBdCgwKTsKLSAgICAgICAgaWYgKCFjdXJyZW50UmFuZ2UgfHwgY3VycmVudFJhbmdlLnN0 YXJ0Q29udGFpbmVyID09IGN1cnJlbnRSYW5nZS5lbmRDb250YWluZXIpCisgICAgICAgIGlmICgh Y3VycmVudFJhbmdlIHx8IGN1cnJlbnRSYW5nZS5zdGFydENvbnRhaW5lciA9PT0gY3VycmVudFJh bmdlLmVuZENvbnRhaW5lcikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgY29y cmVjdGVkUmFuZ2UgPSBkb2N1bWVudC5jcmVhdGVSYW5nZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2xpZGVyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2xpZGVyLmpzCmluZGV4IDhjNDgyOWMu LmY0NWEwYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NsaWRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TbGlkZXIuanMKQEAgLTEyOSw3ICsxMjksNyBAQCBXZWJJbnNwZWN0b3IuU2xpZGVy LnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBfbWF4WCgpCiAgICAgewotICAgICAgICBpZiAodGhp cy5fX21heFggPT0gMCAmJiBkb2N1bWVudC5ib2R5LmNvbnRhaW5zKHRoaXMuX2VsZW1lbnQpKQor ICAgICAgICBpZiAodGhpcy5fX21heFggPT09IDAgJiYgZG9jdW1lbnQuYm9keS5jb250YWlucyh0 aGlzLl9lbGVtZW50KSkKICAgICAgICAgICAgIHRoaXMuX19tYXhYID0gdGhpcy5fZWxlbWVudC5v ZmZzZXRXaWR0aCAtIE1hdGguY2VpbChXZWJJbnNwZWN0b3IuU2xpZGVyLktub2JXaWR0aCAvIDIp OwogCiAgICAgICAgIHJldHVybiB0aGlzLl9fbWF4WDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggYjE5 NGJiMS4uMDQ0YzEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTg0Niw3ICs4NDYsNyBAQCBUcmVl RWxlbWVudC5wcm90b3R5cGUuZXhwYW5kID0gZnVuY3Rpb24oKQogCiAgICAgaWYgKHRoaXMuX2xp c3RJdGVtTm9kZSkgewogICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LmFkZCgi ZXhwYW5kZWQiKTsKLSAgICAgICAgaWYgKHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUgJiYgdGhpcy5f Y2hpbGRyZW5MaXN0Tm9kZS5wYXJlbnROb2RlICE9IHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnRO b2RlKQorICAgICAgICBpZiAodGhpcy5fY2hpbGRyZW5MaXN0Tm9kZSAmJiB0aGlzLl9jaGlsZHJl bkxpc3ROb2RlLnBhcmVudE5vZGUgIT09IHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnROb2RlKQog ICAgICAgICAgICAgdGhpcy5wYXJlbnQuX2NoaWxkcmVuTGlzdE5vZGUuaW5zZXJ0QmVmb3JlKHRo aXMuX2NoaWxkcmVuTGlzdE5vZGUsIHRoaXMuX2xpc3RJdGVtTm9kZS5uZXh0U2libGluZyk7CiAg ICAgfQogCg==