95290 2012-08-28 22:58:29 -0700 [Chromium] Remove awareness of incremental updates from CCSchedulerStateMachine. 2012-09-14 19:25:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reveman reveman brianderson cc-bugs dglazkov jamesr nduca webkit.review.bot oldest_to_newest 707113 0 reveman 2012-08-28 22:58:29 -0700 An attempt to clean up CCScheduler and CCSchedulerStateMachine. 707114 1 161139 reveman 2012-08-28 23:01:41 -0700 Created attachment 161139 Patch 707329 2 161139 webkit.review.bot 2012-08-29 05:00:03 -0700 Comment on attachment 161139 Patch Attachment 161139 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13693214 New failing tests: platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-composited.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-layout-change.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-2-iframe-scrolled-outer-late-composite.html fast/loader/unload-form-post-about-blank.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-scrolled.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-2-iframe-composited-outer.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe.html fast/canvas/webgl/shader-precision-format.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-late-composite.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-clipped.html http/tests/xmlhttprequest/zero-length-response.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-2-iframe-scrolled-inner-late-composite.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-composited-scrolled.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-2-iframe-scrolled-inner.html fast/frames/cached-frame-counter.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-2-iframe-composited-inner.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-noncomposite.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-composited.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-composite.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-layout-change-2.html fast/loader/local-CSS-from-local.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-overflow-div-composited-scroll-clip.html platform/chromium-linux/compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-late-noncomposite.html 707996 3 161139 nduca 2012-08-29 16:09:57 -0700 Comment on attachment 161139 Patch I'm okay with this. James, wdyt? 708017 4 161139 jamesr 2012-08-29 16:21:49 -0700 Comment on attachment 161139 Patch R=me. Please investigate the EWS failures before landing. 721329 5 reveman 2012-09-14 19:25:33 -0700 Change committed as chromium rev: 156950 161139 2012-08-28 23:01:41 -0700 2012-08-29 16:21:49 -0700 Patch bug-95290-20120829020131.patch text/plain 31374 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdhNWZlMmU0NDFhZTAw YjU2NjdkNDMyYmM3YTk3NWMwODFmOTdlNy4uYTk1MDk3ZjM2MTg3MWMzMjk5OWE1NDg1MDgzZDEy MmVkOWVhYWIxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTI4ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBS ZW1vdmUgYXdhcmVuZXNzIG9mIGluY3JlbWVudGFsIHVwZGF0ZXMgZnJvbSBDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk1MjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ0NTY2hlZHVsZXIgaGFuZGxlcyBpbmNyZW1lbnRhbCByZXNvdXJjZXMgdXBkYXRlcyBiYXNl ZCBvbiBhbW91bnQgb2YKKyAgICAgICAgdGltZSB1bnRpbCBuZXh0IHZzeW5jIHRpY2suIFdlIGN1 cnJlbnRseSBnZXQgbm8gYmVuZWZpdCBmcm9tIGhhdmluZworICAgICAgICBDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZSBhd2FyZSBvZiB0aGVzZSBpbmNyZW1lbnRhbCB1cGRhdGVzLiBUaGlzCisgICAg ICAgIGNsZWFucyB1cCBib3RoIENDU2NoZWR1bGVyIGFuZCBDQ1NjaGVkdWxlclN0YXRlTWFjaGlu ZSBiZSByZW1vdmluZworICAgICAgICBpbmNyZW1lbnRhbCB1cGRhdGUgYXdhcmVuZXNzIGZyb20g Q0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY2hlZHVsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q0NTY2hlZHVsZXI6OkNDU2NoZWR1bGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNDU2NoZWR1bGVyOjpiZWdpbkZyYW1lQ29tcGxldGUpOgorICAgICAgICAoV2ViQ29yZTo6 Q0NTY2hlZHVsZXI6OnZzeW5jVGljayk6CisgICAgICAgIChXZWJDb3JlOjpDQ1NjaGVkdWxlcjo6 dXBkYXRlUmVzb3VyY2VzQ29tcGxldGUpOgorICAgICAgICAoV2ViQ29yZTo6Q0NTY2hlZHVsZXI6 OnByb2Nlc3NTY2hlZHVsZWRBY3Rpb25zKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1NjaGVkdWxlci5oOgorICAgICAgICAoQ0NTY2hlZHVsZXIpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpDQ1NjaGVk dWxlclN0YXRlTWFjaGluZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6bmV4dEFjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q0NTY2hlZHVsZXJTdGF0ZU1h Y2hpbmU6OmJlZ2luRnJhbWVDb21wbGV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ1NjaGVkdWxl clN0YXRlTWFjaGluZTo6dXBkYXRlUmVzb3VyY2VzQ29tcGxldGUpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5lLmg6CisgICAg ICAgIChDQ1NjaGVkdWxlclN0YXRlTWFjaGluZSk6CisKIDIwMTItMDgtMjggIEtlbmljaGkgSXNo aWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIHN0eWxlLT5mb250TWV0cmlj cygpIHNob3VsZCBiZSBhdmFpbGFibGUgd2hlbiBzZXR0aW5nIGxpbmUtaGVpZ2h0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IDNjZDk4YmM4ZDEyYzZjZmFjNmEwODk3MTBkYzVmYzg2ZTI4 MTAzZjkuLjM4MWZkYWQzMmM4ODZhNGM2ZmMxNDRhN2M1NTg5OTEzMzMzNGEyZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTItMDgtMjggIERhdmlkIFJl dmVtYW4gIDxyZXZlbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBhd2FyZW5lc3Mgb2YgaW5jcmVtZW50YWwgdXBkYXRlcyBmcm9tIENDU2NoZWR1bGVyU3RhdGVN YWNoaW5lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTUyOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHRlc3RzL0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdGF0ZU1hY2hpbmU6OnNldFVwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyk6CisgICAg ICAgIChXZWJDb3JlOjpTdGF0ZU1hY2hpbmU6OnVwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpURVNUKToKKworMjAxMi0wOC0yOCAgRGF2aWQgUmV2ZW1h biAgPHJldmVtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtDaHJvbWl1bV0gU2NoZWR1bGVy IHdpbGwgbmV2ZXIgcHJvY2VzcyBhIGNvbW1pdCB1bnRpbCBpdCByZWNlaXZlcyBhIHZzeW5jIHRp Y2suCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDcy MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ1NjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1NjaGVkdWxlci5jcHAKaW5kZXggNGRmNTJhZWY5NjBmNmMxYWY4NWZmMDI1 NDQ5ZTUxNzU0Y2Y4MWY3Ni4uNjQ4YWVkNWZlYzA4NjkwMGJlYmQ3YjRiYTNmZTZjMTEzZjMwMTgz OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NTY2hlZHVsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyLmNwcApAQCAtMzMsOCArMzMsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiBDQ1NjaGVkdWxlcjo6Q0NTY2hlZHVsZXIoQ0NTY2hlZHVsZXJDbGllbnQqIGNs aWVudCwgUGFzc093blB0cjxDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXI+IGZyYW1lUmF0ZUNvbnRyb2xs ZXIpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX2ZyYW1lUmF0ZUNvbnRyb2xsZXIo ZnJhbWVSYXRlQ29udHJvbGxlcikKLSAgICAsIG1faGFzTW9yZVJlc291cmNlVXBkYXRlcyhmYWxz ZSkKLSAgICAsIG1fdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcoZmFsc2UpCisgICAgLCBtX3Vw ZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyhmYWxzZSkKIHsKICAgICBBU1NFUlQobV9jbGll bnQpOwogICAgIG1fZnJhbWVSYXRlQ29udHJvbGxlci0+c2V0Q2xpZW50KHRoaXMpOwpAQCAtOTEs OCArOTAsNyBAQCB2b2lkIENDU2NoZWR1bGVyOjpzZXRNYWluVGhyZWFkTmVlZHNMYXllclRleHR1 cmVzKCkKIHZvaWQgQ0NTY2hlZHVsZXI6OmJlZ2luRnJhbWVDb21wbGV0ZShib29sIGhhc1Jlc291 cmNlVXBkYXRlcykKIHsKICAgICBUUkFDRV9FVkVOVDAoImNjIiwgIkNDU2NoZWR1bGVyOjpiZWdp bkZyYW1lQ29tcGxldGUiKTsKLSAgICBtX2hhc01vcmVSZXNvdXJjZVVwZGF0ZXMgPSBoYXNSZXNv dXJjZVVwZGF0ZXM7Ci0gICAgbV9zdGF0ZU1hY2hpbmUuYmVnaW5GcmFtZUNvbXBsZXRlKCk7Cisg ICAgbV9zdGF0ZU1hY2hpbmUuYmVnaW5GcmFtZUNvbXBsZXRlKGhhc1Jlc291cmNlVXBkYXRlcyk7 CiAgICAgcHJvY2Vzc1NjaGVkdWxlZEFjdGlvbnMoKTsKIH0KIApAQCAtMTM2LDI2ICsxMzQsMjEg QEAgdm9pZCBDQ1NjaGVkdWxlcjo6c2V0VGltZWJhc2VBbmRJbnRlcnZhbChkb3VibGUgdGltZWJh c2UsIGRvdWJsZSBpbnRlcnZhbFNlY29uZHMKIAogdm9pZCBDQ1NjaGVkdWxlcjo6dnN5bmNUaWNr KCkKIHsKLSAgICBpZiAobV91cGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZykgewotICAgICAgICBt X3VwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nID0gZmFsc2U7Ci0gICAgICAgIEFTU0VSVChtX2hh c01vcmVSZXNvdXJjZVVwZGF0ZXMpOwotICAgICAgICBtX3N0YXRlTWFjaGluZS5iZWdpblVwZGF0 ZU1vcmVSZXNvdXJjZXNDb21wbGV0ZSh0cnVlKTsKLSAgICB9CiAgICAgVFJBQ0VfRVZFTlQwKCJj YyIsICJDQ1NjaGVkdWxlcjo6dnN5bmNUaWNrIik7Ci0KICAgICBtX3N0YXRlTWFjaGluZS5kaWRF bnRlclZTeW5jKCk7CiAgICAgcHJvY2Vzc1NjaGVkdWxlZEFjdGlvbnMoKTsKICAgICBtX3N0YXRl TWFjaGluZS5kaWRMZWF2ZVZTeW5jKCk7CisKKyAgICAvLyBBbGxvdyByZXNvdXJjZSB1cGRhdGVz IHVudGlsIG5leHQgdnN5bmMgdGljay4KKyAgICBpZiAobV91cGRhdGVSZXNvdXJjZXNDb21wbGV0 ZVBlbmRpbmcpCisgICAgICAgIG1fY2xpZW50LT5zY2hlZHVsZWRBY3Rpb25VcGRhdGVNb3JlUmVz b3VyY2VzKG1fZnJhbWVSYXRlQ29udHJvbGxlci0+bmV4dFRpY2tUaW1lSWZBY3RpdmF0ZWQoKSk7 CiB9CiAKIHZvaWQgQ0NTY2hlZHVsZXI6OnVwZGF0ZVJlc291cmNlc0NvbXBsZXRlKCkKIHsKICAg ICBUUkFDRV9FVkVOVDAoImNjIiwgIkNDU2NoZWR1bGVyOjp1cGRhdGVSZXNvdXJjZXNDb21wbGV0 ZSIpOwotICAgIGlmIChtX3VwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nKSB7Ci0gICAgICAgIG1f dXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcgPSBmYWxzZTsKLSAgICAgICAgbV9zdGF0ZU1hY2hp bmUuYmVnaW5VcGRhdGVNb3JlUmVzb3VyY2VzQ29tcGxldGUoZmFsc2UpOwotICAgIH0KLSAgICBt X2hhc01vcmVSZXNvdXJjZVVwZGF0ZXMgPSBmYWxzZTsKKyAgICBtX3N0YXRlTWFjaGluZS51cGRh dGVSZXNvdXJjZXNDb21wbGV0ZSgpOworICAgIG1fdXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5k aW5nID0gZmFsc2U7CiAgICAgcHJvY2Vzc1NjaGVkdWxlZEFjdGlvbnMoKTsKIH0KIApAQCAtMTg3 LDEyICsxODAsMTAgQEAgdm9pZCBDQ1NjaGVkdWxlcjo6cHJvY2Vzc1NjaGVkdWxlZEFjdGlvbnMo KQogICAgICAgICBjYXNlIENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fRlJB TUU6CiAgICAgICAgICAgICBtX2NsaWVudC0+c2NoZWR1bGVkQWN0aW9uQmVnaW5GcmFtZSgpOwog ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6 OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVM6Ci0gICAgICAgICAgICBpZiAobV9o YXNNb3JlUmVzb3VyY2VVcGRhdGVzKSB7Ci0gICAgICAgICAgICAgICAgbV9jbGllbnQtPnNjaGVk dWxlZEFjdGlvblVwZGF0ZU1vcmVSZXNvdXJjZXMobV9mcmFtZVJhdGVDb250cm9sbGVyLT5uZXh0 VGlja1RpbWVJZkFjdGl2YXRlZCgpKTsKLSAgICAgICAgICAgICAgICBtX3VwZGF0ZU1vcmVSZXNv dXJjZXNQZW5kaW5nID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAg IG1fc3RhdGVNYWNoaW5lLmJlZ2luVXBkYXRlTW9yZVJlc291cmNlc0NvbXBsZXRlKGZhbHNlKTsK KyAgICAgICAgY2FzZSBDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFU RV9SRVNPVVJDRVM6CisgICAgICAgICAgICBBU1NFUlQoIW1fdXBkYXRlUmVzb3VyY2VzQ29tcGxl dGVQZW5kaW5nKTsKKyAgICAgICAgICAgIG1fY2xpZW50LT5zY2hlZHVsZWRBY3Rpb25VcGRhdGVN b3JlUmVzb3VyY2VzKG1fZnJhbWVSYXRlQ29udHJvbGxlci0+bmV4dFRpY2tUaW1lSWZBY3RpdmF0 ZWQoKSk7CisgICAgICAgICAgICBtX3VwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyA9IHRy dWU7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6QUNUSU9OX0NPTU1JVDoKICAgICAgICAgICAgIG1fY2xpZW50LT5zY2hlZHVsZWRBY3Rp b25Db21taXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ1NjaGVkdWxlci5oCmluZGV4IGFhNjUyNGM0OTllZWM2YTM1MGEx YjQyNTY1Y2UxNTdjM2RkYzIxMjguLjE3MWU0MDg5MTZlN2IyYzUwMDM5NmZjYTY0ZDYwZGJjNDZk Y2RlMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDU2NoZWR1bGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NTY2hlZHVsZXIuaApAQCAtMTIwLDggKzEyMCw3IEBAIHByaXZhdGU6 CiAgICAgQ0NTY2hlZHVsZXJDbGllbnQqIG1fY2xpZW50OwogICAgIE93blB0cjxDQ0ZyYW1lUmF0 ZUNvbnRyb2xsZXI+IG1fZnJhbWVSYXRlQ29udHJvbGxlcjsKICAgICBDQ1NjaGVkdWxlclN0YXRl TWFjaGluZSBtX3N0YXRlTWFjaGluZTsKLSAgICBib29sIG1faGFzTW9yZVJlc291cmNlVXBkYXRl czsKLSAgICBib29sIG1fdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmc7CisgICAgYm9vbCBtX3Vw ZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZzsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyU3RhdGVN YWNoaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5lLmNwcAppbmRleCA0MTUxNTZhY2I1ZTk1NDdlZDBhMDgz ZWY1NWUzNTUxZTE4YTRlODU5Li5hOWI4M2IyNzZkZDEyNjA3NDUzMTYwMzNhNTJjZDJlZDNjNjJj NTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ1NjaGVkdWxlclN0YXRlTWFjaGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmUuY3BwCkBA IC00MCw3ICs0MCw3IEBAIENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpDQ1NjaGVkdWxlclN0YXRl TWFjaGluZSgpCiAgICAgLCBtX25lZWRzQ29tbWl0KGZhbHNlKQogICAgICwgbV9uZWVkc0ZvcmNl ZENvbW1pdChmYWxzZSkKICAgICAsIG1fbWFpblRocmVhZE5lZWRzTGF5ZXJUZXh0dXJlcyhmYWxz ZSkKLSAgICAsIG1fdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcoZmFsc2UpCisgICAgLCBtX3Vw ZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyhmYWxzZSkKICAgICAsIG1faW5zaWRlVlN5bmMo ZmFsc2UpCiAgICAgLCBtX3Zpc2libGUoZmFsc2UpCiAgICAgLCBtX2NhbkJlZ2luRnJhbWUoZmFs c2UpCkBAIC0xMzYsOCArMTM2LDggQEAgQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFjdGlvbiBD Q1NjaGVkdWxlclN0YXRlTWFjaGluZTo6bmV4dEFjdGlvbigpIGNvbnN0CiAgICAgY2FzZSBDT01N SVRfU1RBVEVfVVBEQVRJTkdfUkVTT1VSQ0VTOgogICAgICAgICBpZiAoc2hvdWxkRHJhdygpKQog ICAgICAgICAgICAgcmV0dXJuIG1fbmVlZHNGb3JjZWRSZWRyYXcgPyBBQ1RJT05fRFJBV19GT1JD RUQgOiBBQ1RJT05fRFJBV19JRl9QT1NTSUJMRTsKLSAgICAgICAgaWYgKCFtX3VwZGF0ZU1vcmVS ZXNvdXJjZXNQZW5kaW5nKQotICAgICAgICAgICAgcmV0dXJuIEFDVElPTl9CRUdJTl9VUERBVEVf TU9SRV9SRVNPVVJDRVM7CisgICAgICAgIGlmICghbV91cGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBl bmRpbmcpCisgICAgICAgICAgICByZXR1cm4gQUNUSU9OX0JFR0lOX1VQREFURV9SRVNPVVJDRVM7 CiAgICAgICAgIHJldHVybiBBQ1RJT05fTk9ORTsKIAogICAgIGNhc2UgQ09NTUlUX1NUQVRFX1JF QURZX1RPX0NPTU1JVDoKQEAgLTE3MCw5ICsxNzAsOSBAQCB2b2lkIENDU2NoZWR1bGVyU3RhdGVN YWNoaW5lOjp1cGRhdGVTdGF0ZShBY3Rpb24gYWN0aW9uKQogICAgICAgICBtX25lZWRzRm9yY2Vk Q29tbWl0ID0gZmFsc2U7CiAgICAgICAgIHJldHVybjsKIAotICAgIGNhc2UgQUNUSU9OX0JFR0lO X1VQREFURV9NT1JFX1JFU09VUkNFUzoKKyAgICBjYXNlIEFDVElPTl9CRUdJTl9VUERBVEVfUkVT T1VSQ0VTOgogICAgICAgICBBU1NFUlQobV9jb21taXRTdGF0ZSA9PSBDT01NSVRfU1RBVEVfVVBE QVRJTkdfUkVTT1VSQ0VTKTsKLSAgICAgICAgbV91cGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyA9 IHRydWU7CisgICAgICAgIG1fdXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nID0gdHJ1ZTsK ICAgICAgICAgcmV0dXJuOwogCiAgICAgY2FzZSBBQ1RJT05fQ09NTUlUOgpAQCAtMjkzLDEwICsy OTMsMTMgQEAgdm9pZCBDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6c2V0TmVlZHNGb3JjZWRDb21t aXQoKQogICAgIG1fbmVlZHNGb3JjZWRDb21taXQgPSB0cnVlOwogfQogCi12b2lkIENDU2NoZWR1 bGVyU3RhdGVNYWNoaW5lOjpiZWdpbkZyYW1lQ29tcGxldGUoKQordm9pZCBDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZTo6YmVnaW5GcmFtZUNvbXBsZXRlKGJvb2wgaGFzUmVzb3VyY2VVcGRhdGVzKQog ewogICAgIEFTU0VSVChtX2NvbW1pdFN0YXRlID09IENPTU1JVF9TVEFURV9GUkFNRV9JTl9QUk9H UkVTUyk7Ci0gICAgbV9jb21taXRTdGF0ZSA9IENPTU1JVF9TVEFURV9VUERBVElOR19SRVNPVVJD RVM7CisgICAgaWYgKGhhc1Jlc291cmNlVXBkYXRlcykKKyAgICAgICAgbV9jb21taXRTdGF0ZSA9 IENPTU1JVF9TVEFURV9VUERBVElOR19SRVNPVVJDRVM7CisgICAgZWxzZQorICAgICAgICBtX2Nv bW1pdFN0YXRlID0gQ09NTUlUX1NUQVRFX1JFQURZX1RPX0NPTU1JVDsKIH0KIAogdm9pZCBDQ1Nj aGVkdWxlclN0YXRlTWFjaGluZTo6YmVnaW5GcmFtZUFib3J0ZWQoKQpAQCAtMzA2LDEzICszMDks MTIgQEAgdm9pZCBDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6YmVnaW5GcmFtZUFib3J0ZWQoKQog ICAgIHNldE5lZWRzQ29tbWl0KCk7CiB9CiAKLXZvaWQgQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6 OmJlZ2luVXBkYXRlTW9yZVJlc291cmNlc0NvbXBsZXRlKGJvb2wgbW9yZVBlbmRpbmcpCit2b2lk IENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjp1cGRhdGVSZXNvdXJjZXNDb21wbGV0ZSgpCiB7CiAg ICAgQVNTRVJUKG1fY29tbWl0U3RhdGUgPT0gQ09NTUlUX1NUQVRFX1VQREFUSU5HX1JFU09VUkNF Uyk7Ci0gICAgQVNTRVJUKG1fdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcpOwotICAgIG1fdXBk YXRlTW9yZVJlc291cmNlc1BlbmRpbmcgPSBmYWxzZTsKLSAgICBpZiAoIW1vcmVQZW5kaW5nKQot ICAgICAgICBtX2NvbW1pdFN0YXRlID0gQ09NTUlUX1NUQVRFX1JFQURZX1RPX0NPTU1JVDsKKyAg ICBBU1NFUlQobV91cGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcpOworICAgIG1fdXBkYXRl UmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nID0gZmFsc2U7CisgICAgbV9jb21taXRTdGF0ZSA9IENP TU1JVF9TVEFURV9SRUFEWV9UT19DT01NSVQ7CiB9CiAKIHZvaWQgQ0NTY2hlZHVsZXJTdGF0ZU1h Y2hpbmU6OmRpZExvc2VDb250ZXh0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5lLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NjaGVkdWxlclN0YXRl TWFjaGluZS5oCmluZGV4IGZlMWIxODBmZTQ5NDc4Mjk5ZjMzNWJhYWQ4MzY2NWRkZDgyYWQyMTAu LjNiYjg5ZjNiZjc5N2U5NjkyZTBiMDg0NDRkZDkwY2NhMGI2ZmFlYWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2NoZWR1bGVyU3Rh dGVNYWNoaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmUuaApAQCAtNzMsNyArNzMsNyBAQCBwdWJsaWM6 CiAgICAgZW51bSBBY3Rpb24gewogICAgICAgICBBQ1RJT05fTk9ORSwKICAgICAgICAgQUNUSU9O X0JFR0lOX0ZSQU1FLAotICAgICAgICBBQ1RJT05fQkVHSU5fVVBEQVRFX01PUkVfUkVTT1VSQ0VT LAorICAgICAgICBBQ1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUywKICAgICAgICAgQUNUSU9O X0NPTU1JVCwKICAgICAgICAgQUNUSU9OX0RSQVdfSUZfUE9TU0lCTEUsCiAgICAgICAgIEFDVElP Tl9EUkFXX0ZPUkNFRCwKQEAgLTExOCwxNSArMTE4LDE1IEBAIHB1YmxpYzoKICAgICAvLyBDYWxs IHRoaXMgb25seSBpbiByZXNwb25zZSB0byByZWNlaXZpbmcgYW4gQUNUSU9OX0JFR0lOX0ZSQU1F CiAgICAgLy8gZnJvbSBuZXh0U3RhdGUuIEluZGljYXRlcyB0aGF0IGFsbCBwYWludGluZyBpcyBj b21wbGV0ZSBhbmQgdGhhdAogICAgIC8vIHVwZGF0aW5nIG9mIGNvbXBvc2l0b3IgcmVzb3VyY2Vz IGNhbiBiZWdpbi4KLSAgICB2b2lkIGJlZ2luRnJhbWVDb21wbGV0ZSgpOworICAgIHZvaWQgYmVn aW5GcmFtZUNvbXBsZXRlKGJvb2wgaGFzUmVzb3VyY2VVcGRhdGVzKTsKIAogICAgIC8vIENhbGwg dGhpcyBvbmx5IGluIHJlc3BvbnNlIHRvIHJlY2VpdmluZyBhbiBBQ1RJT05fQkVHSU5fRlJBTUUK ICAgICAvLyBmcm9tIG5leHRTdGF0ZSBpZiB0aGUgY2xpZW50IHJlamVjdHMgdGhlIGJlZ2luRnJh bWUgbWVzc2FnZS4KICAgICB2b2lkIGJlZ2luRnJhbWVBYm9ydGVkKCk7CiAKLSAgICAvLyBDYWxs IHRoaXMgb25seSBpbiByZXNwb25zZSB0byByZWNlaXZpbmcgYW4gQUNUSU9OX1VQREFURV9NT1JF X1JFU09VUkNFUwotICAgIC8vIGZyb20gbmV4dFN0YXRlLiBJbmRpY2F0ZXMgdGhhdCB0aGUgc3Bl Y2lmaWMgdXBkYXRlIHJlcXVlc3QgY29tcGxldGVkLgotICAgIHZvaWQgYmVnaW5VcGRhdGVNb3Jl UmVzb3VyY2VzQ29tcGxldGUoYm9vbCBtb3JlUGVuZGluZyk7CisgICAgLy8gQ2FsbCB0aGlzIG9u bHkgaW4gcmVzcG9uc2UgdG8gcmVjZWl2aW5nIGFuIEFDVElPTl9CRUdJTl9VUERBVEVfUkVTT1VS Q0VTCisgICAgLy8gZnJvbSBuZXh0U3RhdGUuIEluZGljYXRlcyB0aGF0IGFsbCByZXNvdXJjZSB1 cGRhdGVzIGNvbXBsZXRlZC4KKyAgICB2b2lkIHVwZGF0ZVJlc291cmNlc0NvbXBsZXRlKCk7CiAK ICAgICAvLyBSZXF1ZXN0IGV4Y2x1c2l2ZSBhY2Nlc3MgdG8gdGhlIHRleHR1cmVzIHRoYXQgYmFj ayBzaW5nbGUgYnVmZmVyZWQKICAgICAvLyBsYXllcnMgb24gYmVoYWxmIG9mIHRoZSBtYWluIHRo cmVhZC4gVXBvbiBhY3F1c2l0aW9uLApAQCAtMTY4LDcgKzE2OCw3IEBAIHByb3RlY3RlZDoKICAg ICBib29sIG1fbmVlZHNDb21taXQ7CiAgICAgYm9vbCBtX25lZWRzRm9yY2VkQ29tbWl0OwogICAg IGJvb2wgbV9tYWluVGhyZWFkTmVlZHNMYXllclRleHR1cmVzOwotICAgIGJvb2wgbV91cGRhdGVN b3JlUmVzb3VyY2VzUGVuZGluZzsKKyAgICBib29sIG1fdXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQ ZW5kaW5nOwogICAgIGJvb2wgbV9pbnNpZGVWU3luYzsKICAgICBib29sIG1fdmlzaWJsZTsKICAg ICBib29sIG1fY2FuQmVnaW5GcmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LmNwcAppbmRleCA3ZGZi YmMwMGI5NTRkZjUyNDE5M2U2OTUxZjVkZTU0MjBjOGNiN2YxLi41NGZjODcyMzE4N2I2ZjYxZDMw YTRjOTMzYjM0MWVmMDUwMmVlNWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9DQ1NjaGVkdWxlclN0YXRlTWFjaGluZVRlc3QuY3BwCkBAIC02NSw4 ICs2NSw4IEBAIHB1YmxpYzoKICAgICBib29sIGluc2lkZVZTeW5jKCkgY29uc3QgeyByZXR1cm4g bV9pbnNpZGVWU3luYzsgfQogICAgIGJvb2wgdmlzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmlz aWJsZTsgfQogCi0gICAgdm9pZCBzZXRVcGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyhib29sIGIp IHsgbV91cGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyA9IGI7IH0KLSAgICBib29sIHVwZGF0ZU1v cmVSZXNvdXJjZXNQZW5kaW5nKCkgY29uc3QgeyByZXR1cm4gbV91cGRhdGVNb3JlUmVzb3VyY2Vz UGVuZGluZzsgfQorICAgIHZvaWQgc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKGJv b2wgYikgeyBtX3VwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyA9IGI7IH0KKyAgICBib29s IHVwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fdXBkYXRl UmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nOyB9CiB9OwogCiBURVNUKENDU2NoZWR1bGVyU3RhdGVN YWNoaW5lVGVzdCwgVGVzdE5leHRBY3Rpb25CZWdpbnNGcmFtZUlmTmVlZGVkKQpAQCAtNzgsNyAr NzgsNyBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwgVGVzdE5leHRBY3Rpb25C ZWdpbnNGcmFtZUlmTmVlZGVkKQogICAgICAgICBzdGF0ZS5zZXRDYW5CZWdpbkZyYW1lKHRydWUp OwogICAgICAgICBzdGF0ZS5zZXROZWVkc1JlZHJhdyhmYWxzZSk7CiAgICAgICAgIHN0YXRlLnNl dE5lZWRzQ29tbWl0KGZhbHNlKTsKLSAgICAgICAgc3RhdGUuc2V0VXBkYXRlTW9yZVJlc291cmNl c1BlbmRpbmcoZmFsc2UpOworICAgICAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0 ZVBlbmRpbmcoZmFsc2UpOwogICAgICAgICBzdGF0ZS5zZXRWaXNpYmxlKHRydWUpOwogCiAgICAg ICAgIEVYUEVDVF9GQUxTRShzdGF0ZS52c3luY0NhbGxiYWNrTmVlZGVkKCkpOwpAQCAtOTYsNyAr OTYsNyBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwgVGVzdE5leHRBY3Rpb25C ZWdpbnNGcmFtZUlmTmVlZGVkKQogICAgICAgICBzdGF0ZS5zZXRDb21taXRTdGF0ZShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6Q09NTUlUX1NUQVRFX0lETEUpOwogICAgICAgICBzdGF0ZS5zZXRO ZWVkc1JlZHJhdyhmYWxzZSk7CiAgICAgICAgIHN0YXRlLnNldE5lZWRzQ29tbWl0KGZhbHNlKTsK LSAgICAgICAgc3RhdGUuc2V0VXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcoZmFsc2UpOworICAg ICAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcoZmFsc2UpOwogICAg ICAgICBzdGF0ZS5zZXRWaXNpYmxlKHRydWUpOwogCiAgICAgICAgIEVYUEVDVF9GQUxTRShzdGF0 ZS52c3luY0NhbGxiYWNrTmVlZGVkKCkpOwpAQCAtMTE2LDcgKzExNiw3IEBAIFRFU1QoQ0NTY2hl ZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0TmV4dEFjdGlvbkJlZ2luc0ZyYW1lSWZOZWVkZWQp CiAgICAgICAgIHN0YXRlLnNldENhbkJlZ2luRnJhbWUodHJ1ZSk7CiAgICAgICAgIHN0YXRlLnNl dE5lZWRzUmVkcmF3KGZhbHNlKTsKICAgICAgICAgc3RhdGUuc2V0TmVlZHNDb21taXQodHJ1ZSk7 Ci0gICAgICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nKGZhbHNlKTsKKyAg ICAgICAgc3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKGZhbHNlKTsKICAg ICAgICAgc3RhdGUuc2V0VmlzaWJsZSh0cnVlKTsKICAgICAgICAgRVhQRUNUX0ZBTFNFKHN0YXRl LnZzeW5jQ2FsbGJhY2tOZWVkZWQoKSk7CiAgICAgfQpAQCAtMjIyLDEwICsyMjIsMTAgQEAgVEVT VChDQ1NjaGVkdWxlclN0YXRlTWFjaGluZVRlc3QsIFRlc3RDb21taXRBZnRlckZhaWxlZERyYXdB bGxvd3NEcmF3SW5TYW1lRnJhbWUKICAgICBFWFBFQ1RfVFJVRShzdGF0ZS5jb21taXRQZW5kaW5n KCkpOwogCiAgICAgLy8gRmluaXNoIHRoZSBjb21taXQuCi0gICAgc3RhdGUuYmVnaW5GcmFtZUNv bXBsZXRlKCk7Ci0gICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05f QkVHSU5fVVBEQVRFX01PUkVfUkVTT1VSQ0VTLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotICAgIHN0 YXRlLnVwZGF0ZVN0YXRlKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBE QVRFX01PUkVfUkVTT1VSQ0VTKTsKLSAgICBzdGF0ZS5iZWdpblVwZGF0ZU1vcmVSZXNvdXJjZXND b21wbGV0ZShmYWxzZSk7CisgICAgc3RhdGUuYmVnaW5GcmFtZUNvbXBsZXRlKHRydWUpOworICAg IEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9S RVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CisgICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NT Y2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfUkVTT1VSQ0VTKTsKKyAg ICBzdGF0ZS51cGRhdGVSZXNvdXJjZXNDb21wbGV0ZSgpOwogICAgIEVYUEVDVF9FUShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0NPTU1JVCwgc3RhdGUubmV4dEFjdGlvbigpKTsKICAg ICBzdGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0NPTU1J VCk7CiAgICAgRVhQRUNUX1RSVUUoc3RhdGUucmVkcmF3UGVuZGluZygpKTsKQEAgLTI3MywxMCAr MjczLDEwIEBAIFRFU1QoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0Q29tbWl0QWZ0 ZXJGYWlsZWRBbmRTdWNjZXNzZnVsRHJhd0RvZXNOb3RBCiAgICAgRVhQRUNUX1RSVUUoc3RhdGUu Y29tbWl0UGVuZGluZygpKTsKIAogICAgIC8vIEZpbmlzaCB0aGUgY29tbWl0LgotICAgIHN0YXRl LmJlZ2luRnJhbWVDb21wbGV0ZSgpOwotICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlv bigpKTsKLSAgICBzdGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNU SU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUyk7Ci0gICAgc3RhdGUuYmVnaW5VcGRhdGVN b3JlUmVzb3VyY2VzQ29tcGxldGUoZmFsc2UpOworICAgIHN0YXRlLmJlZ2luRnJhbWVDb21wbGV0 ZSh0cnVlKTsKKyAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9C RUdJTl9VUERBVEVfUkVTT1VSQ0VTLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOworICAgIHN0YXRlLnVw ZGF0ZVN0YXRlKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX1JF U09VUkNFUyk7CisgICAgc3RhdGUudXBkYXRlUmVzb3VyY2VzQ29tcGxldGUoKTsKICAgICBFWFBF Q1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9DT01NSVQsIHN0YXRlLm5leHRB Y3Rpb24oKSk7CiAgICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6 OkFDVElPTl9DT01NSVQpOwogICAgIEVYUEVDVF9UUlVFKHN0YXRlLnJlZHJhd1BlbmRpbmcoKSk7 CkBAIC0zMTUsMTAgKzMxNSwxMCBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwg VGVzdEZhaWxlZERyYXdzV2lsbEV2ZW50dWFsbHlGb3JjZUFEcmF3QWZ0ZXJUaAogCiAgICAgLy8g RmluaXNoIHRoZSBjb21taXQuIE5vdGUsIHdlIHNob3VsZCBub3QgeWV0IGJlIGZvcmNpbmcgYSBk cmF3LCBidXQgc2hvdWxkCiAgICAgLy8gY29udGludWUgdGhlIGNvbW1pdCBhcyB1c3VhbC4KLSAg ICBzdGF0ZS5iZWdpbkZyYW1lQ29tcGxldGUoKTsKLSAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJT dGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVMsIHN0YXRlLm5l eHRBY3Rpb24oKSk7Ci0gICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hp bmU6OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVMpOwotICAgIHN0YXRlLmJlZ2lu VXBkYXRlTW9yZVJlc291cmNlc0NvbXBsZXRlKGZhbHNlKTsKKyAgICBzdGF0ZS5iZWdpbkZyYW1l Q29tcGxldGUodHJ1ZSk7CisgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpB Q1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKKyAgICBz dGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQ REFURV9SRVNPVVJDRVMpOworICAgIHN0YXRlLnVwZGF0ZVJlc291cmNlc0NvbXBsZXRlKCk7CiAg ICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQ09NTUlULCBzdGF0 ZS5uZXh0QWN0aW9uKCkpOwogICAgIHN0YXRlLnVwZGF0ZVN0YXRlKENDU2NoZWR1bGVyU3RhdGVN YWNoaW5lOjpBQ1RJT05fQ09NTUlUKTsKICAgICBFWFBFQ1RfVFJVRShzdGF0ZS5yZWRyYXdQZW5k aW5nKCkpOwpAQCAtNDMwLDI1ICs0MzAsMjUgQEAgVEVTVChDQ1NjaGVkdWxlclN0YXRlTWFjaGlu ZVRlc3QsIFRlc3ROZXh0QWN0aW9uRHJhd3NPblZTeW5jKQogCiAgICAgICAgICAgICAvLyBDYXNl IDE6IG5lZWRzQ29tbWl0PWZhbHNlIHVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nPWZhbHNlLgog ICAgICAgICAgICAgc3RhdGUuc2V0TmVlZHNDb21taXQoZmFsc2UpOwotICAgICAgICAgICAgc3Rh dGUuc2V0VXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcoZmFsc2UpOworICAgICAgICAgICAgc3Rh dGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKGZhbHNlKTsKICAgICAgICAgICAg IEVYUEVDVF9UUlVFKHN0YXRlLnZzeW5jQ2FsbGJhY2tOZWVkZWQoKSk7CiAgICAgICAgICAgICBF WFBFQ1RfRVEoZXhwZWN0ZWRBY3Rpb24sIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAKICAgICAgICAg ICAgIC8vIENhc2UgMjogbmVlZHNDb21taXQ9ZmFsc2UgdXBkYXRlTW9yZVJlc291cmNlc1BlbmRp bmc9dHJ1ZS4KICAgICAgICAgICAgIHN0YXRlLnNldE5lZWRzQ29tbWl0KGZhbHNlKTsKLSAgICAg ICAgICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nKHRydWUpOworICAgICAg ICAgICAgc3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKHRydWUpOwogICAg ICAgICAgICAgRVhQRUNUX1RSVUUoc3RhdGUudnN5bmNDYWxsYmFja05lZWRlZCgpKTsKICAgICAg ICAgICAgIEVYUEVDVF9FUShleHBlY3RlZEFjdGlvbiwgc3RhdGUubmV4dEFjdGlvbigpKTsKIAog ICAgICAgICAgICAgLy8gQ2FzZSAzOiBuZWVkc0NvbW1pdD10cnVlIHVwZGF0ZU1vcmVSZXNvdXJj ZXNQZW5kaW5nPWZhbHNlLgogICAgICAgICAgICAgc3RhdGUuc2V0TmVlZHNDb21taXQodHJ1ZSk7 Ci0gICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyhmYWxzZSk7 CisgICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcoZmFs c2UpOwogICAgICAgICAgICAgRVhQRUNUX1RSVUUoc3RhdGUudnN5bmNDYWxsYmFja05lZWRlZCgp KTsKICAgICAgICAgICAgIEVYUEVDVF9FUShleHBlY3RlZEFjdGlvbiwgc3RhdGUubmV4dEFjdGlv bigpKTsKIAogICAgICAgICAgICAgLy8gQ2FzZSA0OiBuZWVkc0NvbW1pdD10cnVlIHVwZGF0ZU1v cmVSZXNvdXJjZXNQZW5kaW5nPXRydWUuCiAgICAgICAgICAgICBzdGF0ZS5zZXROZWVkc0NvbW1p dCh0cnVlKTsKLSAgICAgICAgICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5n KHRydWUpOworICAgICAgICAgICAgc3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5k aW5nKHRydWUpOwogICAgICAgICAgICAgRVhQRUNUX1RSVUUoc3RhdGUudnN5bmNDYWxsYmFja05l ZWRlZCgpKTsKICAgICAgICAgICAgIEVYUEVDVF9FUShleHBlY3RlZEFjdGlvbiwgc3RhdGUubmV4 dEFjdGlvbigpKTsKICAgICAgICAgfQpAQCAtNDcxLDIyICs0NzEsMjIgQEAgVEVTVChDQ1NjaGVk dWxlclN0YXRlTWFjaGluZVRlc3QsIFRlc3ROb0NvbW1pdFN0YXRlc1JlZHJhd1doZW5JbnZpc2li bGUpCiAKICAgICAgICAgICAgIC8vIENhc2UgMTogbmVlZHNDb21taXQ9ZmFsc2UgdXBkYXRlTW9y ZVJlc291cmNlc1BlbmRpbmc9ZmFsc2UuCiAgICAgICAgICAgICBzdGF0ZS5zZXROZWVkc0NvbW1p dChmYWxzZSk7Ci0gICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVNb3JlUmVzb3VyY2VzUGVuZGlu ZyhmYWxzZSk7CisgICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBl bmRpbmcoZmFsc2UpOwogICAgICAgICAgICAgRVhQRUNUX05FKENDU2NoZWR1bGVyU3RhdGVNYWNo aW5lOjpBQ1RJT05fRFJBV19JRl9QT1NTSUJMRSwgc3RhdGUubmV4dEFjdGlvbigpKTsKIAogICAg ICAgICAgICAgLy8gQ2FzZSAyOiBuZWVkc0NvbW1pdD1mYWxzZSB1cGRhdGVNb3JlUmVzb3VyY2Vz UGVuZGluZz10cnVlLgogICAgICAgICAgICAgc3RhdGUuc2V0TmVlZHNDb21taXQoZmFsc2UpOwot ICAgICAgICAgICAgc3RhdGUuc2V0VXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmcodHJ1ZSk7Cisg ICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcodHJ1ZSk7 CiAgICAgICAgICAgICBFWFBFQ1RfTkUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9E UkFXX0lGX1BPU1NJQkxFLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwogCiAgICAgICAgICAgICAvLyBD YXNlIDM6IG5lZWRzQ29tbWl0PXRydWUgdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmc9ZmFsc2Uu CiAgICAgICAgICAgICBzdGF0ZS5zZXROZWVkc0NvbW1pdCh0cnVlKTsKLSAgICAgICAgICAgIHN0 YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nKGZhbHNlKTsKKyAgICAgICAgICAgIHN0 YXRlLnNldFVwZGF0ZVJlc291cmNlc0NvbXBsZXRlUGVuZGluZyhmYWxzZSk7CiAgICAgICAgICAg ICBFWFBFQ1RfTkUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9EUkFXX0lGX1BPU1NJ QkxFLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwogCiAgICAgICAgICAgICAvLyBDYXNlIDQ6IG5lZWRz Q29tbWl0PXRydWUgdXBkYXRlTW9yZVJlc291cmNlc1BlbmRpbmc9dHJ1ZS4KICAgICAgICAgICAg IHN0YXRlLnNldE5lZWRzQ29tbWl0KHRydWUpOwotICAgICAgICAgICAgc3RhdGUuc2V0VXBkYXRl TW9yZVJlc291cmNlc1BlbmRpbmcodHJ1ZSk7CisgICAgICAgICAgICBzdGF0ZS5zZXRVcGRhdGVS ZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcodHJ1ZSk7CiAgICAgICAgICAgICBFWFBFQ1RfTkUoQ0NT Y2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9EUkFXX0lGX1BPU1NJQkxFLCBzdGF0ZS5uZXh0 QWN0aW9uKCkpOwogICAgICAgICB9CiAgICAgfQpAQCAtNTE5LDcgKzUxOSw3IEBAIFRFU1QoQ0NT Y2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0Q2FuUmVkcmF3V2l0aFdhaXRpbmdGb3JGaXJz dERyYXdNYWtlc1Byb2dyCiAgICAgc3RhdGUuc2V0Q2FuQmVnaW5GcmFtZSh0cnVlKTsKICAgICBz dGF0ZS5zZXROZWVkc0NvbW1pdCh0cnVlKTsKICAgICBzdGF0ZS5zZXROZWVkc1JlZHJhdyh0cnVl KTsKLSAgICBzdGF0ZS5zZXRVcGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyhmYWxzZSk7CisgICAg c3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKGZhbHNlKTsKICAgICBzdGF0 ZS5zZXRWaXNpYmxlKHRydWUpOwogICAgIHN0YXRlLnNldENhbkRyYXcoZmFsc2UpOwogICAgIEVY UEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX0ZSQU1FLCBzdGF0 ZS5uZXh0QWN0aW9uKCkpOwpAQCAtNTMwLDE2ICs1MzAsMTYgQEAgVEVTVChDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZVRlc3QsIFRlc3RVcGRhdGVzX05vUmVkcmF3X09uZVJvdW5kT2ZVcGRhdGVzKQog ICAgIFN0YXRlTWFjaGluZSBzdGF0ZTsKICAgICBzdGF0ZS5zZXRDb21taXRTdGF0ZShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6Q09NTUlUX1NUQVRFX1VQREFUSU5HX1JFU09VUkNFUyk7CiAgICAg c3RhdGUuc2V0TmVlZHNSZWRyYXcoZmFsc2UpOwotICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNv dXJjZXNQZW5kaW5nKGZhbHNlKTsKKyAgICBzdGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0 ZVBlbmRpbmcoZmFsc2UpOwogICAgIHN0YXRlLnNldFZpc2libGUodHJ1ZSk7CiAKICAgICAvLyBW ZXJpZnkgd2UgYmVnaW4gdXBkYXRlLCBib3RoIGZvciB2c3luYyBhbmQgbm90IHZzeW5jLgotICAg IEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9N T1JFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKKyAgICBFWFBFQ1RfRVEoQ0NTY2hl ZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfUkVTT1VSQ0VTLCBzdGF0ZS5u ZXh0QWN0aW9uKCkpOwogICAgIHN0YXRlLmRpZEVudGVyVlN5bmMoKTsKLSAgICBFWFBFQ1RfRVEo Q0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJD RVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CisgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVN YWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigp KTsKIAogICAgIC8vIEJlZ2luIGFuIHVwZGF0ZS4KLSAgICBzdGF0ZS51cGRhdGVTdGF0ZShDQ1Nj aGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUyk7 CisgICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9C RUdJTl9VUERBVEVfUkVTT1VSQ0VTKTsKIAogICAgIC8vIFZlcmlmeSB3ZSBkb24ndCBkbyBhbnl0 aGluZywgYm90aCBmb3IgdnN5bmMgYW5kIG5vdCB2c3luYy4KICAgICBzdGF0ZS5kaWRMZWF2ZVZT eW5jKCk7CkBAIC01NDgsNjQgKzU0OCwyMSBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5l VGVzdCwgVGVzdFVwZGF0ZXNfTm9SZWRyYXdfT25lUm91bmRPZlVwZGF0ZXMpCiAgICAgRVhQRUNU X0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fTk9ORSwgc3RhdGUubmV4dEFjdGlv bigpKTsKIAogICAgIC8vIEVuZCB1cGRhdGUgd2l0aCBubyBtb3JlIHVwZGF0ZXMgcGVuZGluZy4K LSAgICBzdGF0ZS5iZWdpblVwZGF0ZU1vcmVSZXNvdXJjZXNDb21wbGV0ZShmYWxzZSk7CisgICAg c3RhdGUudXBkYXRlUmVzb3VyY2VzQ29tcGxldGUoKTsKICAgICBzdGF0ZS5kaWRMZWF2ZVZTeW5j KCk7CiAgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQ09NTUlU LCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwogfQogCi1URVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5l VGVzdCwgVGVzdFVwZGF0ZXNfTm9SZWRyYXdfVHdvUm91bmRzT2ZVcGRhdGVzKQotewotICAgIFN0 YXRlTWFjaGluZSBzdGF0ZTsKLSAgICBzdGF0ZS5zZXRDb21taXRTdGF0ZShDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZTo6Q09NTUlUX1NUQVRFX1VQREFUSU5HX1JFU09VUkNFUyk7Ci0gICAgc3RhdGUu c2V0TmVlZHNSZWRyYXcoZmFsc2UpOwotICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQ ZW5kaW5nKGZhbHNlKTsKLSAgICBzdGF0ZS5zZXRWaXNpYmxlKHRydWUpOwotCi0gICAgLy8gVmVy aWZ5IHRoZSB1cGRhdGUgYmVnaW5zLCBib3RoIGZvciB2c3luYyBhbmQgbm90IHZzeW5jLgotICAg IHN0YXRlLmRpZEVudGVyVlN5bmMoKTsKLSAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1h Y2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rp b24oKSk7Ci0gICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwotICAgIEVYUEVDVF9FUShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUywgc3Rh dGUubmV4dEFjdGlvbigpKTsKLQotICAgIC8vIEJlZ2luIGFuIHVwZGF0ZS4KLSAgICBzdGF0ZS51 cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9N T1JFX1JFU09VUkNFUyk7Ci0KLSAgICAvLyBWZXJpZnkgd2UgZG8gbm90aGluZywgYm90aCBmb3Ig dnN5bmMgYW5kIG5vdCB2c3luYy4KLSAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hp bmU6OkFDVElPTl9OT05FLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotICAgIHN0YXRlLmRpZEVudGVy VlN5bmMoKTsKLSAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9O T05FLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotCi0gICAgLy8gQWNrIHRoZSB1cGRhdGUgd2l0aCBt b3JlIHBlbmRpbmcuCi0gICAgc3RhdGUuYmVnaW5VcGRhdGVNb3JlUmVzb3VyY2VzQ29tcGxldGUo dHJ1ZSk7Ci0KLSAgICAvLyBWZXJpZnkgd2UgdXBkYXRlIG1vcmUsIGJvdGggZm9yIHZzeW5jIGFu ZCBub3QgdnN5bmMuCi0gICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwotICAgIEVYUEVDVF9FUShD Q1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNF Uywgc3RhdGUubmV4dEFjdGlvbigpKTsKLSAgICBzdGF0ZS5kaWRFbnRlclZTeW5jKCk7Ci0gICAg RVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX01P UkVfUkVTT1VSQ0VTLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotCi0gICAgLy8gQmVnaW4gYW5vdGhl ciB1cGRhdGUsIHdoaWxlIGluc2lkZSB2c3luYy4gQW5kLCBpdCB1cGRhdGluZy4KLSAgICBzdGF0 ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFU RV9NT1JFX1JFU09VUkNFUyk7Ci0gICAgc3RhdGUuYmVnaW5VcGRhdGVNb3JlUmVzb3VyY2VzQ29t cGxldGUoZmFsc2UpOwotCi0gICAgLy8gTWFrZSBzdXJlIHdlIGNvbW1pdCwgaW5kZXBlbmRlbnQg b2YgdnN5bmMuCi0gICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwotICAgIEVYUEVDVF9FUShDQ1Nj aGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0NPTU1JVCwgc3RhdGUubmV4dEFjdGlvbigpKTsK LSAgICBzdGF0ZS5kaWRFbnRlclZTeW5jKCk7Ci0gICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3Rh dGVNYWNoaW5lOjpBQ1RJT05fQ09NTUlULCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotfQotCi0KIFRF U1QoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0VlN5bmNOZWVkZWRXaGVuVXBkYXRl c1BlbmRpbmdCdXRJbnZpc2libGUpCiB7CiAgICAgU3RhdGVNYWNoaW5lIHN0YXRlOwogICAgIHN0 YXRlLnNldENvbW1pdFN0YXRlKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpDT01NSVRfU1RBVEVf VVBEQVRJTkdfUkVTT1VSQ0VTKTsKICAgICBzdGF0ZS5zZXROZWVkc1JlZHJhdyhmYWxzZSk7CiAg ICAgc3RhdGUuc2V0VmlzaWJsZShmYWxzZSk7Ci0gICAgc3RhdGUuc2V0VXBkYXRlTW9yZVJlc291 cmNlc1BlbmRpbmcodHJ1ZSk7CisgICAgc3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQ ZW5kaW5nKHRydWUpOwogICAgIEVYUEVDVF9UUlVFKHN0YXRlLnZzeW5jQ2FsbGJhY2tOZWVkZWQo KSk7CiAKLSAgICBzdGF0ZS5zZXRVcGRhdGVNb3JlUmVzb3VyY2VzUGVuZGluZyhmYWxzZSk7Cisg ICAgc3RhdGUuc2V0VXBkYXRlUmVzb3VyY2VzQ29tcGxldGVQZW5kaW5nKGZhbHNlKTsKICAgICBF WFBFQ1RfVFJVRShzdGF0ZS52c3luY0NhbGxiYWNrTmVlZGVkKCkpOwogfQogCkBAIC02MTQsMTIg KzU3MSwxMiBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwgVGVzdFVwZGF0ZXNf V2l0aFJlZHJhd19PbmVSb3VuZE9mVXBkYXRlcykKICAgICBTdGF0ZU1hY2hpbmUgc3RhdGU7CiAg ICAgc3RhdGUuc2V0Q29tbWl0U3RhdGUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkNPTU1JVF9T VEFURV9VUERBVElOR19SRVNPVVJDRVMpOwogICAgIHN0YXRlLnNldE5lZWRzUmVkcmF3KHRydWUp OwotICAgIHN0YXRlLnNldFVwZGF0ZU1vcmVSZXNvdXJjZXNQZW5kaW5nKGZhbHNlKTsKKyAgICBz dGF0ZS5zZXRVcGRhdGVSZXNvdXJjZXNDb21wbGV0ZVBlbmRpbmcoZmFsc2UpOwogICAgIHN0YXRl LnNldFZpc2libGUodHJ1ZSk7Ci0gICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5l OjpBQ1RJT05fQkVHSU5fVVBEQVRFX01PUkVfUkVTT1VSQ0VTLCBzdGF0ZS5uZXh0QWN0aW9uKCkp OworICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQ REFURV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAKICAgICAvLyBCZWdpbiBhbiB1 cGRhdGUuCi0gICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFD VElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVMpOworICAgIHN0YXRlLnVwZGF0ZVN0YXRl KENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUyk7 CiAKICAgICAvLyBFbnN1cmUgd2UgZHJhdyBvbiB0aGUgbmV4dCB2c3luYyBldmVuIHRob3VnaCBh biB1cGRhdGUgaXMgaW4tcHJvZ3Jlc3MuCiAgICAgc3RhdGUuZGlkRW50ZXJWU3luYygpOwpAQCAt NjMyLDIzICs1ODksNyBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwgVGVzdFVw ZGF0ZXNfV2l0aFJlZHJhd19PbmVSb3VuZE9mVXBkYXRlcykKIAogICAgIC8vIExlYXZlIHRoZSB2 c3luYyBiZWZvcmUgd2UgZmluaXNoIHRoZSB1cGRhdGUuCiAgICAgc3RhdGUuZGlkTGVhdmVWU3lu YygpOwotCi0gICAgLy8gRmluaXNoIHVwZGF0ZSBidXQgbGVhdmUgbW9yZSByZXNvdXJjZXMgcGVu ZGluZy4KLSAgICBzdGF0ZS5iZWdpblVwZGF0ZU1vcmVSZXNvdXJjZXNDb21wbGV0ZSh0cnVlKTsK LQotICAgIC8vIFZlcmlmeSB0aGF0IHJlZ2FyZGxlc3Mgb2YgdnN5bmMsIHdlIHVwZGF0ZSBzb21l IG1vcmUuCi0gICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwotICAgIEVYUEVDVF9FUShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUywgc3Rh dGUubmV4dEFjdGlvbigpKTsKLSAgICBzdGF0ZS5kaWRFbnRlclZTeW5jKCk7Ci0gICAgRVhQRUNU X0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX01PUkVfUkVT T1VSQ0VTLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwotICAgIHN0YXRlLmRpZEVudGVyVlN5bmMoKTsK LSAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERB VEVfTU9SRV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7Ci0KLSAgICAvLyBCZWdpbiBh bm90aGVyIHVwZGF0ZS4gRmluaXNoIGl0IGltbWVkaWF0ZWx5LiBJbnNpZGUgdGhlIHZzeW5jLgot ICAgIHN0YXRlLmRpZEVudGVyVlN5bmMoKTsKLSAgICBzdGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVk dWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUyk7Ci0g ICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwotICAgIHN0YXRlLmJlZ2luVXBkYXRlTW9yZVJlc291 cmNlc0NvbXBsZXRlKGZhbHNlKTsKKyAgICBzdGF0ZS51cGRhdGVSZXNvdXJjZXNDb21wbGV0ZSgp OwogCiAgICAgLy8gVmVyaWZ5IHdlIGNvbW1pdCByZWdhcmRsZXNzIG9mIHZzeW5jIHN0YXRlCiAg ICAgc3RhdGUuZGlkTGVhdmVWU3luYygpOwpAQCAtNjc0LDEyICs2MTUsMTIgQEAgVEVTVChDQ1Nj aGVkdWxlclN0YXRlTWFjaGluZVRlc3QsIFRlc3RTZXROZWVkc0NvbW1pdElzTm90TG9zdCkKICAg ICBFWFBFQ1RfVFJVRShzdGF0ZS5uZWVkc0NvbW1pdCgpKTsKIAogICAgIC8vIExldCB0aGUgZnJh bWUgZmluaXNoLgotICAgIHN0YXRlLmJlZ2luRnJhbWVDb21wbGV0ZSgpOworICAgIHN0YXRlLmJl Z2luRnJhbWVDb21wbGV0ZSh0cnVlKTsKICAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1h Y2hpbmU6OkNPTU1JVF9TVEFURV9VUERBVElOR19SRVNPVVJDRVMsIHN0YXRlLmNvbW1pdFN0YXRl KCkpOwotICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lO X1VQREFURV9NT1JFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKLSAgICBzdGF0ZS51 cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9N T1JFX1JFU09VUkNFUyk7CisgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpB Q1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKKyAgICBz dGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQ REFURV9SRVNPVVJDRVMpOwogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6 QUNUSU9OX05PTkUsIHN0YXRlLm5leHRBY3Rpb24oKSk7Ci0gICAgc3RhdGUuYmVnaW5VcGRhdGVN b3JlUmVzb3VyY2VzQ29tcGxldGUoZmFsc2UpOworICAgIHN0YXRlLnVwZGF0ZVJlc291cmNlc0Nv bXBsZXRlKCk7CiAgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpDT01NSVRf U1RBVEVfUkVBRFlfVE9fQ09NTUlULCBzdGF0ZS5jb21taXRTdGF0ZSgpKTsKIAogICAgIC8vIEV4 cGVjdCB0byBjb21taXQgcmVnYXJkbGVzcyBvZiB2c3luYyBzdGF0ZS4KQEAgLTcxNywxMyArNjU4 LDEzIEBAIFRFU1QoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0RnVsbEN5Y2xlKQog ICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX05PTkUsIHN0YXRl Lm5leHRBY3Rpb24oKSk7CiAKICAgICAvLyBUZWxsIHRoZSBzY2hlZHVsZXIgdGhlIGZyYW1lIGZp bmlzaGVkLgotICAgIHN0YXRlLmJlZ2luRnJhbWVDb21wbGV0ZSgpOworICAgIHN0YXRlLmJlZ2lu RnJhbWVDb21wbGV0ZSh0cnVlKTsKICAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hp bmU6OkNPTU1JVF9TVEFURV9VUERBVElOR19SRVNPVVJDRVMsIHN0YXRlLmNvbW1pdFN0YXRlKCkp OwotICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQ REFURV9NT1JFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKKyAgICBFWFBFQ1RfRVEo Q0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfUkVTT1VSQ0VTLCBz dGF0ZS5uZXh0QWN0aW9uKCkpOwogCiAgICAgLy8gVGVsbCB0aGUgc2NoZWR1bGVyIHRoZSB1cGRh dGUgYmVnYW4gYW5kIGZpbmlzaGVkCi0gICAgc3RhdGUudXBkYXRlU3RhdGUoQ0NTY2hlZHVsZXJT dGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVfTU9SRV9SRVNPVVJDRVMpOwotICAgIHN0 YXRlLmJlZ2luVXBkYXRlTW9yZVJlc291cmNlc0NvbXBsZXRlKGZhbHNlKTsKKyAgICBzdGF0ZS51 cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9S RVNPVVJDRVMpOworICAgIHN0YXRlLnVwZGF0ZVJlc291cmNlc0NvbXBsZXRlKCk7CiAgICAgRVhQ RUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpDT01NSVRfU1RBVEVfUkVBRFlfVE9fQ09N TUlULCBzdGF0ZS5jb21taXRTdGF0ZSgpKTsKICAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0 ZU1hY2hpbmU6OkFDVElPTl9DT01NSVQsIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAKQEAgLTc2OSwx MyArNzEwLDEzIEBAIFRFU1QoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmVUZXN0LCBUZXN0RnVsbEN5 Y2xlV2l0aENvbW1pdFJlcXVlc3RJbmJldHdlZW4pCiAgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVy U3RhdGVNYWNoaW5lOjpBQ1RJT05fTk9ORSwgc3RhdGUubmV4dEFjdGlvbigpKTsKIAogICAgIC8v IFRlbGwgdGhlIHNjaGVkdWxlciB0aGUgZnJhbWUgZmluaXNoZWQuCi0gICAgc3RhdGUuYmVnaW5G cmFtZUNvbXBsZXRlKCk7CisgICAgc3RhdGUuYmVnaW5GcmFtZUNvbXBsZXRlKHRydWUpOwogICAg IEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6Q09NTUlUX1NUQVRFX1VQREFUSU5H X1JFU09VUkNFUywgc3RhdGUuY29tbWl0U3RhdGUoKSk7Ci0gICAgRVhQRUNUX0VRKENDU2NoZWR1 bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX01PUkVfUkVTT1VSQ0VTLCBzdGF0 ZS5uZXh0QWN0aW9uKCkpOworICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6 QUNUSU9OX0JFR0lOX1VQREFURV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAKICAg ICAvLyBUZWxsIHRoZSBzY2hlZHVsZXIgdGhlIHVwZGF0ZSBiZWdhbiBhbmQgZmluaXNoZWQKLSAg ICBzdGF0ZS51cGRhdGVTdGF0ZShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lO X1VQREFURV9NT1JFX1JFU09VUkNFUyk7Ci0gICAgc3RhdGUuYmVnaW5VcGRhdGVNb3JlUmVzb3Vy Y2VzQ29tcGxldGUoZmFsc2UpOworICAgIHN0YXRlLnVwZGF0ZVN0YXRlKENDU2NoZWR1bGVyU3Rh dGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUyk7CisgICAgc3RhdGUudXBk YXRlUmVzb3VyY2VzQ29tcGxldGUoKTsKICAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1h Y2hpbmU6OkNPTU1JVF9TVEFURV9SRUFEWV9UT19DT01NSVQsIHN0YXRlLmNvbW1pdFN0YXRlKCkp OwogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0NPTU1JVCwg c3RhdGUubmV4dEFjdGlvbigpKTsKIApAQCAtOTI5LDExICs4NzAsMTEgQEAgVEVTVChDQ1NjaGVk dWxlclN0YXRlTWFjaGluZVRlc3QsIFRlc3RDb250ZXh0TG9zdFdoaWxlQ29tbWl0SW5Qcm9ncmVz cykKICAgICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9OT05FLCBz dGF0ZS5uZXh0QWN0aW9uKCkpOwogCiAgICAgLy8gRmluaXNoIHRoZSBmcmFtZSwgdXBkYXRlIHJl c291cmNlcywgYW5kIGNvbW1pdC4KLSAgICBzdGF0ZS5iZWdpbkZyYW1lQ29tcGxldGUoKTsKLSAg ICBFWFBFQ1RfRVEoQ0NTY2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9CRUdJTl9VUERBVEVf TU9SRV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CisgICAgc3RhdGUuYmVnaW5GcmFt ZUNvbXBsZXRlKHRydWUpOworICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6 QUNUSU9OX0JFR0lOX1VQREFURV9SRVNPVVJDRVMsIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAgICAg c3RhdGUudXBkYXRlU3RhdGUoc3RhdGUubmV4dEFjdGlvbigpKTsKICAgICBFWFBFQ1RfRVEoQ0NT Y2hlZHVsZXJTdGF0ZU1hY2hpbmU6OkFDVElPTl9OT05FLCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwot ICAgIHN0YXRlLmJlZ2luVXBkYXRlTW9yZVJlc291cmNlc0NvbXBsZXRlKGZhbHNlKTsKKyAgICBz dGF0ZS51cGRhdGVSZXNvdXJjZXNDb21wbGV0ZSgpOwogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxl clN0YXRlTWFjaGluZTo6QUNUSU9OX0NPTU1JVCwgc3RhdGUubmV4dEFjdGlvbigpKTsKICAgICBz dGF0ZS51cGRhdGVTdGF0ZShzdGF0ZS5uZXh0QWN0aW9uKCkpOwogCkBAIC05NzQsMTEgKzkxNSwx MSBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lVGVzdCwgVGVzdENvbnRleHRMb3N0V2hp bGVDb21taXRJblByb2dyZXNzQW5kQW5vdGhlcgogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0 YXRlTWFjaGluZTo6QUNUSU9OX05PTkUsIHN0YXRlLm5leHRBY3Rpb24oKSk7CiAKICAgICAvLyBG aW5pc2ggdGhlIGZyYW1lLCB1cGRhdGUgcmVzb3VyY2VzLCBhbmQgY29tbWl0LgotICAgIHN0YXRl LmJlZ2luRnJhbWVDb21wbGV0ZSgpOwotICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlv bigpKTsKKyAgICBzdGF0ZS5iZWdpbkZyYW1lQ29tcGxldGUodHJ1ZSk7CisgICAgRVhQRUNUX0VR KENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBEQVRFX1JFU09VUkNFUywg c3RhdGUubmV4dEFjdGlvbigpKTsKICAgICBzdGF0ZS51cGRhdGVTdGF0ZShzdGF0ZS5uZXh0QWN0 aW9uKCkpOwogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX05P TkUsIHN0YXRlLm5leHRBY3Rpb24oKSk7Ci0gICAgc3RhdGUuYmVnaW5VcGRhdGVNb3JlUmVzb3Vy Y2VzQ29tcGxldGUoZmFsc2UpOworICAgIHN0YXRlLnVwZGF0ZVJlc291cmNlc0NvbXBsZXRlKCk7 CiAgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQ09NTUlULCBz dGF0ZS5uZXh0QWN0aW9uKCkpOwogICAgIHN0YXRlLnVwZGF0ZVN0YXRlKHN0YXRlLm5leHRBY3Rp b24oKSk7CiAKQEAgLTEwNTEsMTEgKzk5MiwxMSBAQCBURVNUKENDU2NoZWR1bGVyU3RhdGVNYWNo aW5lVGVzdCwgVGVzdEJlZ2luRnJhbWVXaGVuQ29tbWl0SW5Qcm9ncmVzcykKICAgICBzdGF0ZS5z ZXROZWVkc0NvbW1pdCh0cnVlKTsKICAgICBzdGF0ZS5zZXROZWVkc0ZvcmNlZENvbW1pdCh0cnVl KTsKIAotICAgIHN0YXRlLmJlZ2luRnJhbWVDb21wbGV0ZSgpOwotICAgIEVYUEVDVF9FUShDQ1Nj aGVkdWxlclN0YXRlTWFjaGluZTo6QUNUSU9OX0JFR0lOX1VQREFURV9NT1JFX1JFU09VUkNFUywg c3RhdGUubmV4dEFjdGlvbigpKTsKKyAgICBzdGF0ZS5iZWdpbkZyYW1lQ29tcGxldGUodHJ1ZSk7 CisgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpBQ1RJT05fQkVHSU5fVVBE QVRFX1JFU09VUkNFUywgc3RhdGUubmV4dEFjdGlvbigpKTsKICAgICBzdGF0ZS51cGRhdGVTdGF0 ZShzdGF0ZS5uZXh0QWN0aW9uKCkpOwogICAgIEVYUEVDVF9FUShDQ1NjaGVkdWxlclN0YXRlTWFj aGluZTo6QUNUSU9OX05PTkUsIHN0YXRlLm5leHRBY3Rpb24oKSk7Ci0gICAgc3RhdGUuYmVnaW5V cGRhdGVNb3JlUmVzb3VyY2VzQ29tcGxldGUoZmFsc2UpOworICAgIHN0YXRlLnVwZGF0ZVJlc291 cmNlc0NvbXBsZXRlKCk7CiAgICAgRVhQRUNUX0VRKENDU2NoZWR1bGVyU3RhdGVNYWNoaW5lOjpB Q1RJT05fQ09NTUlULCBzdGF0ZS5uZXh0QWN0aW9uKCkpOwogICAgIHN0YXRlLnVwZGF0ZVN0YXRl KHN0YXRlLm5leHRBY3Rpb24oKSk7CiAK