72887 2011-11-21 08:04:34 -0800 REGRESSION(r100906): Broke inspector/extensions/extensions-events.html (Requested by steveblock on #webkit). 2011-11-21 09:50:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72587 1 webkit.review.bot webkit.review.bot pfeldman steveblock yurys oldest_to_newest 506970 0 webkit.review.bot 2011-11-21 08:04:34 -0800 http://trac.webkit.org/changeset/100906 broke the build: Broke inspector/extensions/extensions-events.html (Requested by steveblock on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 506971 1 116091 webkit.review.bot 2011-11-21 08:05:15 -0800 Created attachment 116091 ROLLOUT of r100906 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 506976 2 steveblock 2011-11-21 08:10:20 -0800 After this change, inspector/extensions/extensions-events.html times out almost always on Linux - http://build.webkit.org/builders/Chromium%20Linux%20Release%20%28Tests%29/builds/26292 Will add a TIMEOUT expectation. 506984 3 steveblock 2011-11-21 08:19:28 -0800 Committed r100918: <http://trac.webkit.org/changeset/100918> 507038 4 pfeldman 2011-11-21 09:50:54 -0800 Committed r100929 116091 2011-11-21 08:05:15 -0800 2011-11-21 08:06:16 -0800 ROLLOUT of r100906 bug-72887-20111121160602.patch text/plain 28255 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwOTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI0NzRkMGY0Y2FiNzlj NTBiZWYzMTUyY2FhNThjODdjNGE0NDhmOC4uMTkxYWY0NjI1Mjk1ODZjYTYxZmU0ZDY4N2RjYTdi ZTRiMGIyODk0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYyIEBACiAyMDExLTExLTIxICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAorICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTAwOTA2LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8xMDA5MDYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcyODg3CisKKyAgICAgICAgQnJva2UgaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0 ZW5zaW9ucy1ldmVudHMuaHRtbCAoUmVxdWVzdGVkCisgICAgICAgIGJ5IHN0ZXZlYmxvY2sgb24g I3dlYmtpdCkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckFnZW50OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjppbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpk aWRDbGVhcldpbmRvd09iamVjdEluV29ybGRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ29tbWl0TG9hZEltcGwpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNb2RlbC5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwucHJvdG90eXBlLl9m cmFtZURldGFjaGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9k ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUucmVz ZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fZGVidWdnZXJSZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRl bnNpb25TZXJ2ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnBy b3RvdHlwZS5ub3RpZnlJbnNwZWN0b3JSZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0 ZW5zaW9uU2VydmVyLnByb3RvdHlwZS5pbml0RXh0ZW5zaW9ucyk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0Q29udGV4dE1hbmFnZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLnByb3RvdHlwZS5fZnJhbWVEZXRhY2hl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVFdmFsdWF0aW9uQ29udGV4dC5wcm90b3R5 cGUuZ2V0IGZyYW1lSWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya0xv Zy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrTG9nLnByb3RvdHlwZS5fZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtMb2dWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmll dy5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL09iamVjdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlLmFk ZEV2ZW50TGlzdGVuZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGUu cmVtb3ZlRXZlbnRMaXN0ZW5lcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bC5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuX2ZyYW1lRGV0YWNoZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5fY2xlYXJDaGlsZEZyYW1lc0FuZFJl c291cmNlcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUucmVzZXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fZnJhbWVE ZXRhY2hlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fZGVidWdnZXJX YXNEaXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZS5yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIubG9hZENvbXBsZXRlZC5jYWxj dWxhdGVUaXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5sb2FkQ29t cGxldGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZS5y ZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisKKzIw MTEtMTEtMjEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMDA5MTMuCiAgICAgICAgIGh0dHA6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEwMDkxMwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI4ODUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgppbmRleCA5ZThhOTY0MDcxNjlkZjBiOTNjN2ZiZTI5MzY5NjZiNjk1MTQ3Njg3 Li5hNDNmNmMzYTEwZmE3NmJiZWUwYjI0MDlhNjA1YmJmNWRmMDQwN2NkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xNyw2ICsxNyw5IEBACiAgICAgICAgICAg ICAgICAgIm5hbWUiOiAiZGlzY29ubmVjdEZyb21CYWNrZW5kIgogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXNldCIKKyAgICAgICAgICAg IH0sCisgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2hvd1BhbmVsIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJwYW5lbCIsICJ0eXBlIjogInN0cmluZyIgfQpAQCAtMTk0OSwxMCArMTk1Miw2IEBA CiAgICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2xvYmFsT2JqZWN0Q2xlYXJlZCIsCi0g ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNhbGxlZCB3aGVuIGdsb2JhbCBoYXMgYmVl biBjbGVhcmVkIGFuZCBkZWJ1Z2dlciBjbGllbnQgc2hvdWxkIHJlc2V0IGl0cyBzdGF0ZS4gSGFw cGVucyB1cG9uIG5hdmlnYXRpb24gb3IgcmVsb2FkLiIKLSAgICAgICAgICAgIH0sCi0gICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2NyaXB0UGFyc2VkIiwKICAgICAgICAg ICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz Y3JpcHRJZCIsICIkcmVmIjogIlNjcmlwdElkIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIg b2YgdGhlIHNjcmlwdCBwYXJzZWQuIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JBZ2VudC5jcHAKaW5kZXggN2UxNTU0YzA4ZWNiM2ZkMzYxYWVhOWE0Njc2NjFiNTYwYzAz NGI0Yi4uZTMzZWM5YmE4YTk5MjIwNDc2YzA2MTQ5MWE0M2U5MTliMDM5MTM2ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCkBAIC0xMzYsNiArMTM2LDkg QEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6Y2xlYXJGcm9udGVuZCgpCiB2b2lkIEluc3BlY3RvckFn ZW50OjpkaWRDb21taXRMb2FkKCkKIHsKICAgICBtX2RpZENvbW1pdExvYWRGaXJlZCA9IHRydWU7 CisgICAgaWYgKG1fZnJvbnRlbmQpCisgICAgICAgIG1fZnJvbnRlbmQtPmluc3BlY3RvcigpLT5y ZXNldCgpOworCiAgICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmRpc2NhcmRJbmplY3RlZFNj cmlwdHMoKTsKICNpZiBFTkFCTEUoV09SS0VSUykKICAgICBtX3dvcmtlcnMuY2xlYXIoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cAppbmRleCBmNzI1ZGE4NDQ3YzQ3ZTQ0MjRkMDI5YWQ0NmViZTY4MWRkOWZkZDdkLi5lMTgyMDVj YzhhOGY1YTM0YzQxOGNkMTUwM2QyMDU4ZTM3YmE2YmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0xNjQsMTIgKzE2 NCwxMCBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldEJyZWFrcG9pbnRzQWN0aXZl KEVycm9yU3RyaW5nKiwgYm9vbCBhY3RpdmUpCiAgICAgICAgIHNjcmlwdERlYnVnU2VydmVyKCku ZGVhY3RpdmF0ZUJyZWFrcG9pbnRzKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkQ2xlYXJNYWluRnJhbWVXaW5kb3dPYmplY3QoKQordm9pZCBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjppbnNwZWN0ZWRVUkxDaGFuZ2VkKGNvbnN0IFN0cmluZyYpCiB7CiAgICAgbV9zY3Jp cHRzLmNsZWFyKCk7CiAgICAgbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElk cy5jbGVhcigpOwotICAgIGlmIChtX2Zyb250ZW5kKQotICAgICAgICBtX2Zyb250ZW5kLT5nbG9i YWxPYmplY3RDbGVhcmVkKCk7CiB9CiAKIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gYnVpbGRPYmplY3RGb3JCcmVha3BvaW50Q29va2llKGNvbnN0IFN0cmluZyYgdXJsLCBpbnQg bGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJv b2wgaXNSZWdleCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5oCmluZGV4IGZlOGY0MmMwYzEzODYyN2NjZTFhN2IzZWEwMmY3M2NlOWYwODll YWQuLjIxMThhMWU1ZmJiZmQ4OWJmZmQyNWYyMjg1MGNiN2UwYTI5ZDc3MmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaApAQCAtNzIs NyArNzIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVu ZCopOwogICAgIHZvaWQgY2xlYXJGcm9udGVuZCgpOwogCi0gICAgdm9pZCBkaWRDbGVhck1haW5G cmFtZVdpbmRvd09iamVjdCgpOworICAgIHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBT dHJpbmcmIHVybCk7CiAKICAgICAvLyBQYXJ0IG9mIHRoZSBwcm90b2NvbC4KICAgICB2b2lkIHNl dEJyZWFrcG9pbnRzQWN0aXZlKEVycm9yU3RyaW5nKiwgYm9vbCBhY3RpdmUpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApp bmRleCA0Y2I4ZGM3ZmIxMTIyNWU3MTJjMDdiYzM3MDYwNGU1Y2EyNmE5MTE2Li5iZDJiOWU1MGU0 OWQ0ODUwMmEwOTc2ZWRmMmFmODkyMTAxMmZjYjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtOTMsMTcgKzkz LDEwIEBAIHN0YXRpYyBib29sIGV2ZW50SGFzTGlzdGVuZXJzKGNvbnN0IEF0b21pY1N0cmluZyYg ZXZlbnRUeXBlLCBET01XaW5kb3cqIHdpbmRvdywKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmRpZENsZWFyV2luZG93T2JqZWN0SW5Xb3JsZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUqIGZyYW1lLCBET01XcmFwcGVyV29ybGQqIHdv cmxkKQogewotICAgIEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50ID0gaW5zdHJ1bWVudGlu Z0FnZW50cy0+aW5zcGVjdG9yUGFnZUFnZW50KCk7Ci0gICAgaWYgKHBhZ2VBZ2VudCkKKyAgICBp ZiAoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5p bnNwZWN0b3JQYWdlQWdlbnQoKSkKICAgICAgICAgcGFnZUFnZW50LT5kaWRDbGVhcldpbmRvd09i amVjdEluV29ybGQoZnJhbWUsIHdvcmxkKTsKICAgICBpZiAoSW5zcGVjdG9yQWdlbnQqIGluc3Bl Y3RvckFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQWdlbnQoKSkKICAgICAg ICAgaW5zcGVjdG9yQWdlbnQtPmRpZENsZWFyV2luZG93T2JqZWN0SW5Xb3JsZChmcmFtZSwgd29y bGQpOwotI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIGlmIChJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50KiBkZWJ1Z2dlckFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVj dG9yRGVidWdnZXJBZ2VudCgpKSB7Ci0gICAgICAgIGlmIChwYWdlQWdlbnQgJiYgd29ybGQgPT0g bWFpblRocmVhZE5vcm1hbFdvcmxkKCkgJiYgZnJhbWUgPT0gcGFnZUFnZW50LT5tYWluRnJhbWUo KSkKLSAgICAgICAgICAgIGRlYnVnZ2VyQWdlbnQtPmRpZENsZWFyTWFpbkZyYW1lV2luZG93T2Jq ZWN0KCk7Ci0gICAgfQotI2VuZGlmCiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjppbnNwZWN0ZWRQYWdlRGVzdHJveWVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVt ZW50aW5nQWdlbnRzKQpAQCAtNjQ1LDYgKzYzOCwxMyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZGlkQ29tbWl0TG9hZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVu dAogCiAgICAgICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0g aW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yUmVzb3VyY2VBZ2VudCgpKQogICAgICAgICAg ICAgcmVzb3VyY2VBZ2VudC0+bWFpbkZyYW1lTmF2aWdhdGVkKGxvYWRlcik7CisKKyNpZiBFTkFC TEUoSkFWQVNDUklQVF9ERUJVR0dFUikKKyAgICAgICAgaWYgKEluc3BlY3RvckRlYnVnZ2VyQWdl bnQqIGRlYnVnZ2VyQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JEZWJ1Z2dl ckFnZW50KCkpIHsKKyAgICAgICAgICAgIEtVUkwgdXJsID0gaW5zcGVjdG9yQWdlbnQtPmluc3Bl Y3RlZFVSTFdpdGhvdXRGcmFnbWVudCgpOworICAgICAgICAgICAgZGVidWdnZXJBZ2VudC0+aW5z cGVjdGVkVVJMQ2hhbmdlZCh1cmwpOworICAgICAgICB9CisjZW5kaWYKICNpZiBFTkFCTEUoSkFW QVNDUklQVF9ERUJVR0dFUikgJiYgVVNFKEpTQykKICAgICAgICAgaWYgKEluc3BlY3RvclByb2Zp bGVyQWdlbnQqIHByb2ZpbGVyQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JQ cm9maWxlckFnZW50KCkpIHsKICAgICAgICAgICAgIHByb2ZpbGVyQWdlbnQtPnN0b3BVc2VySW5p dGlhdGVkUHJvZmlsaW5nKHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcwppbmRleCBhODA5MGUx MjA1ZTIzYzMwZTRiYTQwZGE0YjA2NDE1NDU1YzczNjY4Li42NTcwZmEzYjZhNTAxYzk4NGUxYTY0 MWIxZTA0NzY2MTFhNWI5MzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcwpAQCAtNTYsNyArNTYs NyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1vZGVsLkV2ZW50VHlwZXMgPSB7CiBX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICBfZnJh bWVOYXZpZ2F0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKGV2ZW50LmRh dGFbImlzTWFpbkZyYW1lIl0pIHsKKyAgICAgICAgaWYgKGV2ZW50LmRhdGEuaXNNYWluRnJhbWUp IHsKICAgICAgICAgICAgIHRoaXMuX21haW5GcmFtZU5hdmlnYXRlZCgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CkBAIC02OCw4ICs2OCw4IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNh dGlvbkNhY2hlTW9kZWwucHJvdG90eXBlID0gewogICAgIAogICAgIF9mcmFtZURldGFjaGVkOiBm dW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBmcmFtZSA9IGV2ZW50LmRhdGE7Ci0g ICAgICAgIHRoaXMuX2ZyYW1lTWFuaWZlc3RSZW1vdmVkKGZyYW1lLmlkKTsKKyAgICAgICAgdmFy IGZyYW1lSWQgPSBldmVudC5kYXRhOworICAgICAgICB0aGlzLl9mcmFtZU1hbmlmZXN0UmVtb3Zl ZChmcmFtZUlkKTsKICAgICB9LAogICAgIAogICAgIF9tYWluRnJhbWVOYXZpZ2F0ZWQ6IGZ1bmN0 aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJNb2RlbC5qcwppbmRleCBmNmNmNTFlZDM3YWQxYTAwNGUxMzFjZGRmZGY2MzAyNTQ3NTc5Zjky Li5jYjM1ZDliNjQzMjU4OTdiZjgzODdhYWM2OTgwZjY0N2NlOGE4NTI2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC03 NCw3ICs3NCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cyA9IHsKICAgICBQ YXJzZWRTY3JpcHRTb3VyY2U6ICJwYXJzZWQtc2NyaXB0LXNvdXJjZSIsCiAgICAgRmFpbGVkVG9Q YXJzZVNjcmlwdFNvdXJjZTogImZhaWxlZC10by1wYXJzZS1zY3JpcHQtc291cmNlIiwKICAgICBC cmVha3BvaW50UmVzb2x2ZWQ6ICJicmVha3BvaW50LXJlc29sdmVkIiwKLSAgICBHbG9iYWxPYmpl Y3RDbGVhcmVkOiAiZ2xvYmFsLW9iamVjdC1jbGVhcmVkIgorICAgIFJlc2V0OiAicmVzZXQiCiB9 CiAKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkJyZWFrUmVhc29uID0gewpAQCAtMjE4LDEx ICsyMTgsMTEgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJN b2RlbC5FdmVudHMuQnJlYWtwb2ludFJlc29sdmVkLCB7YnJlYWtwb2ludElkOiBicmVha3BvaW50 SWQsIGxvY2F0aW9uOiBsb2NhdGlvbn0pOwogICAgIH0sCiAKLSAgICBfZ2xvYmFsT2JqZWN0Q2xl YXJlZDogZnVuY3Rpb24oKQorICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0 aGlzLl9kZWJ1Z2dlclBhdXNlZERldGFpbHMgPSBudWxsOwogICAgICAgICB0aGlzLl9zY3JpcHRz ID0ge307Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkKTsKKyAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZl bnRzLlJlc2V0KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0zOTUsMTEgKzM5NSw2IEBAIFdlYklu c3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9k ZWJ1Z2dlck1vZGVsLl9kZWJ1Z2dlcldhc0Rpc2FibGVkKCk7CiAgICAgfSwKIAotICAgIGdsb2Jh bE9iamVjdENsZWFyZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2RlYnVnZ2Vy TW9kZWwuX2dsb2JhbE9iamVjdENsZWFyZWQoKTsKLSAgICB9LAotCiAgICAgLyoqCiAgICAgICog QHBhcmFtIHtEZWJ1Z2dlckFnZW50LlNjcmlwdElkfSBzY3JpcHRJZAogICAgICAqIEBwYXJhbSB7 c3RyaW5nfSBzb3VyY2VVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBiNDI1 NThlM2NhODU0YTNmMjNhYzYzMjlmMDMwYmZmZThiYmNjMmIzLi5iNTM0MzVlNTA2ZmJkNDRjZTJh YmJiYzAzMDNhZjFmMTc5NGJjMzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBA IC00Nyw3ICs0Nyw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsID0g ZnVuY3Rpb24oKQogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkZhaWxlZFRvUGFyc2VTY3JpcHRT b3VyY2UsIHRoaXMuX2ZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UsIHRoaXMpOwogICAgIFdlYklu c3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB0aGlzLl9kZWJ1Z2dlclBhdXNlZCwgdGhp cyk7CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRGVidWdnZXJSZXN1bWVkLCB0aGlzLl9kZWJ1 Z2dlclJlc3VtZWQsIHRoaXMpOwotICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVj dENsZWFyZWQsIHRoaXMuX2RlYnVnZ2VyUmVzZXQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu RXZlbnRzLlJlc2V0LCB0aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsKIAogICAgIFdlYkluc3Bl Y3Rvci5jb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5F dmVudHMuTWVzc2FnZUFkZGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVkLCB0aGlzKTsKICAg ICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db25z b2xlTW9kZWwuRXZlbnRzLkNvbnNvbGVDbGVhcmVkLCB0aGlzLl9jb25zb2xlQ2xlYXJlZCwgdGhp cyk7CkBAIC02NSw3ICs2NSw2IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLkV2ZW50cyA9IHsKICAgICBCcmVha3BvaW50UmVtb3ZlZDogImJyZWFrcG9pbnQtcmVtb3Zl ZCIsCiAgICAgRGVidWdnZXJQYXVzZWQ6ICJkZWJ1Z2dlci1wYXVzZWQiLAogICAgIERlYnVnZ2Vy UmVzdW1lZDogImRlYnVnZ2VyLXJlc3VtZWQiLAotICAgIERlYnVnZ2VyUmVzZXQ6ICJkZWJ1Z2dl ci1yZXNldCIsCiAgICAgQ2FsbEZyYW1lU2VsZWN0ZWQ6ICJjYWxsLWZyYW1lLXNlbGVjdGVkIiwK ICAgICBDb25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2VsZWN0ZWRDYWxsRnJhbWU6ICJjb25zb2xl LWNvbW1hbmQtZXZhbHVhdGVkLWluLXNlbGVjdGVkLWNhbGwtZnJhbWUiLAogICAgIEV4ZWN1dGlv bkxpbmVDaGFuZ2VkOiAiZXhlY3V0aW9uLWxpbmUtY2hhbmdlZCIKQEAgLTY1OSw3ICs2NTgsNiBA QCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMgPSBbXTsKICAgICAgICAgdGhpcy5f c2VsZWN0ZWRDYWxsRnJhbWUgPSBudWxsOwogICAgICAgICB0aGlzLl9icmVha3BvaW50TWFuYWdl ci5kZWJ1Z2dlclJlc2V0KCk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJl c2V0KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggZTRmOGNhM2Q3ODAxMjlkM2Y2MzAwZTg2 MTVmZWI4ZjQzMmNlMTY4Yy4uZDEwYWIwYWIwYjlkMmFjM2IwOTBmYzUzOTNiMzMyMTMwNDFkODJj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNp b25TZXJ2ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRl bnNpb25TZXJ2ZXIuanMKQEAgLTEwNSw3ICsxMDUsNyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9u U2VydmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcG9zdE5vdGlmaWNhdGlvbigiaW5z cGVjdGVkVVJMQ2hhbmdlZCIsIHVybCk7CiAgICAgfSwKIAotICAgIF9tYWluRnJhbWVOYXZpZ2F0 ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIG5vdGlmeUluc3BlY3RvclJlc2V0OiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJyZXNldCIpOwogICAgIH0s CkBAIC01NDgsNyArNTQ4LDYgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuSW5zcGVj dGVkVVJMQ2hhbmdlZCwKICAgICAgICAgICAgIHRoaXMuX2luc3BlY3RlZFVSTENoYW5nZWQsIHRo aXMpOwotICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVO YXZpZ2F0ZWQsIHRoaXMuX21haW5GcmFtZU5hdmlnYXRlZCwgdGhpcyk7CiAgICAgICAgIEluc3Bl Y3RvckV4dGVuc2lvblJlZ2lzdHJ5LmdldEV4dGVuc2lvbnNBc3luYygpOwogICAgIH0sCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdENv bnRleHRNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0Q29udGV4dE1hbmFnZXIuanMKaW5kZXggMzdmYmNiYTdkMzhlY2ZkMTE1YmFmOWVjOGYw Mzk2ODU4MDRmMDMwMi4uOGY2NjQzY2NjNzkxOWU2ZThiNDg2ZTliYzkwMjUwY2Q1NTIzNzcxMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0 Q29udGV4dE1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9KYXZhU2NyaXB0Q29udGV4dE1hbmFnZXIuanMKQEAgLTYxLDEyICs2MSwxMiBAQCBXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdENvbnRleHRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAgIF9mcmFt ZURldGFjaGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBmcmFtZSA9IGV2 ZW50LmRhdGE7Ci0gICAgICAgIHZhciBjb250ZXh0ID0gdGhpcy5fZnJhbWVJZFRvQ29udGV4dFtm cmFtZS5pZF07CisgICAgICAgIHZhciBmcmFtZUlkID0gZXZlbnQuZGF0YTsKKyAgICAgICAgdmFy IGNvbnRleHQgPSB0aGlzLl9mcmFtZUlkVG9Db250ZXh0W2ZyYW1lSWRdOwogICAgICAgICBpZiAo IWNvbnRleHQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2NvbnNvbGVWaWV3 LnJlbW92ZUNvbnRleHQoY29udGV4dCk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZUlkVG9D b250ZXh0W2ZyYW1lLmlkXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lSWRUb0NvbnRleHRb ZnJhbWVJZF07CiAgICAgfSwKIH0KIApAQCAtOTUsNyArOTUsNyBAQCBXZWJJbnNwZWN0b3IuRnJh bWVFdmFsdWF0aW9uQ29udGV4dC5wcm90b3R5cGUgPQogCiAgICAgZ2V0IGZyYW1lSWQoKQogICAg IHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2ZyYW1lLmlkOworICAgICAgICByZXR1cm4gdGhpcy5f ZnJhbWUuaWQKICAgICB9LAogCiAgICAgZ2V0IHVybCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtMb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtMb2cuanMKaW5kZXggNzI4ODFlN2U0ZGZlMWJiYmQ4 NDQ1ZjA3NjlkYTZjMDc0OTNjOWM2OS4uNzQzOGE2ZTUxMzAzNWQwNmViOWUwN2FiZTVjMjAzZjcy OWJlZjNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrTG9nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya0xvZy5qcwpAQCAtMzUsNyArMzUsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZyA9IGZ1 bmN0aW9uKCkKIHsKICAgICB0aGlzLl9yZXNvdXJjZXMgPSBbXTsKICAgICBXZWJJbnNwZWN0b3Iu bmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFn ZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVN0YXJ0ZWQsIHRoaXMuX29uUmVzb3VyY2VTdGFydGVkLCB0 aGlzKTsKLSAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVOYXZp Z2F0ZWQsIHRoaXMuX21haW5GcmFtZU5hdmlnYXRlZCwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9y LnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLkV2ZW50VHlwZXMuRnJhbWVOYXZpZ2F0ZWQsIHRoaXMuX2ZyYW1lTmF2aWdhdGVk LCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2cucHJvdG90eXBlID0gewpAQCAt NDcsOCArNDcsMTAgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2cucHJvdG90eXBlID0gewogICAg ICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VzOwogICAgIH0sCiAKLSAgICBfbWFpbkZyYW1lTmF2 aWdhdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICBfZnJhbWVOYXZpZ2F0ZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKKyAgICAgICAgaWYgKCFldmVudC5kYXRhLmlzTWFpbkZyYW1lKQorICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAvLyBQcmVzZXJ2ZSByZXNvdXJjZXMgZnJvbSB0aGUgbmV3 IHNlc3Npb24uCiAgICAgICAgIHZhciBvbGRSZXNvdXJjZXMgPSB0aGlzLl9yZXNvdXJjZXMuc3Bs aWNlKDAsIHRoaXMuX3Jlc291cmNlcy5sZW5ndGgpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IG9sZFJlc291cmNlcy5sZW5ndGg7ICsraSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCAyNmVmNGEwMjBlMWFkZTNk MWFkYzE0Zjk4YzljOTE2MDM4MTBkNzA0Li41OGQ2YTAzMjViOTc3MDU0MTgwNDMzNzQwMGI0OGVh YjA4ZjA4YjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwpAQCAtNjEsNyArNjEsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xv Z1ZpZXcgPSBmdW5jdGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3Vy Y2VVcGRhdGVkLCB0aGlzLl9vblJlc291cmNlVXBkYXRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVj dG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtN YW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VGaW5pc2hlZCwgdGhpcy5fb25SZXNvdXJjZVVwZGF0 ZWQsIHRoaXMpOwogCi0gICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuTWFpbkZy YW1lTmF2aWdhdGVkLCB0aGlzLl9tYWluRnJhbWVOYXZpZ2F0ZWQsIHRoaXMpOworICAgIFdlYklu c3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2aWdhdGVkLCB0aGlzLl9mcmFtZU5h dmlnYXRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuT25M b2FkLCB0aGlzLl9vbkxvYWRFdmVudEZpcmVkLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IucmVz b3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5ET01Db250ZW50TG9hZGVkLCB0aGlzLl9kb21Db250ZW50TG9hZGVk RXZlbnRGaXJlZCwgdGhpcyk7CiAKQEAgLTc5NCw4ICs3OTQsMTEgQEAgV2ViSW5zcGVjdG9yLk5l dHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcmVzZXQoKTsKICAgICB9 LAogCi0gICAgX21haW5GcmFtZU5hdmlnYXRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX2ZyYW1l TmF2aWdhdGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAgIGlmICghZXZlbnQuZGF0 YS5pc01haW5GcmFtZSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB2YXIgbG9hZGVy SWQgPSBldmVudC5kYXRhLmxvYWRlcklkOwogICAgICAgICAvLyBNYWluIGZyYW1lIGNvbW1pdHRl ZCBsb2FkLgogICAgICAgICBpZiAodGhpcy5fcHJlc2VydmVMb2dUb2dnbGUudG9nZ2xlZCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMKaW5kZXggZTNkYWI4 ZTFiOWQ4NjhiOTM4YzdlOGQ5NDQ2ZWU5ZjBmNWQxMTBiMi4uNzRlNDE5YjU5NTAzNWQzZTI5ZmVi ZjZkZjQyNzk2ZWM2OGM5MjYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9PYmplY3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9PYmplY3QuanMKQEAgLTM3LDggKzM3LDYgQEAgV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90 b3R5cGUgPSB7CiAgICAgICovCiAgICAgYWRkRXZlbnRMaXN0ZW5lcjogZnVuY3Rpb24oZXZlbnRU eXBlLCBsaXN0ZW5lciwgdGhpc09iamVjdCkKICAgICB7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0 KGxpc3RlbmVyKTsKLQogICAgICAgICBpZiAoIXRoaXMuX2xpc3RlbmVycykKICAgICAgICAgICAg IHRoaXMuX2xpc3RlbmVycyA9IHt9OwogICAgICAgICBpZiAoIXRoaXMuX2xpc3RlbmVyc1tldmVu dFR5cGVdKQpAQCAtNTMsOCArNTEsNiBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZSA9 IHsKICAgICAgKi8KICAgICByZW1vdmVFdmVudExpc3RlbmVyOiBmdW5jdGlvbihldmVudFR5cGUs IGxpc3RlbmVyLCB0aGlzT2JqZWN0KQogICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQobGlz dGVuZXIpOwotCiAgICAgICAgIGlmICghdGhpcy5fbGlzdGVuZXJzIHx8ICF0aGlzLl9saXN0ZW5l cnNbZXZlbnRUeXBlXSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIGxpc3RlbmVy cyA9IHRoaXMuX2xpc3RlbmVyc1tldmVudFR5cGVdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggY2EyYWM3 OGFkMGE3ZTMwMjQ3YTU1NDFhNzIzY2Q3MGQwNTYwODA0Ni4uMzk3YjMwOWM5YTlmMTMxODJiNTk3 ZjA1ZTI5N2FkNmY2Y2ZkNDE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC01NCw3ICs1NCw2IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzID0gewogICAgIEZyYW1lQWRk ZWQ6ICJGcmFtZUFkZGVkIiwKICAgICBGcmFtZU5hdmlnYXRlZDogIkZyYW1lTmF2aWdhdGVkIiwK ICAgICBGcmFtZURldGFjaGVkOiAiRnJhbWVEZXRhY2hlZCIsCi0gICAgTWFpbkZyYW1lTmF2aWdh dGVkOiAiTWFpbkZyYW1lTmF2aWdhdGVkIiwKICAgICBSZXNvdXJjZUFkZGVkOiAiUmVzb3VyY2VB ZGRlZCIsCiAgICAgV2lsbExvYWRDYWNoZWRSZXNvdXJjZXM6ICJXaWxsTG9hZENhY2hlZFJlc291 cmNlcyIsCiAgICAgQ2FjaGVkUmVzb3VyY2VzTG9hZGVkOiAiQ2FjaGVkUmVzb3VyY2VzTG9hZGVk IiwKQEAgLTE1Miw4ICsxNTEsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJv dG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIC8vIERpc3BhdGNoIGZyYW1lIG5hdmlnYXRl ZCBldmVudCB0byBjbGllbnRzIHByaW9yIHRvIGZpbGxpbmcgaXQgd2l0aCB0aGUgcmVzb3VyY2Vz LgogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5GcmFtZU5hdmlnYXRlZCwgeyBmcmFtZTogZnJhbWUs IGxvYWRlcklkOiBsb2FkZXJJZCwgaXNNYWluRnJhbWU6IGlzTWFpbkZyYW1lIH0pOwotICAgICAg ICBpZiAoaXNNYWluRnJhbWUpCi0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVO YXZpZ2F0ZWQsIHsgZnJhbWU6IGZyYW1lLCBsb2FkZXJJZDogbG9hZGVySWQgfSk7CiAKICAgICAg ICAgLy8gRmlsbCBmcmFtZSB3aXRoIHJldGFpbmVkIHJlc291cmNlcyAodGhlIG9uZXMgbG9hZGVk IHVzaW5nIG5ldyBsb2FkZXIpLgogICAgICAgICB2YXIgcmVzb3VyY2VzRm9yRnJhbWUgPSB0aGlz Ll9yZXNvdXJjZXNCeUZyYW1lSWRbZnJhbWUuaWRdOwpAQCAtMTg5LDcgKzE4Niw3IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkZWxl dGUgdGhpcy5fZnJhbWVJZHNbZnJhbWVJZF07CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZl bnRUeXBlcy5GcmFtZURldGFjaGVkLCBmcmFtZSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZy YW1lRGV0YWNoZWQsIGZyYW1lSWQpOwogICAgIH0sCiAKICAgICBfb25SZXNvdXJjZVN0YXJ0ZWQ6 IGZ1bmN0aW9uKGV2ZW50KQpAQCAtMzEyLDcgKzMwOSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NsZWFyUmVzb3VyY2VzKGZy YW1lSWQsIGxvYWRlclRvUHJlc2VydmVJZCk7CiAgICAgICAgIHZhciBzdWJmcmFtZXMgPSB0aGlz Ll9zdWJmcmFtZXNbZnJhbWVJZF07CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBzdWJmcmFtZXMg JiYgaSA8IHN1YmZyYW1lcy5sZW5ndGg7ICsrIGkpIHsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5 cGVzLkZyYW1lRGV0YWNoZWQsIHN1YmZyYW1lc1tpXSk7CisgICAgICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRU eXBlcy5GcmFtZURldGFjaGVkLCBzdWJmcmFtZXNbaV0uaWQpOwogICAgICAgICAgICAgdGhpcy5f Y2xlYXJDaGlsZEZyYW1lc0FuZFJlc291cmNlcyhzdWJmcmFtZXNbaV0uaWQsIGxvYWRlclRvUHJl c2VydmVJZCk7CiAgICAgICAgIH0KICAgICAgICAgZGVsZXRlIHRoaXMuX3N1YmZyYW1lc1tmcmFt ZUlkXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzCmluZGV4IDUyMDBlZDYwOTQ2ZmEzNmYyOWQ1ZWIxNTgyN2JjOTljYzMwYzYy MjUuLmIyZTNlMTNkYWFkNWU2NjVlNDhiNDZhOTU5MDJiNGE5OGE0MjA3ZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpA QCAtMTQyLDcgKzE0Miw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICB0aGlzLnNob3dSZXNvdXJjZShXZWJJbnNwZWN0b3IubWFpblJlc291 cmNlKTsKICAgICB9LAogCi0gICAgX3Jlc2V0OiBmdW5jdGlvbigpCisgICAgcmVzZXQ6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50LnJlbW92 ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJZCA9IHt9OwpA QCAtMTg5LDcgKzE4OSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lRGV0YWNo ZWQsIHRoaXMuX2ZyYW1lRGV0YWNoZWQsIHRoaXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IucmVz b3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5SZXNvdXJjZUFkZGVkLCB0aGlzLl9yZXNvdXJjZUFkZGVkLCB0aGlz KTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuQ2FjaGVkUmVzb3Vy Y2VzTG9hZGVkLCB0aGlzLl9jYWNoZWRSZXNvdXJjZXNMb2FkZWQsIHRoaXMpOwotICAgICAgICBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5XaWxsTG9hZENhY2hlZFJlc291cmNlcywg dGhpcy5fcmVzZXQsIHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9k ZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRU eXBlcy5XaWxsTG9hZENhY2hlZFJlc291cmNlcywgdGhpcy5yZXNldCwgdGhpcyk7CiAKICAgICAg ICAgZnVuY3Rpb24gcG9wdWxhdGVGcmFtZShmcmFtZUlkKQogICAgICAgICB7CkBAIC0yMjQsMTcg KzIyNCwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgX2ZyYW1lRGV0YWNoZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGZy YW1lID0gZXZlbnQuZGF0YTsKLSAgICAgICAgaWYgKCFmcmFtZS5wYXJlbnRJZCkgewotICAgICAg ICAgICAgLy8gUmVzZXQgb24gbWFpbiBmcmFtZSBkZXRhY2gKLSAgICAgICAgICAgIHRoaXMuX3Jl c2V0KCk7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IHRoaXMu X3RyZWVFbGVtZW50Rm9yRnJhbWVJZFtmcmFtZS5pZF07CisgICAgICAgIHZhciBmcmFtZUlkID0g ZXZlbnQuZGF0YTsKKyAgICAgICAgdmFyIGZyYW1lVHJlZUVsZW1lbnQgPSB0aGlzLl90cmVlRWxl bWVudEZvckZyYW1lSWRbZnJhbWVJZF07CiAgICAgICAgIGlmICghZnJhbWVUcmVlRWxlbWVudCkK ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBkZWxldGUgdGhpcy5fdHJlZUVsZW1lbnRG b3JGcmFtZUlkW2ZyYW1lLmlkXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3RyZWVFbGVtZW50Rm9y RnJhbWVJZFtmcmFtZUlkXTsKICAgICAgICAgaWYgKGZyYW1lVHJlZUVsZW1lbnQucGFyZW50KQog ICAgICAgICAgICAgZnJhbWVUcmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQoZnJhbWVUcmVl RWxlbWVudCk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZjI2ZGQzOWNjZWM1ZjJlZDJjNTNkZTEyNjIwYTBi ODU5YzlhNzFmMC4uOGIwOGMxNzlkNjQxOTg3ZTRkYTNkMjgyNTQzMWMyZmVmNWM5Y2JmMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKQEAgLTE2NSw3ICsxNjUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rp b24ocHJlc2VudGF0aW9uTW9kZWwpCiAKICAgICB0aGlzLl9kZWJ1Z2dlckVuYWJsZWQgPSBQcmVm ZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQ7CiAKLSAgICB0aGlzLl9yZXNldChmYWxzZSk7 CisgICAgdGhpcy5yZXNldCgpOwogCiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRGVidWdnZXJX YXNFbmFibGVkLCB0aGlzLl9kZWJ1Z2dlcldhc0VuYWJsZWQsIHRoaXMpOwogICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwuRXZlbnRzLkRlYnVnZ2VyV2FzRGlzYWJsZWQsIHRoaXMuX2RlYnVnZ2VyV2FzRGlzYWJs ZWQsIHRoaXMpOwpAQCAtMTgyLDcgKzE4Miw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwg PSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LkV2ZW50cy5DYWxsRnJhbWVTZWxlY3RlZCwgdGhpcy5fY2FsbEZyYW1lU2VsZWN0ZWQsIHRoaXMp OwogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNvbnNvbGVDb21tYW5kRXZhbHVh dGVkSW5TZWxlY3RlZENhbGxGcmFtZSwgdGhpcy5fY29uc29sZUNvbW1hbmRFdmFsdWF0ZWRJblNl bGVjdGVkQ2FsbEZyYW1lLCB0aGlzKTsKICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50 cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdGhpcy5fZXhlY3V0aW9uTGluZUNoYW5nZWQsIHRoaXMp OwotICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUmVzZXQsIHRoaXMu X3Jlc2V0LmJpbmQodGhpcywgZmFsc2UpKTsKICAgICAKICAgICB2YXIgZW5hYmxlRGVidWdnZXIg PSBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQgfHwgV2ViSW5zcGVjdG9yLnNldHRp bmdzLmRlYnVnZ2VyRW5hYmxlZC5nZXQoKTsKICAgICBpZiAoZW5hYmxlRGVidWdnZXIpCkBAIC01 MjcsNyArNTI2LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fZGVidWdnZXJFbmFibGVkID0gdHJ1 ZTsKLSAgICAgICAgdGhpcy5fcmVzZXQodHJ1ZSk7CisgICAgICAgIHRoaXMucmVzZXQodHJ1ZSk7 CiAgICAgfSwKIAogICAgIF9kZWJ1Z2dlcldhc0Rpc2FibGVkOiBmdW5jdGlvbigpCkBAIC01MzYs MTAgKzUzNSwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl9kZWJ1Z2dlckVuYWJsZWQgPSBmYWxz ZTsKLSAgICAgICAgdGhpcy5fcmVzZXQodHJ1ZSk7CisgICAgICAgIHRoaXMucmVzZXQodHJ1ZSk7 CiAgICAgfSwKIAotICAgIF9yZXNldDogZnVuY3Rpb24ocHJlc2VydmVJdGVtcykKKyAgICByZXNl dDogZnVuY3Rpb24ocHJlc2VydmVJdGVtcykKICAgICB7CiAgICAgICAgIHRoaXMudmlzaWJsZVZp ZXcgPSBudWxsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1dvcmtlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1dvcmtlck1hbmFnZXIuanMKaW5kZXggMDU2MjExMmExYTcyZWI3YTlkYWI0M2Y5NzE5NWZkNDlh MDRlZTllMi4uNjFlYzY0NDRmZjE4YTllM2QxZjZhMjBiMTc0YzA4YjcxNzQ2YTBiNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya2VyTWFuYWdlci5q cwpAQCAtNjcsOCArNjcsNiBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5sb2FkQ29tcGxl dGVkID0gZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLldvcmtlck1hbmFn ZXIuX2NhbGN1bGF0ZVdvcmtlckluc3BlY3RvclRpdGxlKCk7CiAgICAgfQotCi0gICAgV2ViSW5z cGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuTWFpbkZyYW1lTmF2aWdhdGVkLCBXZWJJbnNwZWN0 b3Iud29ya2VyTWFuYWdlci5fbWFpbkZyYW1lTmF2aWdhdGVkLCBXZWJJbnNwZWN0b3Iud29ya2Vy TWFuYWdlcik7CiB9CiAKIFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLl9pbml0aWFsaXplRGVk aWNhdGVkV29ya2VyRnJvbnRlbmQgPSBmdW5jdGlvbih3b3JrZXJJZCkKQEAgLTE4MSw3ICsxNzks NyBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB3b3JrZXJJbnNwZWN0b3JXaW5kb3cuY2xvc2UoKTsKICAgICB9LAogCi0gICAgX21haW5GcmFt ZU5hdmlnYXRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIGZvciAodmFyIHdvcmtlcklkIGluIHRoaXMuX3dvcmtlcklkVG9XaW5kb3cpCiAg ICAgICAgICAgICB0aGlzLmNsb3NlV29ya2VySW5zcGVjdG9yKHdvcmtlcklkKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNTc4Yzc5 ODIzMWYxMGY0ZTZjMzdhZTZiN2UwNDNiMzc4M2RhNDBjYy4uMzJlNGRjZmVkZWQzMDZmMWVlYWIz ZjMzNWI1M2E3MjRiMjY4Y2M5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTY3MSw2ICs2NzEsMjQgQEAgV2ViSW5zcGVjdG9yLnN0 YXJ0VXNlckluaXRpYXRlZERlYnVnZ2luZyA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3Iu ZGVidWdnZXJNb2RlbC5lbmFibGVEZWJ1Z2dlcigpOwogfQogCitXZWJJbnNwZWN0b3IucmVzZXQg PSBmdW5jdGlvbigpCit7CisgICAgdGhpcy5kZWJ1Z2dlck1vZGVsLnJlc2V0KCk7CisgICAgZm9y ICh2YXIgcGFuZWxOYW1lIGluIHRoaXMucGFuZWxzKSB7CisgICAgICAgIHZhciBwYW5lbCA9IHRo aXMucGFuZWxzW3BhbmVsTmFtZV07CisgICAgICAgIGlmICgicmVzZXQiIGluIHBhbmVsKQorICAg ICAgICAgICAgcGFuZWwucmVzZXQoKTsKKyAgICB9CisKKyAgICB0aGlzLmRvbUFnZW50LmhpZGVE T01Ob2RlSGlnaGxpZ2h0KCk7CisKKyAgICBpZiAoIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5wcmVz ZXJ2ZUNvbnNvbGVMb2cuZ2V0KCkpCisgICAgICAgIHRoaXMuY29uc29sZS5jbGVhck1lc3NhZ2Vz KCk7CisgICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIubm90aWZ5SW5zcGVjdG9yUmVzZXQoKTsKKyAg ICBpZiAodGhpcy53b3JrZXJNYW5hZ2VyKQorICAgICAgICB0aGlzLndvcmtlck1hbmFnZXIucmVz ZXQoKTsKK30KKwogV2ViSW5zcGVjdG9yLmJyaW5nVG9Gcm9udCA9IGZ1bmN0aW9uKCkKIHsKICAg ICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7Cg==