66930 2011-08-25 04:43:34 -0700 [Qt] REGRESSION(93769): inspector/console/console-tests.html fails 2011-08-25 23:51:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66861 1 feherzs pfeldman kbalazs ossy pfeldman yurys oldest_to_newest 456765 0 feherzs 2011-08-25 04:43:34 -0700 I am skipping the tests for now. 456770 1 feherzs 2011-08-25 05:06:47 -0700 The tests were skipped in http://trac.webkit.org/changeset/93775. 456782 2 ossy 2011-08-25 05:33:36 -0700 diff: --- /ramdisk/qt-linux-release/build/layout-test-results/inspector/console/console-tests-expected.txt +++ /ramdisk/qt-linux-release/build/layout-test-results/inspector/console/console-tests-actual.txt @@ -26,7 +26,7 @@ console-tests.html:11info console-message console-log-level console-tests.html:12warn console-message console-warning-level console-tests.html:13error console-message console-error-level -5console-tests.html:15repeated console-message console-log-level repeated-message +console-tests.html:15repeated console-message console-log-level console-tests.html:17count: 1 console-message console-log-level console-tests.html:17count: 2 console-message console-log-level console-tests.html:18group console-message console-log-level console-group-title Pavel and/or Yury, have you got any idea? 456789 3 pfeldman 2011-08-25 05:43:25 -0700 > Pavel and/or Yury, have you got any idea? I'll take a look. Probably regressed in http://trac.webkit.org/changeset/93769. 456810 4 105169 pfeldman 2011-08-25 06:31:59 -0700 Created attachment 105169 Patch 456814 5 105169 yurys 2011-08-25 06:37:49 -0700 Comment on attachment 105169 Patch Would be nice to complement this with a test. 456820 6 105175 pfeldman 2011-08-25 06:52:47 -0700 Created attachment 105175 Patch 456868 7 pfeldman 2011-08-25 08:23:05 -0700 Committed r93786: <http://trac.webkit.org/changeset/93786> 456930 8 kbalazs 2011-08-25 09:56:19 -0700 Thank you very much for the fix. 105169 2011-08-25 06:31:59 -0700 2011-08-25 06:52:39 -0700 Patch bug-66930-20110825173157.patch text/plain 6497 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTM3NzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmNjFhMmI5ODhiYTY2YzNh ZmJmMGFmYmYxODI2MTc3YWFlMWNiMzUwLi45NzU1MDY3NmIyYTFiOWI0OWE4MGZlM2E4NzU3N2Nk MWY3YzM3OGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDgtMjUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFtRdF0gUkVHUkVTU0lP Tig5Mzc2OSk6IGluc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGVzdHMuaHRtbCBmYWlscworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY5MzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVN b2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLnByb3RvdHlwZS5hZGRN ZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwucHJvdG90eXBlLmNs ZWFyTWVzc2FnZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5wcm90b3R5 cGUuaW50ZXJydXB0UmVwZWF0Q291bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVN b2RlbC5wcm90b3R5cGUuX21lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVEaXNwYXRjaGVyLnByb3RvdHlwZS5tZXNzYWdlUmVwZWF0Q291bnRV cGRhdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY29uc29sZU1lc3Nh Z2VBZGRlZCk6CisKIDIwMTEtMDgtMjMgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNv dHRlQG5va2lhLmNvbT4KIAogICAgICAgICBUaWxlZEJhY2tpbmdTdG9yZTogVW50aWUgdGhlIHRp bGUgaW1wbGVtZW50YXRpb24gZnJvbSB0aGUgcGxhdGZvcm0uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVsLmpzCmluZGV4IGM5ZGI1OTViNDdm OTVlNmE5NGU5M2M0ZWYyODdlODkwODQ2ZjI1MmMuLmFiZmFjZGEwNGM3NDY5NDFiZGU1ZTE2OGQ2 NGY4NTAwY2M5OWFiM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZU1vZGVsLmpzCkBAIC0zNiw2ICszNiw3IEBAIFdlYkluc3BlY3Rvci5Db25z b2xlTW9kZWwgPSBmdW5jdGlvbihkcmF3ZXIpCiAgICAgdGhpcy5tZXNzYWdlcyA9IFtdOwogICAg IHRoaXMud2FybmluZ3MgPSAwOwogICAgIHRoaXMuZXJyb3JzID0gMDsKKyAgICB0aGlzLl9pbnRl cnJ1cHRSZXBlYXRDb3VudCA9IGZhbHNlOwogICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJD b25zb2xlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVEaXNwYXRjaGVyKHRoaXMp KTsKIH0KIApAQCAtNjYsOCArNjcsMTAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5wcm90 b3R5cGUgPSB7CiAgICAgYWRkTWVzc2FnZTogZnVuY3Rpb24obXNnKQogICAgIHsKICAgICAgICAg dGhpcy5tZXNzYWdlcy5wdXNoKG1zZyk7CisgICAgICAgIHRoaXMuX3ByZXZpb3VzTWVzc2FnZSA9 IG1zZzsKICAgICAgICAgdGhpcy5faW5jcmVtZW50RXJyb3JXYXJuaW5nQ291bnQobXNnKTsKICAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnNvbGVN b2RlbC5FdmVudHMuTWVzc2FnZUFkZGVkLCBtc2cpOworICAgICAgICB0aGlzLl9pbnRlcnJ1cHRS ZXBlYXRDb3VudCA9IGZhbHNlOwogICAgIH0sCiAKICAgICBfaW5jcmVtZW50RXJyb3JXYXJuaW5n Q291bnQ6IGZ1bmN0aW9uKG1zZykKQEAgLTk2LDYgKzk5LDM1IEBAIFdlYkluc3BlY3Rvci5Db25z b2xlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLndhcm5pbmdzID0gMDsKIAogICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29uc29sZU1v ZGVsLkV2ZW50cy5Db25zb2xlQ2xlYXJlZCk7CisgICAgfSwKKworICAgIGludGVycnVwdFJlcGVh dENvdW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9pbnRlcnJ1cHRSZXBlYXRD b3VudCA9IHRydWU7CisgICAgfSwKKworICAgIF9tZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkOiBm dW5jdGlvbihjb3VudCkKKyAgICB7CisgICAgICAgIHZhciBtc2cgPSB0aGlzLl9wcmV2aW91c01l c3NhZ2U7CisgICAgICAgIGlmICghbXNnKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IHZhciBwcmV2UmVwZWF0Q291bnQgPSBtc2cudG90YWxSZXBlYXRDb3VudDsKKworICAgICAgICBp ZiAoIXRoaXMuX2ludGVycnVwdFJlcGVhdENvdW50KSB7CisgICAgICAgICAgICBtc2cucmVwZWF0 RGVsdGEgPSBjb3VudCAtIHByZXZSZXBlYXRDb3VudDsKKyAgICAgICAgICAgIG1zZy5yZXBlYXRD b3VudCA9IG1zZy5yZXBlYXRDb3VudCArIG1zZy5yZXBlYXREZWx0YTsKKyAgICAgICAgICAgIG1z Zy50b3RhbFJlcGVhdENvdW50ID0gY291bnQ7CisgICAgICAgICAgICBtc2cuX3VwZGF0ZVJlcGVh dENvdW50KCk7CisKKyAgICAgICAgICAgIHRoaXMuX2luY3JlbWVudEVycm9yV2FybmluZ0NvdW50 KG1zZyk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuQ29uc29sZU1vZGVsLkV2ZW50cy5NZXNzYWdlQWRkZWQsIG1zZyk7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICB2YXIgbXNnQ29weSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UobXNnLnNvdXJjZSwgbXNnLnR5cGUsIG1zZy5sZXZlbCwgbXNnLmxpbmUsIG1zZy51 cmwsIGNvdW50IC0gcHJldlJlcGVhdENvdW50LCBtc2cuX21lc3NhZ2VUZXh0LCBtc2cuX3BhcmFt ZXRlcnMsIG1zZy5fc3RhY2tUcmFjZSwgbXNnLl9yZXF1ZXN0KTsKKyAgICAgICAgICAgIG1zZ0Nv cHkudG90YWxSZXBlYXRDb3VudCA9IGNvdW50OworICAgICAgICAgICAgbXNnQ29weS5fZm9ybWF0 TWVzc2FnZSgpOworICAgICAgICAgICAgdGhpcy5hZGRNZXNzYWdlKG1zZ0NvcHkpOworICAgICAg ICB9CiAgICAgfQogfQogCkBAIC0xMzAsMjUgKzE2Miw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xl RGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAKICAgICBtZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVk OiBmdW5jdGlvbihjb3VudCkKICAgICB7Ci0gICAgICAgIHZhciBtc2cgPSB0aGlzLl9jb25zb2xl LnByZXZpb3VzTWVzc2FnZTsKLSAgICAgICAgaWYgKCFtc2cpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgdmFyIHByZXZSZXBlYXRDb3VudCA9IG1zZy50b3RhbFJlcGVhdENvdW50Owot Ci0gICAgICAgIGlmICghdGhpcy5fY29uc29sZS5jb21tYW5kU2luY2VQcmV2aW91c01lc3NhZ2Up IHsKLSAgICAgICAgICAgIG1zZy5yZXBlYXREZWx0YSA9IGNvdW50IC0gcHJldlJlcGVhdENvdW50 OwotICAgICAgICAgICAgbXNnLnJlcGVhdENvdW50ID0gbXNnLnJlcGVhdENvdW50ICsgbXNnLnJl cGVhdERlbHRhOwotICAgICAgICAgICAgbXNnLnRvdGFsUmVwZWF0Q291bnQgPSBjb3VudDsKLSAg ICAgICAgICAgIG1zZy5fdXBkYXRlUmVwZWF0Q291bnQoKTsKLSAgICAgICAgICAgIHRoaXMuX2Nv bnNvbGUuX2luY3JlbWVudEVycm9yV2FybmluZ0NvdW50KG1zZyk7Ci0gICAgICAgICAgICB0aGlz Ll9jb25zb2xlLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29uc29sZU1v ZGVsLkV2ZW50cy5NZXNzYWdlQWRkZWQsIG1zZyk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICB2YXIgbXNnQ29weSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UobXNnLnNv dXJjZSwgbXNnLnR5cGUsIG1zZy5sZXZlbCwgbXNnLmxpbmUsIG1zZy51cmwsIGNvdW50IC0gcHJl dlJlcGVhdENvdW50LCBtc2cuX21lc3NhZ2VUZXh0LCBtc2cuX3BhcmFtZXRlcnMsIG1zZy5fc3Rh Y2tUcmFjZSwgbXNnLl9yZXF1ZXN0KTsKLSAgICAgICAgICAgIG1zZ0NvcHkudG90YWxSZXBlYXRD b3VudCA9IGNvdW50OwotICAgICAgICAgICAgbXNnQ29weS5fZm9ybWF0TWVzc2FnZSgpOwotICAg ICAgICAgICAgdGhpcy5fY29uc29sZS5hZGRNZXNzYWdlKG1zZ0NvcHkpOwotICAgICAgICB9Cisg ICAgICAgIHRoaXMuX2NvbnNvbGUuX21lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQoY291bnQpOwog ICAgIH0sCiAKICAgICBtZXNzYWdlc0NsZWFyZWQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDg5Y2JiMzMy MTJkM2JhOWI3YTNkMzM0NjE0M2Y4MmE3YzhkZGUwNTkuLjMyN2NhNjdhMDliY2UyODhhNTE1NmFk YWY0Mzg5MGZhOWM0NTBhZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMjU2LDIzICsyNTYsOSBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX2NvbnNvbGVNZXNzYWdlQWRkZWQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5jb21tYW5kU2luY2VQcmV2aW91c01l c3NhZ2UgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5wcmV2aW91c01lc3NhZ2UgPSBldmVudC5kYXRh OwogICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlTWVzc2FnZShldmVudC5kYXRhKTsKICAgICB9 LAogCi0gICAgX2FwcGVuZENvbnNvbGVDb21tYW5kOiBmdW5jdGlvbihtc2cpCi0gICAgewotICAg ICAgICBpZiAodGhpcy5wcmV2aW91c01lc3NhZ2UpCi0gICAgICAgICAgICB0aGlzLmNvbW1hbmRT aW5jZVByZXZpb3VzTWVzc2FnZSA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVN ZXNzYWdlKG1zZyk7Ci0gICAgfSwKLQotICAgIF9hcHBlbmRDb25zb2xlQ29tbWFuZFJlc3VsdDog ZnVuY3Rpb24obXNnKQotICAgIHsKLSAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3NhZ2Uo bXNnKTsKLSAgICB9LAotCiAgICAgX2FwcGVuZENvbnNvbGVNZXNzYWdlOiBmdW5jdGlvbihtc2cp CiAgICAgewogICAgICAgICB2YXIgc2hvdWxkU2Nyb2xsVG9MYXN0TWVzc2FnZSA9IHRoaXMubWVz c2FnZXNFbGVtZW50LmlzU2Nyb2xsZWRUb0JvdHRvbSgpOwpAQCAtNTk4LDcgKzU4NCw4IEBAIFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdmFyIGNvbW1hbmRNZXNzYWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZChzdHIpOwotICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlQ29tbWFuZChjb21tYW5k TWVzc2FnZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmludGVycnVwdFJlcGVhdENv dW50KCk7CisgICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKGNvbW1hbmRNZXNzYWdl KTsKIAogICAgICAgICBmdW5jdGlvbiBwcmludFJlc3VsdChyZXN1bHQsIHdhc1Rocm93bikKICAg ICAgICAgewpAQCAtNjExLDcgKzU5OCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jb25zb2xlSGlz dG9yeS5zZXQodGhpcy5wcm9tcHQuaGlzdG9yeS5zbGljZSgtMzApKTsKIAotICAgICAgICAgICAg dGhpcy5fYXBwZW5kQ29uc29sZUNvbW1hbmRSZXN1bHQobmV3IFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdChyZXN1bHQsIHdhc1Rocm93biwgY29tbWFuZE1lc3NhZ2UpKTsKKyAgICAg ICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKG5ldyBXZWJJbnNwZWN0b3IuQ29uc29s ZUNvbW1hbmRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24sIGNvbW1hbmRNZXNzYWdlKSk7CiAgICAg ICAgIH0KICAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coc3RyLCAiY29uc29sZSIs IHRydWUsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBwcmludFJlc3VsdC5iaW5kKHRoaXMpKTsKIAo= 105175 2011-08-25 06:52:47 -0700 2011-08-25 23:51:55 -0700 Patch bug-66930-20110825175245.patch text/plain 10496 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTM3NzcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmODgwZThlMzY0ODU4MDMwYzY0OWQ2 ZjI0YWIwMGY0N2MxNTZjZmE4Li4wODBlN2VkNGNmZTUzNjVjMGMwZDkwNDJjNzU4NzUwNjgyYTc1 ZjQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMjUgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFtRdF0gUkVHUkVTU0lPTig5Mzc2OSk6IGlu c3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGVzdHMuaHRtbCBmYWlscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY5MzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbnNv bGUtcmVwZWF0LWNvdW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9y L2NvbnNvbGUvY29uc29sZS1yZXBlYXQtY291bnQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDgtMjUg WnNvbHQgRmVow6lyIDxoNDkwMjY3QHN0dWQudS1zemVnZWQuaHU+CiAKICAgICBVbnJldmlld2Vk IFF0IGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xl L2NvbnNvbGUtcmVwZWF0LWNvdW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9jb25zb2xlL2NvbnNvbGUtcmVwZWF0LWNvdW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4x MDY0M2IyY2QzYTMxYmEyNWIwZWMwMmRiZmVmYjI5N2U0NDRhMDNkCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1yZXBlYXQtY291bnQtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAxMDogU2Ft ZSBtZXNzYWdlCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTA6IFNhbWUgbWVzc2FnZQorQ09OU09M RSBNRVNTQUdFOiBsaW5lIDEwOiBTYW1lIG1lc3NhZ2UKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAx MDogU2FtZSBtZXNzYWdlCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTA6IFNhbWUgbWVzc2FnZQor Q09OU09MRSBNRVNTQUdFOiBsaW5lIDEwOiBTYW1lIG1lc3NhZ2UKK0NPTlNPTEUgTUVTU0FHRTog bGluZSAxMDogU2FtZSBtZXNzYWdlCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTA6IFNhbWUgbWVz c2FnZQorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDEwOiBTYW1lIG1lc3NhZ2UKK0NPTlNPTEUgTUVT U0FHRTogbGluZSAxMDogU2FtZSBtZXNzYWdlCitUZXN0cyB0aGF0IHJlcGVhdCBjb3VudCBpcyBw cm9wZXJseSB1cGRhdGVkLgorCis1Y29uc29sZS1yZXBlYXQtY291bnQuaHRtbDoxMFNhbWUgbWVz c2FnZQorIkRpZmZlcmVudCBtZXNzYWdlIgorIkRpZmZlcmVudCBtZXNzYWdlIgorNWNvbnNvbGUt cmVwZWF0LWNvdW50Lmh0bWw6MTBTYW1lIG1lc3NhZ2UKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1yZXBlYXQtY291bnQuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcmVwZWF0LWNvdW50Lmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uNTcwMmUxOGU5N2QzYzY2N2I4NjJkNDc3ZWU4OGI2NzVhODYwNTE5ZgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcmVwZWF0LWNvdW50 Lmh0bWwKQEAgLTAsMCArMSw0MCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8u Li9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29uc29sZS10ZXN0LmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQ+CisKK2Z1bmN0aW9uIGR1bXBNZXNzYWdlcygpCit7CisgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCA1OyArK2kpCisgICAgICAgIGNvbnNvbGUubG9nKCJTYW1lIG1lc3NhZ2Ui KTsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUlu UGFnZSgiZHVtcE1lc3NhZ2VzKCkiLCBzdGVwMSk7CisKKyAgICBmdW5jdGlvbiBzdGVwMSgpCisg ICAgeworICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5Db25zb2xlKCJcIkRpZmZlcmVu dCBtZXNzYWdlXCIiLCBzdGVwMik7CisgICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDIoKQorICAg IHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgiZHVtcE1lc3NhZ2VzKCki LCBzdGVwMyk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDMoKQorICAgIHsKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5kdW1wQ29uc29sZU1lc3NhZ2VzKCk7CisgICAgICAgIEluc3BlY3RvclRl c3QuY29tcGxldGVUZXN0KCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBv bmxvYWQ9InJ1blRlc3QoKSI+Cis8cD4KK1Rlc3RzIHRoYXQgcmVwZWF0IGNvdW50IGlzIHByb3Bl cmx5IHVwZGF0ZWQuCis8L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYxYTJi OTg4YmE2NmMzYWZiZjBhZmJmMTgyNjE3N2FhZTFjYjM1MC4uOTlmNDZkZDhlMThjNDg0ZTRhNTBk MzFjYzZkNTFlNzA1YWYzMDljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTA4 LTI1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBbUXRd IFJFR1JFU1NJT04oOTM3NjkpOiBpbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXRlc3RzLmh0bWwg ZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2 OTMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVz dDogaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1yZXBlYXQtY291bnQuaHRtbAorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29uc29sZU1vZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwu cHJvdG90eXBlLmFkZE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2Rl bC5wcm90b3R5cGUuY2xlYXJNZXNzYWdlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZU1vZGVsLnByb3RvdHlwZS5pbnRlcnJ1cHRSZXBlYXRDb3VudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29uc29sZU1vZGVsLnByb3RvdHlwZS5fbWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZURpc3BhdGNoZXIucHJvdG90eXBlLm1lc3Nh Z2VSZXBlYXRDb3VudFVwZGF0ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9jb25zb2xlTWVzc2FnZUFkZGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qczoKKwogMjAxMS0wOC0yMyAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVy Y290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFRpbGVkQmFja2luZ1N0b3JlOiBVbnRpZSB0aGUg dGlsZSBpbXBsZW1lbnRhdGlvbiBmcm9tIHRoZSBwbGF0Zm9ybS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanMKaW5kZXggYzlkYjU5NWI0 N2Y5NWU2YTk0ZTkzYzRlZjI4N2U4OTA4NDZmMjUyYy4uODJkYzFiOTM0YTJhYzBiYzY4NTI4OGMx ZTZhODllYzIxNzBhOTQzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTW9kZWwuanMKQEAgLTM2LDEyICszNiwxNCBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZU1vZGVsID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIHRoaXMubWVzc2FnZXMgPSBbXTsK ICAgICB0aGlzLndhcm5pbmdzID0gMDsKICAgICB0aGlzLmVycm9ycyA9IDA7CisgICAgdGhpcy5f aW50ZXJydXB0UmVwZWF0Q291bnQgPSBmYWxzZTsKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyQ29uc29sZURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5Db25zb2xlRGlzcGF0Y2hlcih0 aGlzKSk7CiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzID0gewogICAgIENv bnNvbGVDbGVhcmVkOiAiY29uc29sZS1jbGVhcmVkIiwKICAgICBNZXNzYWdlQWRkZWQ6ICJjb25z b2xlLW1lc3NhZ2UtYWRkZWQiLAorICAgIFJlcGVhdENvdW50VXBkYXRlZDogInJlcGVhdC1jb3Vu dC11cGRhdGVkIgogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLnByb3RvdHlwZSA9IHsK QEAgLTY2LDggKzY4LDEwIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwucHJvdG90eXBlID0g ewogICAgIGFkZE1lc3NhZ2U6IGZ1bmN0aW9uKG1zZykKICAgICB7CiAgICAgICAgIHRoaXMubWVz c2FnZXMucHVzaChtc2cpOworICAgICAgICB0aGlzLl9wcmV2aW91c01lc3NhZ2UgPSBtc2c7CiAg ICAgICAgIHRoaXMuX2luY3JlbWVudEVycm9yV2FybmluZ0NvdW50KG1zZyk7CiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZl bnRzLk1lc3NhZ2VBZGRlZCwgbXNnKTsKKyAgICAgICAgdGhpcy5faW50ZXJydXB0UmVwZWF0Q291 bnQgPSBmYWxzZTsKICAgICB9LAogCiAgICAgX2luY3JlbWVudEVycm9yV2FybmluZ0NvdW50OiBm dW5jdGlvbihtc2cpCkBAIC05Niw2ICsxMDAsMzUgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2Rl bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMud2FybmluZ3MgPSAwOwogCiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZl bnRzLkNvbnNvbGVDbGVhcmVkKTsKKyAgICB9LAorCisgICAgaW50ZXJydXB0UmVwZWF0Q291bnQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2ludGVycnVwdFJlcGVhdENvdW50ID0g dHJ1ZTsKKyAgICB9LAorCisgICAgX21lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQ6IGZ1bmN0aW9u KGNvdW50KQorICAgIHsKKyAgICAgICAgdmFyIG1zZyA9IHRoaXMuX3ByZXZpb3VzTWVzc2FnZTsK KyAgICAgICAgaWYgKCFtc2cpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdmFyIHBy ZXZSZXBlYXRDb3VudCA9IG1zZy50b3RhbFJlcGVhdENvdW50OworCisgICAgICAgIGlmICghdGhp cy5faW50ZXJydXB0UmVwZWF0Q291bnQpIHsKKyAgICAgICAgICAgIG1zZy5yZXBlYXREZWx0YSA9 IGNvdW50IC0gcHJldlJlcGVhdENvdW50OworICAgICAgICAgICAgbXNnLnJlcGVhdENvdW50ID0g bXNnLnJlcGVhdENvdW50ICsgbXNnLnJlcGVhdERlbHRhOworICAgICAgICAgICAgbXNnLnRvdGFs UmVwZWF0Q291bnQgPSBjb3VudDsKKyAgICAgICAgICAgIG1zZy5fdXBkYXRlUmVwZWF0Q291bnQo KTsKKworICAgICAgICAgICAgdGhpcy5faW5jcmVtZW50RXJyb3JXYXJuaW5nQ291bnQobXNnKTsK KyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5D b25zb2xlTW9kZWwuRXZlbnRzLlJlcGVhdENvdW50VXBkYXRlZCwgbXNnKTsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIHZhciBtc2dDb3B5ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZShtc2cuc291cmNlLCBtc2cudHlwZSwgbXNnLmxldmVsLCBtc2cubGluZSwgbXNnLnVy bCwgY291bnQgLSBwcmV2UmVwZWF0Q291bnQsIG1zZy5fbWVzc2FnZVRleHQsIG1zZy5fcGFyYW1l dGVycywgbXNnLl9zdGFja1RyYWNlLCBtc2cuX3JlcXVlc3QpOworICAgICAgICAgICAgbXNnQ29w eS50b3RhbFJlcGVhdENvdW50ID0gY291bnQ7CisgICAgICAgICAgICBtc2dDb3B5Ll9mb3JtYXRN ZXNzYWdlKCk7CisgICAgICAgICAgICB0aGlzLmFkZE1lc3NhZ2UobXNnQ29weSk7CisgICAgICAg IH0KICAgICB9CiB9CiAKQEAgLTEzMCwyNSArMTYzLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVE aXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKIAogICAgIG1lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQ6 IGZ1bmN0aW9uKGNvdW50KQogICAgIHsKLSAgICAgICAgdmFyIG1zZyA9IHRoaXMuX2NvbnNvbGUu cHJldmlvdXNNZXNzYWdlOwotICAgICAgICBpZiAoIW1zZykKLSAgICAgICAgICAgIHJldHVybjsK LQotICAgICAgICB2YXIgcHJldlJlcGVhdENvdW50ID0gbXNnLnRvdGFsUmVwZWF0Q291bnQ7Ci0K LSAgICAgICAgaWYgKCF0aGlzLl9jb25zb2xlLmNvbW1hbmRTaW5jZVByZXZpb3VzTWVzc2FnZSkg ewotICAgICAgICAgICAgbXNnLnJlcGVhdERlbHRhID0gY291bnQgLSBwcmV2UmVwZWF0Q291bnQ7 Ci0gICAgICAgICAgICBtc2cucmVwZWF0Q291bnQgPSBtc2cucmVwZWF0Q291bnQgKyBtc2cucmVw ZWF0RGVsdGE7Ci0gICAgICAgICAgICBtc2cudG90YWxSZXBlYXRDb3VudCA9IGNvdW50OwotICAg ICAgICAgICAgbXNnLl91cGRhdGVSZXBlYXRDb3VudCgpOwotICAgICAgICAgICAgdGhpcy5fY29u c29sZS5faW5jcmVtZW50RXJyb3JXYXJuaW5nQ291bnQobXNnKTsKLSAgICAgICAgICAgIHRoaXMu X2NvbnNvbGUuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db25zb2xlTW9k ZWwuRXZlbnRzLk1lc3NhZ2VBZGRlZCwgbXNnKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIHZhciBtc2dDb3B5ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShtc2cuc291 cmNlLCBtc2cudHlwZSwgbXNnLmxldmVsLCBtc2cubGluZSwgbXNnLnVybCwgY291bnQgLSBwcmV2 UmVwZWF0Q291bnQsIG1zZy5fbWVzc2FnZVRleHQsIG1zZy5fcGFyYW1ldGVycywgbXNnLl9zdGFj a1RyYWNlLCBtc2cuX3JlcXVlc3QpOwotICAgICAgICAgICAgbXNnQ29weS50b3RhbFJlcGVhdENv dW50ID0gY291bnQ7Ci0gICAgICAgICAgICBtc2dDb3B5Ll9mb3JtYXRNZXNzYWdlKCk7Ci0gICAg ICAgICAgICB0aGlzLl9jb25zb2xlLmFkZE1lc3NhZ2UobXNnQ29weSk7Ci0gICAgICAgIH0KKyAg ICAgICAgdGhpcy5fY29uc29sZS5fbWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZChjb3VudCk7CiAg ICAgfSwKIAogICAgIG1lc3NhZ2VzQ2xlYXJlZDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggODljYmIzMzIx MmQzYmE5YjdhM2QzMzQ2MTQzZjgyYTdjOGRkZTA1OS4uMzI3Y2E2N2EwOWJjZTI4OGE1MTU2YWRh ZjQzODkwZmE5YzQ1MGFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0yNTYsMjMgKzI1Niw5IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfY29uc29sZU1lc3NhZ2VBZGRlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLmNvbW1hbmRTaW5jZVByZXZpb3VzTWVz c2FnZSA9IGZhbHNlOwotICAgICAgICB0aGlzLnByZXZpb3VzTWVzc2FnZSA9IGV2ZW50LmRhdGE7 CiAgICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKGV2ZW50LmRhdGEpOwogICAgIH0s CiAKLSAgICBfYXBwZW5kQ29uc29sZUNvbW1hbmQ6IGZ1bmN0aW9uKG1zZykKLSAgICB7Ci0gICAg ICAgIGlmICh0aGlzLnByZXZpb3VzTWVzc2FnZSkKLSAgICAgICAgICAgIHRoaXMuY29tbWFuZFNp bmNlUHJldmlvdXNNZXNzYWdlID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1l c3NhZ2UobXNnKTsKLSAgICB9LAotCi0gICAgX2FwcGVuZENvbnNvbGVDb21tYW5kUmVzdWx0OiBm dW5jdGlvbihtc2cpCi0gICAgewotICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlTWVzc2FnZSht c2cpOwotICAgIH0sCi0KICAgICBfYXBwZW5kQ29uc29sZU1lc3NhZ2U6IGZ1bmN0aW9uKG1zZykK ICAgICB7CiAgICAgICAgIHZhciBzaG91bGRTY3JvbGxUb0xhc3RNZXNzYWdlID0gdGhpcy5tZXNz YWdlc0VsZW1lbnQuaXNTY3JvbGxlZFRvQm90dG9tKCk7CkBAIC01OTgsNyArNTg0LDggQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICB2YXIgY29tbWFuZE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVD b21tYW5kKHN0cik7Ci0gICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVDb21tYW5kKGNvbW1hbmRN ZXNzYWdlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuaW50ZXJydXB0UmVwZWF0Q291 bnQoKTsKKyAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3NhZ2UoY29tbWFuZE1lc3NhZ2Up OwogCiAgICAgICAgIGZ1bmN0aW9uIHByaW50UmVzdWx0KHJlc3VsdCwgd2FzVGhyb3duKQogICAg ICAgICB7CkBAIC02MTEsNyArNTk4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3Rv dHlwZSA9IHsKIAogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNvbnNvbGVIaXN0 b3J5LnNldCh0aGlzLnByb21wdC5oaXN0b3J5LnNsaWNlKC0zMCkpOwogCi0gICAgICAgICAgICB0 aGlzLl9hcHBlbmRDb25zb2xlQ29tbWFuZFJlc3VsdChuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVD b21tYW5kUmVzdWx0KHJlc3VsdCwgd2FzVGhyb3duLCBjb21tYW5kTWVzc2FnZSkpOworICAgICAg ICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3NhZ2UobmV3IFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdChyZXN1bHQsIHdhc1Rocm93biwgY29tbWFuZE1lc3NhZ2UpKTsKICAgICAg ICAgfQogICAgICAgICB0aGlzLmV2YWxJbkluc3BlY3RlZFdpbmRvdyhzdHIsICJjb25zb2xlIiwg dHJ1ZSwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHByaW50UmVzdWx0LmJpbmQodGhpcykpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4 IGI0NjFkOTI5NTJiMjQ3NjY4YTBmYmExMTFmNGNlMjM1NDhiZjAzYWIuLjU1NmM5NDA3YTA3NDUy YzEwNzIwNTg1YzFiOGRlYjRjYTU5YTA4MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC00ODYsNiArNDg2LDcgQEAgV2ViSW5zcGVj dG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmNvbnNvbGUgPSBuZXcgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNb2RlbCgpOwogICAgIHRoaXMuY29uc29sZS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzLkNvbnNvbGVDbGVhcmVkLCB0aGlz Ll91cGRhdGVFcnJvckFuZFdhcm5pbmdDb3VudHMsIHRoaXMpOwogICAgIHRoaXMuY29uc29sZS5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzLk1lc3NhZ2VB ZGRlZCwgdGhpcy5fdXBkYXRlRXJyb3JBbmRXYXJuaW5nQ291bnRzLCB0aGlzKTsKKyAgICB0aGlz LmNvbnNvbGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLkV2ZW50 cy5SZXBlYXRDb3VudFVwZGF0ZWQsIHRoaXMuX3VwZGF0ZUVycm9yQW5kV2FybmluZ0NvdW50cywg dGhpcyk7CiAKICAgICB0aGlzLmRyYXdlciA9IG5ldyBXZWJJbnNwZWN0b3IuRHJhd2VyKCk7CiAg ICAgdGhpcy5jb25zb2xlVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcodGhpcy5k cmF3ZXIpOwo=