69628 2011-10-07 08:01:14 -0700 Web Inspector: add timeline panel to the compilation. 2011-10-07 08:35:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 480003 0 pfeldman 2011-10-07 08:01:14 -0700 Patch to follow. 480009 1 110148 pfeldman 2011-10-07 08:11:05 -0700 Created attachment 110148 Patch 480018 2 pfeldman 2011-10-07 08:35:29 -0700 Committed r96939: <http://trac.webkit.org/changeset/96939> 110148 2011-10-07 08:11:05 -0700 2011-10-07 08:26:54 -0700 Patch bug-69628-20111007191103.patch text/plain 27328 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY5MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYjZhNTgyNTE0ZGU2OWZm YWY5ZTYxNDYxOGRiZDI2ZWUzYjZhYmY3Li42MWNiOTI2NGEyYmIxZTU2Zjk4Y2JjYTQ4YzEzYjY5 NDNjMDQ3MTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIgQEAKIDIwMTEtMTAtMDcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGFkZCB0aW1lbGluZSBwYW5lbCB0byB0aGUgY29tcGlsYXRpb24uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTYyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQt ZW5kLnNoOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclRyZWVFbGVtZW50 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUdyaWQuanM6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX2NyZWF0ZVRpbWVsaW5lQ2F0ZWdv cnlTdGF0dXNCYXJDaGVja2JveCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90 eXBlLl9jcmVhdGVFdmVudERpdmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLl9hZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZmluZFBhcmVudFJlY29yZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2lubmVyQWRkUmVjb3JkVG9U aW1lbGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUu dXBkYXRlTWFpblZpZXdXaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5l bC5wcm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFu ZWwucHJvdG90eXBlLl93aW5kb3dDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaFJlY29yZHMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlLl9vbkNsaWNrKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlLl9nZW5l cmF0ZVBvcHVwQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5G b3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlLl9nZXRSZWNvcmREZXRhaWxzKToKKworMjAxMS0xMC0w NyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIElu c3BlY3RvcjogbWFrZSBTY3JpcHRzUGFuZWwgY29tcGlsZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk2MjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCmluZGV4IDIwNmViNTVkYjcxZjE0N2FjMzYwYmY3 NzA2MjQ2M2I0MTczNzEyN2QuLjM3ZmRlZGEyNTc1NGVlNTFhOGIwMjFhM2ViMjk3Yzc3OTQ2NjI5 Y2YgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVu ZC5zaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gK QEAgLTE1NywxMyArMTU3LDE0IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0t Y29tcGlsYXRpb25fbGV2ZWwgU0lNUExFX09QVElNSVpBVElPTlMgLS13YXJuCiAgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJzU2lkZWJhclBhbmUu anMgXAogICAgIC0tbW9kdWxlIGpzbW9kdWxlX2NvbnNvbGU6Mjpqc21vZHVsZV9pbnNwZWN0b3Jf dmlld3MgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZVZpZXcuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVBhbmVsLmpzCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlUGFuZWwuanMgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxl X3RpbWVsaW5lOjI6anNtb2R1bGVfaW5zcGVjdG9yX3ZpZXdzIFwKKyAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzIFwK KyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMKKyAgICAKIAogIyBUbyBiZSBjb21waWxlZC4uLgotIyBbVGltZWxpbmVdCi0jIFRp bWVsaW5lT3ZlcnZpZXdQYW5lCi0jIFRpbWVsaW5lUGFuZWwKLSMKKyMgCiAjIFtQcm9maWxlcl0K ICMgQm90dG9tVXBQcm9maWxlRGF0YUdyaWRUcmVlCiAjIERldGFpbGVkSGVhcHNob3RHcmlkTm9k ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJh clRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRl YmFyVHJlZUVsZW1lbnQuanMKaW5kZXggNDYwYTgyM2VhZTBhYmE5MTBjMzIyYjU1Mjg4ZTcwNjNj ZGRiYjEwOS4uMjExMzI1ODBhM2FmMDRlZGM0ZDA0YzcyNGM1NDA2MmJmZTk4YTFlNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVHJlZUVsZW1l bnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVHJl ZUVsZW1lbnQuanMKQEAgLTcwLDEwICs3MCwxMyBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhclNlY3Rp b25UcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gVHJlZUVsZW1lbnQucHJvdG90eQog LyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtUcmVlRWxlbWVudH0KKyAqIEBwYXJh bSB7c3RyaW5nPX0gc3VidGl0bGUKKyAqIEBwYXJhbSB7T2JqZWN0PX0gcmVwcmVzZW50ZWRPYmpl Y3QKKyAqIEBwYXJhbSB7Ym9vbGVhbj19IGhhc0NoaWxkcmVuCiAgKi8KIFdlYkluc3BlY3Rvci5T aWRlYmFyVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihjbGFzc05hbWUsIHRpdGxlLCBzdWJ0aXRsZSwg cmVwcmVzZW50ZWRPYmplY3QsIGhhc0NoaWxkcmVuKQogewotICAgIFRyZWVFbGVtZW50LmNhbGwo dGhpcywgIiIsIHJlcHJlc2VudGVkT2JqZWN0IHx8IHt9LCBoYXNDaGlsZHJlbik7CisgICAgVHJl ZUVsZW1lbnQuY2FsbCh0aGlzLCAiIiwgcmVwcmVzZW50ZWRPYmplY3QsIGhhc0NoaWxkcmVuKTsK IAogICAgIGlmIChoYXNDaGlsZHJlbikgewogICAgICAgICB0aGlzLmRpc2Nsb3N1cmVCdXR0b24g PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUdyaWQuanMKaW5kZXggMzUyMGZiOTIzZjQ1 YzFhNmQzNWUzOWYyNjYyNDczOTdiYjE2NzhiOC4uNWI3ZjMyM2Q2NGM5YTFhM2U4NGI2ODA2ZDYx YjJmNmNjNmEyZjMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUdyaWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUdyaWQuanMKQEAgLTU4LDcgKzU4LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9pdGVtc0dyYXBoc0Vs ZW1lbnQ7CiAgICAgfSwKIAotCisgICAgLyoqCisgICAgICogQHBhcmFtIHtudW1iZXI9fSBwYWRk aW5nTGVmdAorICAgICAqLwogICAgIHVwZGF0ZURpdmlkZXJzOiBmdW5jdGlvbihmb3JjZSwgY2Fs Y3VsYXRvciwgcGFkZGluZ0xlZnQpCiAgICAgewogICAgICAgICB2YXIgZGl2aWRlckNvdW50ID0g TWF0aC5yb3VuZCh0aGlzLl9kaXZpZGVyc0VsZW1lbnQub2Zmc2V0V2lkdGggLyA2NCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZp ZXdQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92 ZXJ2aWV3UGFuZS5qcwppbmRleCA4MDBkMzg4OGYzYzNmODhkYTk4NDQ5Mjk2Y2U2MDZjMDM5MzJh ZDM0Li4wNzMzZmU4ZDBlMmU0NDU1ZGJjMTQxMWEyMDI0MjY4ZDhkYmI0ZTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5l LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVy dmlld1BhbmUuanMKQEAgLTI4LDYgKzI4LDEwIEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8q KgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KKyAq LwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lID0gZnVuY3Rpb24oY2F0ZWdvcmll cykKIHsKICAgICB0aGlzLl9jYXRlZ29yaWVzID0gY2F0ZWdvcmllczsKQEAgLTM2MSw3ICszNjUs NyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAg ICAgICBjaGVja0VsZW1lbnQudHlwZSA9ICJjaGVja2JveCI7CiAgICAgICAgIGNoZWNrRWxlbWVu dC5jbGFzc05hbWUgPSAidGltZWxpbmUtY2F0ZWdvcnktY2hlY2tib3giOwogICAgICAgICBjaGVj a0VsZW1lbnQuY2hlY2tlZCA9IHRydWU7Ci0gICAgICAgIGNoZWNrRWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJjbGljayIsIG9uQ2hlY2tib3hDbGlja2VkKTsKKyAgICAgICAgY2hlY2tFbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgb25DaGVja2JveENsaWNrZWQsIGZhbHNlKTsKICAg ICAgICAgbGFiZWwuYXBwZW5kQ2hpbGQoY2hlY2tFbGVtZW50KTsKIAogICAgICAgICB2YXIgdHlw ZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CkBAIC0zNzcsNyArMzgx LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKIAog V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAotCisvKioKKyAqIEBjb25zdHJ1Y3Rvcgor ICovCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0NhbGN1bGF0b3IgPSBmdW5jdGlvbigp CiB7CiB9CkBAIC00MjAsNyArNDI2LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdD YWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKLQorLyoqCisgKiBAY29uc3RydWN0 b3IKKyAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlHcmFwaCA9IGZ1bmN0aW9uKGNh dGVnb3J5LCBpc0V2ZW4pCiB7CiAgICAgdGhpcy5fY2F0ZWdvcnkgPSBjYXRlZ29yeTsKQEAgLTQ2 Miw2ICs0NzAsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeUdyYXBoLnByb3RvdHlw ZSA9IHsKICAgICB9CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rv ci5UaW1lbGluZVBhbmVsLldpbmRvd1NlbGVjdG9yID0gZnVuY3Rpb24ocGFyZW50LCBwb3NpdGlv biwgZXZlbnQpCiB7CiAgICAgdGhpcy5fc3RhcnRQb3NpdGlvbiA9IHBvc2l0aW9uOwpAQCAtNTA2 LDYgKzUxNyw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLldpbmRvd1NlbGVjdG9yLnBy b3RvdHlwZSA9IHsKICAgICB9CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYklu c3BlY3Rvci5IZWFwR3JhcGggPSBmdW5jdGlvbigpIHsKICAgICB0aGlzLl9jYW52YXMgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJjYW52YXMiKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDM2OTgxYzI4YTUwOTc2 OWRlYjk4ODVmOGZkMWY5ZWJlNzYxYTI0YzMuLjZhN2FhMmRlZTVjNzhhMTE3NzczZTNiYWE1M2Nl YTNhNTY1ZDQ0ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTI4LDYgKzI4LDEwIEBACiAgKiBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog ICovCiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlBh bmVsfQorICovCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKIHsKICAg ICBXZWJJbnNwZWN0b3IuUGFuZWwuY2FsbCh0aGlzLCAidGltZWxpbmUiKTsKQEAgLTM0MCw3ICsz NDQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9ICIgcmVzb3VyY2VzLXJlZC1kaXZpZGVyIjsK ICAgICAgICAgZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLlRpbWVTdGFtcCkg ewogICAgICAgICAgICAgZXZlbnREaXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNlcy1vcmFu Z2UtZGl2aWRlciI7Ci0gICAgICAgICAgICBldmVudERpdmlkZXJQYWRkaW5nLnRpdGxlID0gcmVj b3JkLmRhdGEubWVzc2FnZTsKKyAgICAgICAgICAgIGV2ZW50RGl2aWRlclBhZGRpbmcudGl0bGUg PSByZWNvcmQuZGF0YVsibWVzc2FnZSJdOwogICAgICAgICB9CiAgICAgICAgIGV2ZW50RGl2aWRl clBhZGRpbmcuYXBwZW5kQ2hpbGQoZXZlbnREaXZpZGVyKTsKICAgICAgICAgcmV0dXJuIGV2ZW50 RGl2aWRlclBhZGRpbmc7CkBAIC0zOTAsMTggKzM5NCwxOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2FkZFJlY29yZFRvVGltZWxpbmU6IGZ1bmN0aW9u KHJlY29yZCkKICAgICB7CiAgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gV2ViSW5zcGVjdG9y LlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5SZXNvdXJjZVNlbmRSZXF1ZXN0KSB7Ci0gICAgICAg ICAgICB2YXIgaXNNYWluUmVzb3VyY2UgPSAocmVjb3JkLmRhdGEucmVxdWVzdElkID09PSBXZWJJ bnNwZWN0b3IubWFpblJlc291cmNlLnJlcXVlc3RJZCk7Ci0gICAgICAgICAgICBpZiAoaXNNYWlu UmVzb3VyY2UgJiYgdGhpcy5fbWFpblJlcXVlc3RJZCAhPT0gcmVjb3JkLmRhdGEucmVxdWVzdElk KSB7CisgICAgICAgICAgICB2YXIgaXNNYWluUmVzb3VyY2UgPSAocmVjb3JkLmRhdGFbInJlcXVl c3RJZCJdID09PSBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnJlcXVlc3RJZCk7CisgICAgICAg ICAgICBpZiAoaXNNYWluUmVzb3VyY2UgJiYgdGhpcy5fbWFpblJlcXVlc3RJZCAhPT0gcmVjb3Jk LmRhdGFbInJlcXVlc3RJZCJdKSB7CiAgICAgICAgICAgICAgICAgLy8gV2UgYXJlIGxvYWRpbmcg bmV3IG1haW4gcmVzb3VyY2UgLT4gY2xlYXIgdGhlIHBhbmVsLiBDaGVjayBhYm92ZSBpcyBuZWNl c3Nhcnkgc2luY2UKICAgICAgICAgICAgICAgICAvLyB0aGVyZSBtYXkgYmUgc2V2ZXJhbCByZXNv dXJjZSBsb2FkcyB3aXRoIG1haW4gcmVzb3VyY2UgbWFya2VyIHVwb24gcmVkaXJlY3RzLCByZWRp cmVjdHMgYXJlIHJlcG9ydGVkIHdpdGgKICAgICAgICAgICAgICAgICAvLyB0aGUgb3JpZ2luYWwg cmVxdWVzdCBpZC4KLSAgICAgICAgICAgICAgICB0aGlzLl9tYWluUmVxdWVzdElkID0gcmVjb3Jk LmRhdGEucmVxdWVzdElkOworICAgICAgICAgICAgICAgIHRoaXMuX21haW5SZXF1ZXN0SWQgPSBy ZWNvcmQuZGF0YVsicmVxdWVzdElkIl07CiAgICAgICAgICAgICAgICAgdGhpcy5fY2xlYXJQYW5l bCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHRoaXMuX21vZGVsLl9hZGRS ZWNvcmQocmVjb3JkKTsKICAgICAgICAgdGhpcy5faW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKHJl Y29yZCwgdGhpcy5fcm9vdFJlY29yZCk7Ci0gICAgICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVzaCgp OworICAgICAgICB0aGlzLl9zY2hlZHVsZVJlZnJlc2goZmFsc2UpOwogICAgIH0sCiAKICAgICBf ZmluZFBhcmVudFJlY29yZDogZnVuY3Rpb24ocmVjb3JkKQpAQCAtNDExLDExICs0MTUsMTEgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAocmVj b3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIHx8CiAgICAg ICAgICAgICByZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuUmVzb3VyY2VGaW5pc2ggfHwKICAg ICAgICAgICAgIHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5SZXNvdXJjZVJlY2VpdmVkRGF0 YSkKLSAgICAgICAgICAgIHBhcmVudFJlY29yZCA9IHRoaXMuX3NlbmRSZXF1ZXN0UmVjb3Jkc1ty ZWNvcmQuZGF0YS5yZXF1ZXN0SWRdOworICAgICAgICAgICAgcGFyZW50UmVjb3JkID0gdGhpcy5f c2VuZFJlcXVlc3RSZWNvcmRzW3JlY29yZC5kYXRhWyJyZXF1ZXN0SWQiXV07CiAgICAgICAgIGVs c2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5UaW1lckZpcmUpCi0gICAgICAgICAg ICBwYXJlbnRSZWNvcmQgPSB0aGlzLl90aW1lclJlY29yZHNbcmVjb3JkLmRhdGEudGltZXJJZF07 CisgICAgICAgICAgICBwYXJlbnRSZWNvcmQgPSB0aGlzLl90aW1lclJlY29yZHNbcmVjb3JkLmRh dGFbInRpbWVySWQiXV07CiAgICAgICAgIGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRU eXBlcy5SZXNvdXJjZVNlbmRSZXF1ZXN0KQotICAgICAgICAgICAgcGFyZW50UmVjb3JkID0gdGhp cy5fc2NoZWR1bGVkUmVzb3VyY2VSZXF1ZXN0c1tyZWNvcmQuZGF0YS51cmxdOworICAgICAgICAg ICAgcGFyZW50UmVjb3JkID0gdGhpcy5fc2NoZWR1bGVkUmVzb3VyY2VSZXF1ZXN0c1tyZWNvcmQu ZGF0YVsidXJsIl1dOwogICAgICAgICByZXR1cm4gcGFyZW50UmVjb3JkOwogICAgIH0sCiAKQEAg LTQyNSw3ICs0MjksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJl Y29yZFR5cGU7CiAKICAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5SZWdp c3RlckFuaW1hdGlvbkZyYW1lQ2FsbGJhY2spIHsKLSAgICAgICAgICAgIHRoaXMuX3JlZ2lzdGVy ZWRBbmltYXRpb25DYWxsYmFja1JlY29yZHNbcmVjb3JkLmRhdGEuaWRdID0gcmVjb3JkOworICAg ICAgICAgICAgdGhpcy5fcmVnaXN0ZXJlZEFuaW1hdGlvbkNhbGxiYWNrUmVjb3Jkc1tyZWNvcmQu ZGF0YVsiaWQiXV0gPSByZWNvcmQ7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApA QCAtNDQ0LDEwICs0NDgsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgICAgIHZhciBjaGlsZHJlbiA9IHJlY29yZC5jaGlsZHJlbjsKICAgICAgICAg dmFyIHNjcmlwdERldGFpbHM7Ci0gICAgICAgIGlmIChyZWNvcmQuZGF0YSAmJiByZWNvcmQuZGF0 YS5zY3JpcHROYW1lKSB7CisgICAgICAgIGlmIChyZWNvcmQuZGF0YSAmJiByZWNvcmQuZGF0YVsi c2NyaXB0TmFtZSJdKSB7CiAgICAgICAgICAgICBzY3JpcHREZXRhaWxzID0gewotICAgICAgICAg ICAgICAgIHNjcmlwdE5hbWU6IHJlY29yZC5kYXRhLnNjcmlwdE5hbWUsCi0gICAgICAgICAgICAg ICAgc2NyaXB0TGluZTogcmVjb3JkLmRhdGEuc2NyaXB0TGluZQorICAgICAgICAgICAgICAgIHNj cmlwdE5hbWU6IHJlY29yZC5kYXRhWyJzY3JpcHROYW1lIl0sCisgICAgICAgICAgICAgICAgc2Ny aXB0TGluZTogcmVjb3JkLmRhdGFbInNjcmlwdExpbmUiXQogICAgICAgICAgICAgfQogICAgICAg ICB9OwogCkBAIC00NTUsOCArNDU5LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICAgICAgdmFyIGNoaWxkUmVjb3JkID0gY2hpbGRyZW5bMF07CiAg ICAgICAgICAgICBpZiAoY2hpbGRSZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuRnVuY3Rpb25D YWxsKSB7CiAgICAgICAgICAgICAgICAgc2NyaXB0RGV0YWlscyA9IHsKLSAgICAgICAgICAgICAg ICAgICAgc2NyaXB0TmFtZTogY2hpbGRSZWNvcmQuZGF0YS5zY3JpcHROYW1lLAotICAgICAgICAg ICAgICAgICAgICBzY3JpcHRMaW5lOiBjaGlsZFJlY29yZC5kYXRhLnNjcmlwdExpbmUKKyAgICAg ICAgICAgICAgICAgICAgc2NyaXB0TmFtZTogY2hpbGRSZWNvcmQuZGF0YVsic2NyaXB0TmFtZSJd LAorICAgICAgICAgICAgICAgICAgICBzY3JpcHRMaW5lOiBjaGlsZFJlY29yZC5kYXRhWyJzY3Jp cHRMaW5lIl0KICAgICAgICAgICAgICAgICB9OwogICAgICAgICAgICAgICAgIGNoaWxkcmVuID0g Y2hpbGRSZWNvcmQuY2hpbGRyZW4uY29uY2F0KGNoaWxkcmVuLnNsaWNlKDEpKTsKICAgICAgICAg ICAgIH0KQEAgLTQ3OSw3ICs0ODMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGZvcm1hdHRlZFJlY29yZC5fY2FsY3VsYXRlQWdncmVnYXRlZFN0 YXRzKHRoaXMuY2F0ZWdvcmllcyk7CiAKICAgICAgICAgaWYgKGNvbm5lY3RlZFRvT2xkUmVjb3Jk KSB7Ci0gICAgICAgICAgICB2YXIgcmVjb3JkID0gZm9ybWF0dGVkUmVjb3JkOworICAgICAgICAg ICAgcmVjb3JkID0gZm9ybWF0dGVkUmVjb3JkOwogICAgICAgICAgICAgZG8gewogICAgICAgICAg ICAgICAgIHZhciBwYXJlbnQgPSByZWNvcmQucGFyZW50OwogICAgICAgICAgICAgICAgIHBhcmVu dC5fY3B1VGltZSArPSBmb3JtYXR0ZWRSZWNvcmQuX2NwdVRpbWU7CkBAIC01MDgsMTQgKzUxMiwx NCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgdXBkYXRl TWFpblZpZXdXaWR0aDogZnVuY3Rpb24od2lkdGgpCiAgICAgewogICAgICAgICB0aGlzLl9jb250 YWluZXJDb250ZW50RWxlbWVudC5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwotICAgICAgICB0 aGlzLl9zY2hlZHVsZVJlZnJlc2goKTsKKyAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKGZh bHNlKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdQYW5lLnVwZGF0ZU1haW5WaWV3V2lkdGgod2lk dGgpOwogICAgIH0sCiAKICAgICBvblJlc2l6ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAg dGhpcy5fY2xvc2VSZWNvcmREZXRhaWxzKCk7Ci0gICAgICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVz aCgpOworICAgICAgICB0aGlzLl9zY2hlZHVsZVJlZnJlc2goZmFsc2UpOwogICAgIH0sCiAKICAg ICBfY3JlYXRlUm9vdFJlY29yZDogZnVuY3Rpb24oKQpAQCAtNTc2LDcgKzU4MCw3IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfd2luZG93Q2hhbmdlZDog ZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fY2xvc2VSZWNvcmREZXRhaWxzKCk7Ci0g ICAgICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVzaCgpOworICAgICAgICB0aGlzLl9zY2hlZHVsZVJl ZnJlc2goZmFsc2UpOwogICAgIH0sCiAKICAgICBfc2NoZWR1bGVSZWZyZXNoOiBmdW5jdGlvbihw cmVzZXJ2ZUJvdW5kYXJpZXMpCkBAIC02MjEsNiArNjI1LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLmNhbGN1bGF0 ZVdpbmRvdygpOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBw YXJlbnRJc0NvbGxhcHNlZAorICAgICAqLwogICAgIF9hZGRUb1JlY29yZHNXaW5kb3c6IGZ1bmN0 aW9uKHJlY29yZCwgcmVjb3Jkc1dpbmRvdywgcGFyZW50SXNDb2xsYXBzZWQpCiAgICAgewogICAg ICAgICBpZiAoIXRoaXMuX2NhbGN1bGF0b3IuX3Nob3dTaG9ydEV2ZW50cyAmJiAhcmVjb3JkLmlz TG9uZygpKQpAQCAtNjk5LDcgKzcwNiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fc2lkZWJhckxpc3RFbGVtZW50 LmFwcGVuZENoaWxkKGxpc3RSb3dFbGVtZW50KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgaWYgKCFncmFwaFJvd0VsZW1lbnQpIHsKLSAgICAgICAgICAgICAgICAgICAgZ3Jh cGhSb3dFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93KHRo aXMuX2l0ZW1zR3JhcGhzRWxlbWVudCwgc2NoZWR1bGVSZWZyZXNoQ2FsbGJhY2ssIHJvd0hlaWdo dCkuZWxlbWVudDsKKyAgICAgICAgICAgICAgICAgICAgZ3JhcGhSb3dFbGVtZW50ID0gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93KHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVu dCwgc2NoZWR1bGVSZWZyZXNoQ2FsbGJhY2spLmVsZW1lbnQ7CiAgICAgICAgICAgICAgICAgICAg IHRoaXMuX2dyYXBoUm93c0VsZW1lbnQuYXBwZW5kQ2hpbGQoZ3JhcGhSb3dFbGVtZW50KTsKICAg ICAgICAgICAgICAgICB9CiAKQEAgLTc5MCw2ICs3OTcsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlOwogCisvKioKKyAq IEBjb25zdHJ1Y3RvcgorICovCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeSA9IGZ1bmN0 aW9uKG5hbWUsIHRpdGxlLCBjb2xvcikKIHsKICAgICB0aGlzLm5hbWUgPSBuYW1lOwpAQCAtNzk3 LDYgKzgwNyw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5ID0gZnVuY3Rpb24obmFt ZSwgdGl0bGUsIGNvbG9yKQogICAgIHRoaXMuY29sb3IgPSBjb2xvcjsKIH0KIAorLyoqCisgKiBA Y29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvciA9IGZ1bmN0 aW9uKCkKIHsKICAgICB0aGlzLnJlc2V0KCk7CkBAIC04NjEsNyArODc0LDkgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi0KKy8qKgor ICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZExpc3RSb3cg PSBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CkBAIC05MTYsNiArOTMxLDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk TGlzdFJvdy5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCisvKioKKyAqIEBjb25zdHJ1Y3Rvcgor ICovCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRHcmFwaFJvdyA9IGZ1bmN0aW9uKGdyYXBo Q29udGFpbmVyLCBzY2hlZHVsZVJlZnJlc2gpCiB7CiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CkBAIC05NjQsNyArOTgyLDcgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlID0gewogICAgIF9vbkNsaWNrOiBmdW5j dGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3JlY29yZC5jb2xsYXBzZWQgPSAhdGhp cy5fcmVjb3JkLmNvbGxhcHNlZDsKLSAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKCk7Cisg ICAgICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVzaChmYWxzZSk7CiAgICAgfSwKIAogICAgIGRpc3Bv c2U6IGZ1bmN0aW9uKCkKQEAgLTk3NCw2ICs5OTIsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRHcmFwaFJvdy5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCisvKioKKyAqIEBjb25zdHJ1 Y3RvcgorICovCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQgPSBm dW5jdGlvbihyZWNvcmQsIHBhcmVudFJlY29yZCwgcGFuZWwsIHNjcmlwdERldGFpbHMpCiB7CiAg ICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsKQEAgLTk5NCwxOSArMTAxNSwxOSBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQgPSBmdW5jdGlvbihyZWNvcmQsIHBhcmVu dFJlY29yZCwgcGFuZQogICAgICAgICB0aGlzLnN0YWNrVHJhY2UgPSByZWNvcmQuc3RhY2tUcmFj ZTsKICAgICB0aGlzLnRvdGFsSGVhcFNpemUgPSByZWNvcmQudG90YWxIZWFwU2l6ZTsKICAgICB0 aGlzLnVzZWRIZWFwU2l6ZSA9IHJlY29yZC51c2VkSGVhcFNpemU7Ci0gICAgaWYgKHJlY29yZC5k YXRhICYmIHJlY29yZC5kYXRhLnVybCkKLSAgICAgICAgdGhpcy51cmwgPSByZWNvcmQuZGF0YS51 cmw7CisgICAgaWYgKHJlY29yZC5kYXRhICYmIHJlY29yZC5kYXRhWyJ1cmwiXSkKKyAgICAgICAg dGhpcy51cmwgPSByZWNvcmQuZGF0YVsidXJsIl07CiAgICAgaWYgKHNjcmlwdERldGFpbHMpIHsK ICAgICAgICAgdGhpcy5zY3JpcHROYW1lID0gc2NyaXB0RGV0YWlscy5zY3JpcHROYW1lOwogICAg ICAgICB0aGlzLnNjcmlwdExpbmUgPSBzY3JpcHREZXRhaWxzLnNjcmlwdExpbmU7CiAgICAgfQog ICAgIC8vIE1ha2UgcmVzb3VyY2UgcmVjZWl2ZSByZWNvcmQgbGFzdCBzaW5jZSByZXF1ZXN0IHdh cyBzZW50OyBtYWtlIGZpbmlzaCByZWNvcmQgbGFzdCBzaW5jZSByZXNwb25zZSByZWNlaXZlZC4K ICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLlJlc291cmNlU2VuZFJlcXVlc3Qp IHsKLSAgICAgICAgcGFuZWwuX3NlbmRSZXF1ZXN0UmVjb3Jkc1tyZWNvcmQuZGF0YS5yZXF1ZXN0 SWRdID0gdGhpczsKKyAgICAgICAgcGFuZWwuX3NlbmRSZXF1ZXN0UmVjb3Jkc1tyZWNvcmQuZGF0 YVsicmVxdWVzdElkIl1dID0gdGhpczsKICAgICB9IGVsc2UgaWYgKHJlY29yZC50eXBlID09PSBy ZWNvcmRUeXBlcy5TY2hlZHVsZVJlc291cmNlUmVxdWVzdCkgewotICAgICAgICBwYW5lbC5fc2No ZWR1bGVkUmVzb3VyY2VSZXF1ZXN0c1tyZWNvcmQuZGF0YS51cmxdID0gdGhpczsKKyAgICAgICAg cGFuZWwuX3NjaGVkdWxlZFJlc291cmNlUmVxdWVzdHNbcmVjb3JkLmRhdGFbInVybCJdXSA9IHRo aXM7CiAgICAgfSBlbHNlIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuUmVzb3VyY2VS ZWNlaXZlUmVzcG9uc2UpIHsKLSAgICAgICAgdmFyIHNlbmRSZXF1ZXN0UmVjb3JkID0gcGFuZWwu X3NlbmRSZXF1ZXN0UmVjb3Jkc1tyZWNvcmQuZGF0YS5yZXF1ZXN0SWRdOworICAgICAgICB2YXIg c2VuZFJlcXVlc3RSZWNvcmQgPSBwYW5lbC5fc2VuZFJlcXVlc3RSZWNvcmRzW3JlY29yZC5kYXRh WyJyZXF1ZXN0SWQiXV07CiAgICAgICAgIGlmIChzZW5kUmVxdWVzdFJlY29yZCkgeyAvLyBGYWxz ZSBpZiB3ZSBzdGFydGVkIGluc3RydW1lbnRhdGlvbiBpbiB0aGUgbWlkZGxlIG9mIHJlcXVlc3Qu CiAgICAgICAgICAgICB0aGlzLnVybCA9IHNlbmRSZXF1ZXN0UmVjb3JkLnVybDsKICAgICAgICAg ICAgIC8vIE5vdyB0aGF0IHdlIGhhdmUgcmVzb3VyY2UgaW4gdGhlIGNvbGxlY3Rpb24sIHJlY2Fs Y3VsYXRlIGRldGFpbHMgaW4gb3JkZXIgdG8gZGlzcGxheSBzaG9ydCB1cmwuCkBAIC0xMDE1LDIy ICsxMDM2LDIyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZCA9 IGZ1bmN0aW9uKHJlY29yZCwgcGFyZW50UmVjb3JkLCBwYW5lCiAgICAgICAgICAgICAgICAgc2Vu ZFJlcXVlc3RSZWNvcmQucGFyZW50Ll9yZWZyZXNoRGV0YWlscygpOwogICAgICAgICB9CiAgICAg fSBlbHNlIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuUmVzb3VyY2VSZWNlaXZlZERh dGEgfHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLlJlc291cmNlRmluaXNoKSB7Ci0gICAg ICAgIHZhciBzZW5kUmVxdWVzdFJlY29yZCA9IHBhbmVsLl9zZW5kUmVxdWVzdFJlY29yZHNbcmVj b3JkLmRhdGEucmVxdWVzdElkXTsKKyAgICAgICAgdmFyIHNlbmRSZXF1ZXN0UmVjb3JkID0gcGFu ZWwuX3NlbmRSZXF1ZXN0UmVjb3Jkc1tyZWNvcmQuZGF0YVsicmVxdWVzdElkIl1dOwogICAgICAg ICBpZiAoc2VuZFJlcXVlc3RSZWNvcmQpIC8vIEZhbHNlIGZvciBtYWluIHJlc291cmNlLgogICAg ICAgICAgICAgdGhpcy51cmwgPSBzZW5kUmVxdWVzdFJlY29yZC51cmw7CiAgICAgfSBlbHNlIGlm IChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuVGltZXJJbnN0YWxsKSB7Ci0gICAgICAgIHRo aXMudGltZW91dCA9IHJlY29yZC5kYXRhLnRpbWVvdXQ7Ci0gICAgICAgIHRoaXMuc2luZ2xlU2hv dCA9IHJlY29yZC5kYXRhLnNpbmdsZVNob3Q7Ci0gICAgICAgIHBhbmVsLl90aW1lclJlY29yZHNb cmVjb3JkLmRhdGEudGltZXJJZF0gPSB0aGlzOworICAgICAgICB0aGlzLnRpbWVvdXQgPSByZWNv cmQuZGF0YVsidGltZW91dCJdOworICAgICAgICB0aGlzLnNpbmdsZVNob3QgPSByZWNvcmQuZGF0 YVsic2luZ2xlU2hvdCJdOworICAgICAgICBwYW5lbC5fdGltZXJSZWNvcmRzW3JlY29yZC5kYXRh WyJ0aW1lcklkIl1dID0gdGhpczsKICAgICB9IGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNv cmRUeXBlcy5UaW1lckZpcmUpIHsKLSAgICAgICAgdmFyIHRpbWVySW5zdGFsbGVkUmVjb3JkID0g cGFuZWwuX3RpbWVyUmVjb3Jkc1tyZWNvcmQuZGF0YS50aW1lcklkXTsKKyAgICAgICAgdmFyIHRp bWVySW5zdGFsbGVkUmVjb3JkID0gcGFuZWwuX3RpbWVyUmVjb3Jkc1tyZWNvcmQuZGF0YVsidGlt ZXJJZCJdXTsKICAgICAgICAgaWYgKHRpbWVySW5zdGFsbGVkUmVjb3JkKSB7CiAgICAgICAgICAg ICB0aGlzLmNhbGxTaXRlU3RhY2tUcmFjZSA9IHRpbWVySW5zdGFsbGVkUmVjb3JkLnN0YWNrVHJh Y2U7CiAgICAgICAgICAgICB0aGlzLnRpbWVvdXQgPSB0aW1lckluc3RhbGxlZFJlY29yZC50aW1l b3V0OwogICAgICAgICAgICAgdGhpcy5zaW5nbGVTaG90ID0gdGltZXJJbnN0YWxsZWRSZWNvcmQu c2luZ2xlU2hvdDsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJl Y29yZFR5cGVzLkZpcmVBbmltYXRpb25GcmFtZUV2ZW50KSB7Ci0gICAgICAgIHZhciByZWdpc3Rl ckNhbGxiYWNrUmVjb3JkID0gcGFuZWwuX3JlZ2lzdGVyZWRBbmltYXRpb25DYWxsYmFja1JlY29y ZHNbcmVjb3JkLmRhdGEuaWRdOworICAgICAgICB2YXIgcmVnaXN0ZXJDYWxsYmFja1JlY29yZCA9 IHBhbmVsLl9yZWdpc3RlcmVkQW5pbWF0aW9uQ2FsbGJhY2tSZWNvcmRzW3JlY29yZC5kYXRhWyJp ZCJdXTsKICAgICAgICAgaWYgKHJlZ2lzdGVyQ2FsbGJhY2tSZWNvcmQpCiAgICAgICAgICAgICB0 aGlzLmNhbGxTaXRlU3RhY2tUcmFjZSA9IHJlZ2lzdGVyQ2FsbGJhY2tSZWNvcmQuc3RhY2tUcmFj ZTsKICAgICB9CkBAIC0xMDgxLDE5ICsxMTAyLDE5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBh bmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgc3dpdGNoICh0aGlz LnR5cGUpIHsKICAgICAgICAgICAgIGNhc2UgcmVjb3JkVHlwZXMuR0NFdmVudDoKLSAgICAgICAg ICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93KFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiQ29sbGVjdGVkIiksIE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuZGF0YS51c2VkSGVhcFNp emVEZWx0YSkpOworICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3co V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb2xsZWN0ZWQiKSwgTnVtYmVyLmJ5dGVzVG9TdHJpbmco dGhpcy5kYXRhWyJ1c2VkSGVhcFNpemVEZWx0YSJdKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICBjYXNlIHJlY29yZFR5cGVzLlRpbWVySW5zdGFsbDoKICAgICAgICAgICAg IGNhc2UgcmVjb3JkVHlwZXMuVGltZXJGaXJlOgogICAgICAgICAgICAgY2FzZSByZWNvcmRUeXBl cy5UaW1lclJlbW92ZToKLSAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0 Um93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZXIgSUQiKSwgdGhpcy5kYXRhLnRpbWVySWQp OworICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJUaW1lciBJRCIpLCB0aGlzLmRhdGFbInRpbWVySWQiXSk7CiAgICAgICAg ICAgICAgICAgaWYgKHR5cGVvZiB0aGlzLnRpbWVvdXQgPT09ICJudW1iZXIiKSB7CiAgICAgICAg ICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJUaW1lb3V0IiksIE51bWJlci5zZWNvbmRzVG9TdHJpbmcodGhpcy50aW1lb3V0IC8g MTAwMCkpOwogICAgICAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVwZWF0cyIpLCAhdGhpcy5zaW5nbGVTaG90KTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNl IHJlY29yZFR5cGVzLkZpcmVBbmltYXRpb25GcmFtZUV2ZW50OgotICAgICAgICAgICAgICAgIGNv bnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsYmFj ayBJRCIpLCB0aGlzLmRhdGEuaWQpOworICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2Fw cGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsYmFjayBJRCIpLCB0aGlzLmRh dGFbImlkIl0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSByZWNv cmRUeXBlcy5GdW5jdGlvbkNhbGw6CiAgICAgICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBw ZW5kTGlua1JvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2F0aW9uIiksIHRoaXMuc2NyaXB0 TmFtZSwgdGhpcy5zY3JpcHRMaW5lKTsKQEAgLTExMDQsMjAgKzExMjUsMjAgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIGNhc2UgcmVjb3JkVHlwZXMuUmVzb3VyY2VSZWNlaXZlZERhdGE6CiAgICAgICAgICAgICBj YXNlIHJlY29yZFR5cGVzLlJlc291cmNlRmluaXNoOgogICAgICAgICAgICAgICAgIGNvbnRlbnRI ZWxwZXIuX2FwcGVuZExpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZSIpLCB0 aGlzLnVybCk7Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuZGF0YS5yZXF1ZXN0TWV0aG9kKQot ICAgICAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiUmVxdWVzdCBNZXRob2QiKSwgdGhpcy5kYXRhLnJlcXVlc3RNZXRob2Qp OwotICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpcy5kYXRhLnN0YXR1c0NvZGUgPT09ICJu dW1iZXIiKQotICAgICAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhdHVzIENvZGUiKSwgdGhpcy5kYXRhLnN0YXR1c0Nv ZGUpOwotICAgICAgICAgICAgICAgIGlmICh0aGlzLmRhdGEubWltZVR5cGUpCi0gICAgICAgICAg ICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJNSU1FIFR5cGUiKSwgdGhpcy5kYXRhLm1pbWVUeXBlKTsKKyAgICAgICAgICAgICAgICBp ZiAodGhpcy5kYXRhWyJyZXF1ZXN0TWV0aG9kIl0pCisgICAgICAgICAgICAgICAgICAgIGNvbnRl bnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXF1ZXN0IE1l dGhvZCIpLCB0aGlzLmRhdGFbInJlcXVlc3RNZXRob2QiXSk7CisgICAgICAgICAgICAgICAgaWYg KHR5cGVvZiB0aGlzLmRhdGFbInN0YXR1c0NvZGUiXSA9PT0gIm51bWJlciIpCisgICAgICAgICAg ICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJTdGF0dXMgQ29kZSIpLCB0aGlzLmRhdGFbInN0YXR1c0NvZGUiXSk7CisgICAgICAgICAg ICAgICAgaWYgKHRoaXMuZGF0YVsibWltZVR5cGUiXSkKKyAgICAgICAgICAgICAgICAgICAgY29u dGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1JTUUgVHlw ZSIpLCB0aGlzLmRhdGFbIm1pbWVUeXBlIl0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgY2FzZSByZWNvcmRUeXBlcy5FdmFsdWF0ZVNjcmlwdDoKICAgICAgICAgICAgICAg ICBpZiAodGhpcy5kYXRhICYmIHRoaXMudXJsKQotICAgICAgICAgICAgICAgICAgICBjb250ZW50 SGVscGVyLl9hcHBlbmRMaW5rUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NyaXB0IiksIHRo aXMudXJsLCB0aGlzLmRhdGEubGluZU51bWJlcik7CisgICAgICAgICAgICAgICAgICAgIGNvbnRl bnRIZWxwZXIuX2FwcGVuZExpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHQiKSwg dGhpcy51cmwsIHRoaXMuZGF0YVsibGluZU51bWJlciJdKTsKICAgICAgICAgICAgICAgICBicmVh azsKICAgICAgICAgICAgIGNhc2UgcmVjb3JkVHlwZXMuUGFpbnQ6Ci0gICAgICAgICAgICAgICAg Y29udGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2F0 aW9uIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiKCVkLCAlZCkiLCB0aGlzLmRhdGEueCwgdGhp cy5kYXRhLnkpKTsKLSAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGltZW5zaW9ucyIpLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIiVkIMOXICVkIiwgdGhpcy5kYXRhLndpZHRoLCB0aGlzLmRhdGEuaGVpZ2h0KSk7CisgICAg ICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkxvY2F0aW9uIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiKCVkLCAlZCkiLCB0aGlz LmRhdGFbIngiXSwgdGhpcy5kYXRhWyJ5Il0pKTsKKyAgICAgICAgICAgICAgICBjb250ZW50SGVs cGVyLl9hcHBlbmRUZXh0Um93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGltZW5zaW9ucyIpLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIMOXICVkIiwgdGhpcy5kYXRhWyJ3aWR0aCJdLCB0aGlz LmRhdGFbImhlaWdodCJdKSk7CiAgICAgICAgICAgICBjYXNlIHJlY29yZFR5cGVzLlJlY2FsY3Vs YXRlU3R5bGVzOiAvLyBXZSBkb24ndCB3YW50IHRvIHNlZSBkZWZhdWx0IGRldGFpbHMuCiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBkZWZhdWx0OgpAQCAtMTE1MCwyOCArMTE3 MSwyOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgc3dpdGNoICh0aGlzLnR5cGUpIHsKICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5HQ0V2ZW50OgotICAg ICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIGNvbGxlY3RlZCIs IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuZGF0YS51c2VkSGVhcFNpemVEZWx0YSkpOworICAg ICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIGNvbGxlY3RlZCIs IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuZGF0YVsidXNlZEhlYXBTaXplRGVsdGEiXSkpOwog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlRp bWVyRmlyZToKLSAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zY3JpcHROYW1lID8gdGhpcy5f cGFuZWwuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnNjcmlwdE5hbWUsIHRoaXMuc2NyaXB0TGluZSwg MCkgOiB0aGlzLmRhdGEudGltZXJJZDsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zY3Jp cHROYW1lID8gdGhpcy5fcGFuZWwuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnNjcmlwdE5hbWUsIHRo aXMuc2NyaXB0TGluZSwgMCkgOiB0aGlzLmRhdGFbInRpbWVySWQiXTsKICAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5GdW5jdGlvbkNhbGw6CiAg ICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc2NyaXB0TmFtZSA/IHRoaXMuX3BhbmVsLl9saW5r aWZ5TG9jYXRpb24odGhpcy5zY3JpcHROYW1lLCB0aGlzLnNjcmlwdExpbmUsIDApIDogbnVsbDsK ICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5G aXJlQW5pbWF0aW9uRnJhbWVFdmVudDoKLSAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zY3Jp cHROYW1lID8gdGhpcy5fcGFuZWwuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnNjcmlwdE5hbWUsIHRo aXMuc2NyaXB0TGluZSwgMCkgOiB0aGlzLmRhdGEuaWQ7CisgICAgICAgICAgICAgICAgcmV0dXJu IHRoaXMuc2NyaXB0TmFtZSA/IHRoaXMuX3BhbmVsLl9saW5raWZ5TG9jYXRpb24odGhpcy5zY3Jp cHROYW1lLCB0aGlzLnNjcmlwdExpbmUsIDApIDogdGhpcy5kYXRhWyJpZCJdOwogICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkV2ZW50RGlzcGF0 Y2g6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuZGF0YSA/IHRoaXMuZGF0YS50eXBlIDog bnVsbDsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5kYXRhID8gdGhpcy5kYXRhWyJ0eXBl Il0gOiBudWxsOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5S ZWNvcmRUeXBlLlBhaW50OgotICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLmRhdGEud2lkdGgg KyAiXHUyMDA5XHUwMGQ3XHUyMDA5IiArIHRoaXMuZGF0YS5oZWlnaHQ7CisgICAgICAgICAgICAg ICAgcmV0dXJuIHRoaXMuZGF0YVsid2lkdGgiXSArICJcdTIwMDlcdTAwZDdcdTIwMDkiICsgdGhp cy5kYXRhWyJoZWlnaHQiXTsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5l QWdlbnQuUmVjb3JkVHlwZS5UaW1lckluc3RhbGw6CiAgICAgICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuVGltZXJSZW1vdmU6Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/IHRoaXMuX3BhbmVsLl9saW5raWZ5Q2FsbEZyYW1l KHRoaXMuc3RhY2tUcmFjZVswXSkgOiB0aGlzLmRhdGEudGltZXJJZDsKKyAgICAgICAgICAgICAg ICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhpcy5fcGFuZWwuX2xpbmtpZnlDYWxsRnJhbWUo dGhpcy5zdGFja1RyYWNlWzBdKSA6IHRoaXMuZGF0YVsidGltZXJJZCJdOwogICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlJlZ2lzdGVyQW5pbWF0 aW9uRnJhbWVDYWxsYmFjazoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5l QWdlbnQuUmVjb3JkVHlwZS5DYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrOgotICAgICAgICAg ICAgICAgIHJldHVybiB0aGlzLnN0YWNrVHJhY2UgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUNhbGxG cmFtZSh0aGlzLnN0YWNrVHJhY2VbMF0pIDogdGhpcy5kYXRhLmlkOworICAgICAgICAgICAgICAg IHJldHVybiB0aGlzLnN0YWNrVHJhY2UgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUNhbGxGcmFtZSh0 aGlzLnN0YWNrVHJhY2VbMF0pIDogdGhpcy5kYXRhWyJpZCJdOwogICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlBhcnNlSFRNTDoKICAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5SZWNhbGN1bGF0 ZVN0eWxlczoKICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhpcy5f cGFuZWwuX2xpbmtpZnlDYWxsRnJhbWUodGhpcy5zdGFja1RyYWNlWzBdKSA6IG51bGw7CiAgICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRXZhbHVh dGVTY3JpcHQ6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMudXJsID8gdGhpcy5fcGFuZWwu X2xpbmtpZnlMb2NhdGlvbih0aGlzLnVybCwgdGhpcy5kYXRhLmxpbmVOdW1iZXIsIDApIDogbnVs bDsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy51cmwgPyB0aGlzLl9wYW5lbC5fbGlua2lm eUxvY2F0aW9uKHRoaXMudXJsLCB0aGlzLmRhdGFbImxpbmVOdW1iZXIiXSwgMCkgOiBudWxsOwog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlhI UlJlYWR5U3RhdGVDaGFuZ2U6CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGlu ZUFnZW50LlJlY29yZFR5cGUuWEhSTG9hZDoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5TY2hlZHVsZVJlc291cmNlUmVxdWVzdDoKQEAgLTEx ODEsNyArMTIwMiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29y ZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFn ZW50LlJlY29yZFR5cGUuUmVzb3VyY2VGaW5pc2g6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh0aGlzLnVybCk7CiAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuVGltZVN0YW1wOgotICAgICAg ICAgICAgICAgIHJldHVybiB0aGlzLmRhdGEubWVzc2FnZTsKKyAgICAgICAgICAgICAgICByZXR1 cm4gdGhpcy5kYXRhWyJtZXNzYWdlIl07CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAg ICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9CkBAIC0xMjA3LDYgKzEyMjgsOSBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAg IH0KIH0KIAorLyoqCisgKiBAY29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwuUG9wdXBDb250ZW50SGVscGVyID0gZnVuY3Rpb24odGl0bGUsIHBhbmVsKQogewogICAg IHRoaXMuX3BhbmVsID0gcGFuZWw7CkBAIC0xMjE5LDYgKzEyNDMsOSBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbC5Qb3B1cENvbnRlbnRIZWxwZXIgPSBmdW5jdGlvbih0aXRsZSwgcGFuZWwp CiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLlBvcHVwQ29udGVudEhlbHBlci5wcm90 b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmc9fSBzdHlsZU5hbWUKKyAg ICAgKi8KICAgICBfY3JlYXRlQ2VsbDogZnVuY3Rpb24oY29udGVudCwgc3R5bGVOYW1lKQogICAg IHsKICAgICAgICAgdmFyIHRleHQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsYWJlbCIpOwpA QCAtMTIzOSw2ICsxMjY2LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250 ZW50SGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fY29udGVudFRhYmxlLmFwcGVu ZENoaWxkKHJvdyk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nPX0g dGl0bGVTdHlsZQorICAgICAqLwogICAgIF9hcHBlbmRFbGVtZW50Um93OiBmdW5jdGlvbih0aXRs ZSwgY29udGVudCwgdGl0bGVTdHlsZSkKICAgICB7CiAgICAgICAgIHZhciByb3cgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJ0ciIpOwpAQCAtMTI1Myw2ICsxMjgzLDkgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5fY29udGVudFRhYmxlLmFwcGVuZENoaWxkKHJvdyk7CiAgICAgfSwKIAorICAgIC8qKgor ICAgICAqIEBwYXJhbSB7bnVtYmVyPX0gc2NyaXB0TGluZQorICAgICAqLwogICAgIF9hcHBlbmRM aW5rUm93OiBmdW5jdGlvbih0aXRsZSwgc2NyaXB0TmFtZSwgc2NyaXB0TGluZSkKICAgICB7CiAg ICAgICAgIHZhciBsaW5rID0gdGhpcy5fcGFuZWwuX2xpbmtpZnlMb2NhdGlvbihzY3JpcHROYW1l LCBzY3JpcHRMaW5lLCAwLCAidGltZWxpbmUtZGV0YWlscyIpOwpAQCAtMTI3OSw2ICsxMzEyLDkg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyLnByb3RvdHlw ZSA9IHsKICAgICB9CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rv ci5UaW1lbGluZUV4cGFuZGFibGVFbGVtZW50ID0gZnVuY3Rpb24oY29udGFpbmVyKQogewogICAg IHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKQEAgLTEzMTks NiArMTM1NSw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUV4cGFuZGFibGVFbGVtZW50LnByb3Rv dHlwZSA9IHsKICAgICB9CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3Bl Y3Rvci5UaW1lbGluZU1vZGVsID0gZnVuY3Rpb24odGltZWxpbmVQYW5lbCkKIHsKICAgICB0aGlz Ll9wYW5lbCA9IHRpbWVsaW5lUGFuZWw7Cg==