20210 2008-07-29 11:15:02 -0700 Console groups are incorrect when closing and reopening the Inspector 2008-08-15 10:48:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P1 Critical --- 1 timothy keishi aroben keishi oldest_to_newest 87280 0 timothy 2008-07-29 11:15:02 -0700 When closing and reopening the inspector the console groups are messed up and in the wrong order and logs are lumped into the last group. See the attached screenshot and test. Steps: 1) Load the test case. 2) Open the inspector's console. Results: Notice the order of the groups does not match the file. Reloading the page while the inspector is open gives the correct results. 87281 1 22539 timothy 2008-07-29 11:15:44 -0700 Created attachment 22539 Expected Results 87282 2 22540 timothy 2008-07-29 11:19:01 -0700 Created attachment 22540 Actual Results 87283 3 22541 timothy 2008-07-29 11:19:23 -0700 Created attachment 22541 Test Case 87285 4 timothy 2008-07-29 11:20:08 -0700 Also in the messed up state, expanding/collapsing one of the top level groups, toggles all of the groups in that level, not just the clicked one. 88211 5 22726 keishi 2008-08-11 06:18:10 -0700 Created attachment 22726 patch I forgot to test for this in the way. This fixes the issue. I realized you can't properly do this without recording where the group ended, so now there's StartGroup and EndGroup message levels. 88381 6 22726 timothy 2008-08-13 00:28:42 -0700 Comment on attachment 22726 patch Better ChangeLog! The patch seems technically correct, but there are some style issues. + //if (arguments.isEmpty()) + // addConsoleMessage(new ConsoleMessage(source, StartGroupMessageLevel, exec, String(), lineNumber, sourceURL, m_groupLevel)); + //else We don't comment out code. Just remove it. Attach a new patch that removes this and i'll r+ it. 88480 7 22793 keishi 2008-08-14 08:44:36 -0700 Created attachment 22793 removed commented out code 88591 8 timothy 2008-08-15 10:48:57 -0700 Landed in r35788. 22539 2008-07-29 11:15:44 -0700 2008-07-29 11:15:44 -0700 Expected Results Picture 2.png image/png 3122 timothy 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 22540 2008-07-29 11:19:01 -0700 2008-07-29 11:19:01 -0700 Actual Results Picture 1.png image/png 2798 timothy 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 RK5CYII= 22541 2008-07-29 11:19:23 -0700 2008-07-29 11:19:23 -0700 Test Case test-group.html text/html 263 timothy PHNjcmlwdD4KY29uc29sZS5ncm91cCgiVGVzdCAxIik7CmNvbnNvbGUuZ3JvdXAoIlRlc3QgMiIp Owpjb25zb2xlLmxvZygiSGVyZSBpcyBhIGxvZy4iKTsKY29uc29sZS5ncm91cEVuZCgpOwpjb25z b2xlLmxvZygiSGVyZSBpcyBhbm90aGVyIGxvZy4iKTsKY29uc29sZS5ncm91cEVuZCgpOwoKY29u c29sZS5ncm91cCgiVGVzdCAzIik7CmNvbnNvbGUubG9nKCJIZXJlIGlzIHlldCBhbm90aGVyIGxv Zy4iKTsKY29uc29sZS5ncm91cEVuZCgpOwo8L3NjcmlwdD4= 22726 2008-08-11 06:18:10 -0700 2008-08-14 08:44:36 -0700 patch patch.txt text/plain 8943 keishi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTY2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xICsxLDI0IEBACisyMDA4LTA4LTExICBLZWlzaGkgSGF0dG9yaSAgPGNhc2V5LmhhdHRvcmlA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEZpeGVkIEJ1ZyAyMDIxMDogQ29uc29sZSBncm91cHMgYXJlIGluY29ycmVjdCB3aGVuIGNs b3NpbmcgYW5kIHJlb3BlbmluZyB0aGUgSW5zcGVjdG9yCisKKyAgICAgICAgPGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIxMD4KKworICAgICAgICAqIHBhZ2UvQ29u c29sZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpncm91cCk6CisgICAgICAgIChX ZWJDb3JlOjpDb25zb2xlOjpncm91cEVuZCk6CisgICAgICAgICogcGFnZS9Db25zb2xlLmg6Cisg ICAgICAgIChXZWJDb3JlOjopOiBSZW1vdmVkIEdyb3VwVGl0bGVNZXNzYWdlTGV2ZWwuIEFkZGVk IFN0YXJ0R3JvdXBNZXNzYWFnZUxldmVsIGFuZCBFbmRHcm91cE1lc3NhZ2VMZXZlbC4gCisgICAg ICAgICogcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0R3JvdXApOiBJbmNyZW1lbnRzIGdyb3VwIGxldmVsIGJ5 IG9uZSBhbmQgYWRkcyBjb25zb2xlIG1lc3NhZ2Ugd2l0aCBTdGFydEdyb3VwTWVzc2FhZ2VMZXZl bC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmVuZEdyb3VwKTogRGVj cmVtZW50cyBncm91cCBsZXZlbCBieSBvbmUgYW5kIGFkZHMgY29uc29sZSBtZXNzYWdlIHdpdGgg RW5kR3JvdXBNZXNzYWFnZUxldmVsLgorICAgICAgICAqIHBhZ2UvSW5zcGVjdG9yQ29udHJvbGxl ci5oOgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUuYWRkTWVzc2FnZSk6IENyZWF0ZXMgbmV3IENvbnNv bGVHcm91cCBpZiB0aGUgbWVzc2FnZSBpcyBTdGFydEdyb3VwTWVzc2FhZ2VMZXZlbC4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUudG9NZXNzYWdlRWxlbWVu dCk6IAorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVHcm91cC5wcm90b3R5cGUuYWRkTWVz c2FnZSk6IAorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qczogCisKID09IFJv bGxlZCBvdmVyIHRvIENoYW5nZUxvZy0yMDA4LTA4LTEwID09CkluZGV4OiBXZWJDb3JlL3BhZ2Uv Q29uc29sZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCShyZXZp c2lvbiAzNTY2MikKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzEyLDEyICszMTIsNyBAQCB2b2lkIENvbnNvbGU6Omdyb3VwKEV4ZWNTdGF0ZSogZXhlYywg Y29uCiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBwYWdlLT5pbnNwZWN0 b3JDb250cm9sbGVyKCktPnN0YXJ0R3JvdXAoKTsKLQotICAgIGlmIChhcmd1bWVudHMuaXNFbXB0 eSgpKQotICAgICAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmFkZE1lc3NhZ2VUb0Nv bnNvbGUoSlNNZXNzYWdlU291cmNlLCBHcm91cFRpdGxlTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwg MCwgU3RyaW5nKCkpOwotICAgIGVsc2UKLSAgICAgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgR3JvdXBUaXRsZU1lc3Nh Z2VMZXZlbCwgZXhlYywgYXJndW1lbnRzLCAwLCBTdHJpbmcoKSk7CisgICAgcGFnZS0+aW5zcGVj dG9yQ29udHJvbGxlcigpLT5zdGFydEdyb3VwKEpTTWVzc2FnZVNvdXJjZSwgZXhlYywgYXJndW1l bnRzLCAwLCBTdHJpbmcoKSk7CiB9CiAKIHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQpAQCAtMzI5 LDcgKzMyNCw3IEBAIHZvaWQgQ29uc29sZTo6Z3JvdXBFbmQoKQogICAgIGlmICghcGFnZSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5lbmRHcm91 cCgpOworICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZW5kR3JvdXAoSlNNZXNzYWdl U291cmNlLCAwLCBTdHJpbmcoKSk7CiB9CiAKIHZvaWQgQ29uc29sZTo6ZmluaXNoZWRQcm9maWxp bmcoUGFzc1JlZlB0cjxQcm9maWxlPiBwcnBQcm9maWxlKQpJbmRleDogV2ViQ29yZS9wYWdlL0Nv bnNvbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvQ29uc29sZS5oCShyZXZpc2lvbiAz NTY2MikKKysrIFdlYkNvcmUvcGFnZS9Db25zb2xlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcg KzU5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBMb2dNZXNzYWdlTGV2ZWwsCiAg ICAgICAgIFdhcm5pbmdNZXNzYWdlTGV2ZWwsCiAgICAgICAgIEVycm9yTWVzc2FnZUxldmVsLAot ICAgICAgICBHcm91cFRpdGxlTWVzc2FnZUxldmVsCisgICAgICAgIFN0YXJ0R3JvdXBNZXNzYWdl TGV2ZWwsCisgICAgICAgIEVuZEdyb3VwTWVzc2FnZUxldmVsCiAgICAgfTsKIAogICAgIGNsYXNz IENvbnNvbGUgOiBwdWJsaWMgUmVmQ291bnRlZDxDb25zb2xlPiwgcHVibGljIEtKUzo6UHJvZmls ZXJDbGllbnQgewpJbmRleDogV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAkocmV2aXNp b24gMzU2NjIpCisrKyBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyNDgsMjcgKzEyNDgsMjQgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy Ojp0b2dnbGVSZWNvcmRCdQogICAgIGNhbGxGdW5jdGlvbihtX3NjcmlwdENvbnRleHQsIG1fc2Ny aXB0T2JqZWN0LCAic2V0UmVjb3JkaW5nUHJvZmlsZSIsIDEsICZpc1Byb3ZpbmdWYWx1ZSwgZXhj ZXB0aW9uKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzdGFydEdyb3VwKCkKK3Zv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRHcm91cChNZXNzYWdlU291cmNlIHNvdXJjZSwg RXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmd1bWVudHMsIHVuc2lnbmVkIGxpbmVO dW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQogeyAgICAKLSAgICBKU1ZhbHVlUmVmIGV4 Y2VwdGlvbiA9IDA7Ci0KICAgICArK21fZ3JvdXBMZXZlbDsKIAotICAgIGlmICh3aW5kb3dWaXNp YmxlKCkpCi0gICAgICAgIGNhbGxGdW5jdGlvbihtX3NjcmlwdENvbnRleHQsIG1fc2NyaXB0T2Jq ZWN0LCAic3RhcnRHcm91cEluQ29uc29sZSIsIDAsIE5VTEwsIGV4Y2VwdGlvbik7CisgICAgLy9p ZiAoYXJndW1lbnRzLmlzRW1wdHkoKSkKKyAgICAvLyAgICBhZGRDb25zb2xlTWVzc2FnZShuZXcg Q29uc29sZU1lc3NhZ2Uoc291cmNlLCBTdGFydEdyb3VwTWVzc2FnZUxldmVsLCBleGVjLCBTdHJp bmcoKSwgbGluZU51bWJlciwgc291cmNlVVJMLCBtX2dyb3VwTGV2ZWwpKTsKKyAgICAvL2Vsc2UK KyAgICAgICAgYWRkQ29uc29sZU1lc3NhZ2UobmV3IENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgU3Rh cnRHcm91cE1lc3NhZ2VMZXZlbCwgZXhlYywgYXJndW1lbnRzLCBsaW5lTnVtYmVyLCBzb3VyY2VV UkwsIG1fZ3JvdXBMZXZlbCkpOwogfQogCi12b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmVuZEdy b3VwKCkKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5kR3JvdXAoTWVzc2FnZVNvdXJjZSBz b3VyY2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQogewot ICAgIEpTVmFsdWVSZWYgZXhjZXB0aW9uID0gMDsKLQogICAgIGlmIChtX2dyb3VwTGV2ZWwgPT0g MCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLS1tX2dyb3VwTGV2ZWw7CiAKLSAgICBpZiAod2lu ZG93VmlzaWJsZSgpKQotICAgICAgICBjYWxsRnVuY3Rpb24obV9zY3JpcHRDb250ZXh0LCBtX3Nj cmlwdE9iamVjdCwgImVuZEdyb3VwSW5Db25zb2xlIiwgMCwgTlVMTCwgZXhjZXB0aW9uKTsKKyAg ICBhZGRDb25zb2xlTWVzc2FnZShuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCBFbmRHcm91cE1l c3NhZ2VMZXZlbCwgU3RyaW5nKCksIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCwgbV9ncm91cExldmVs KSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkUHJvZmlsZShQYXNzUmVmUHRy PFByb2ZpbGU+IHBycFByb2ZpbGUpCkluZGV4OiBXZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJv bGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmgJ KHJldmlzaW9uIDM1NjYyKQorKysgV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuaAko d29ya2luZyBjb3B5KQpAQCAtMTc1LDggKzE3NSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0YXJ0 VGltaW5nKGNvbnN0IEtKUzo6VVN0cmluZyYgdGl0bGUpOwogICAgIGJvb2wgc3RvcFRpbWluZyhj b25zdCBLSlM6OlVTdHJpbmcmIHRpdGxlLCBkb3VibGUmIGVsYXBzZWQpOwogCi0gICAgdm9pZCBz dGFydEdyb3VwKCk7Ci0gICAgdm9pZCBlbmRHcm91cCgpOworICAgIHZvaWQgc3RhcnRHcm91cChN ZXNzYWdlU291cmNlIHNvdXJjZSwgS0pTOjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEtKUzo6QXJn TGlzdCYgYXJndW1lbnRzLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJj ZVVSTCk7CisgICAgdm9pZCBlbmRHcm91cChNZXNzYWdlU291cmNlIHNvdXJjZSwgdW5zaWduZWQg bGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOwogCiBwcml2YXRlOgogICAgIHZv aWQgZm9jdXNOb2RlKCk7CkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzCShyZXZpc2lv biAzNTY2MikKKysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qcwkod29ya2luZyBj b3B5KQpAQCAtMTQ3LDEzICsxNDcsMjYgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBl ID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5tZXNzYWdlcy5wdXNoKG1zZyk7CisgICAg ICAgIAorICAgICAgICBpZiAobXNnLmxldmVsID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZUxldmVsLkVuZEdyb3VwKSB7CisgICAgICAgICAgICBpZiAodGhpcy5ncm91cExl dmVsIDwgMSkKKyAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgd2hpbGUgKG1zZy5n cm91cExldmVsID4gdGhpcy5ncm91cExldmVsKQotICAgICAgICAgICAgdGhpcy5zdGFydEdyb3Vw KCk7Ci0gICAgICAgIHdoaWxlIChtc2cuZ3JvdXBMZXZlbCA8IHRoaXMuZ3JvdXBMZXZlbCkKLSAg ICAgICAgICAgIHRoaXMuZW5kR3JvdXAoKTsKKyAgICAgICAgICAgIHRoaXMuZ3JvdXBMZXZlbC0t OworCisgICAgICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMuY3VycmVudEdyb3VwLnBh cmVudEdyb3VwOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKG1zZy5sZXZlbCA9 PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5TdGFydEdyb3VwKSB7 CisgICAgICAgICAgICAgICAgdGhpcy5ncm91cExldmVsKys7CisKKyAgICAgICAgICAgICAgICB2 YXIgZ3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVHcm91cCh0aGlzLmN1cnJlbnRHcm91 cCwgdGhpcy5ncm91cExldmVsKTsKKyAgICAgICAgICAgICAgICB0aGlzLmN1cnJlbnRHcm91cC5t ZXNzYWdlc0VsZW1lbnQuYXBwZW5kQ2hpbGQoZ3JvdXAuZWxlbWVudCk7CisgICAgICAgICAgICAg ICAgdGhpcy5jdXJyZW50R3JvdXAgPSBncm91cDsKKyAgICAgICAgICAgIH0KIAotICAgICAgICB0 aGlzLmN1cnJlbnRHcm91cC5hZGRNZXNzYWdlKG1zZyk7CisgICAgICAgICAgICB0aGlzLmN1cnJl bnRHcm91cC5hZGRNZXNzYWdlKG1zZyk7CisgICAgICAgIH0KKyAgICAgICAgCiAgICAgICAgIHRo aXMucHJvbXB0RWxlbWVudC5zY3JvbGxJbnRvVmlldyhmYWxzZSk7CiAgICAgfSwKIApAQCAtMjIx LDIzICsyMzQsNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJldHVybiByZXN1bHRzOwogICAgIH0sCiAKLSAgICBzdGFydEdyb3VwOiBmdW5jdGlvbigpIHsK LSAgICAgICAgdGhpcy5ncm91cExldmVsKys7Ci0gICAgICAgIAotICAgICAgICB2YXIgZ3JvdXAg PSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVHcm91cCh0aGlzLmN1cnJlbnRHcm91cCwgdGhpcy5n cm91cExldmVsKTsKLSAgICAgICAgdGhpcy5jdXJyZW50R3JvdXAubWVzc2FnZXNFbGVtZW50LmFw cGVuZENoaWxkKGdyb3VwLmVsZW1lbnQpOwotICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IGdy b3VwOwotICAgIH0sCi0KLSAgICBlbmRHcm91cDogZnVuY3Rpb24oKSB7Ci0gICAgICAgIGlmICh0 aGlzLmdyb3VwTGV2ZWwgPCAxKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMu Z3JvdXBMZXZlbC0tOwotCi0gICAgICAgIHRoaXMuY3VycmVudEdyb3VwID0gdGhpcy5jdXJyZW50 R3JvdXAucGFyZW50R3JvdXA7Ci0gICAgfSwKLQogICAgIF90b2dnbGVCdXR0b25DbGlja2VkOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLnZpc2libGUgPSAhdGhpcy52aXNpYmxlOwpA QCAtNTgxLDcgKzU3Nyw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUg PSAKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VM ZXZlbC5FcnJvcjoKICAgICAgICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNvbnNv bGUtZXJyb3ItbGV2ZWwiKTsKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5Hcm91cFRpdGxlOgor ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVs LlN0YXJ0R3JvdXA6CiAgICAgICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjb25z b2xlLWdyb3VwLXRpdGxlLWxldmVsIik7CiAgICAgICAgIH0KIApAQCAtNjcwLDcgKzY2Niw4IEBA IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwKICAgICBMb2c6IDEsCiAg ICAgV2FybmluZzogMiwKICAgICBFcnJvcjogMywKLSAgICBHcm91cFRpdGxlOiA0CisgICAgU3Rh cnRHcm91cDogNCwKKyAgICBFbmRHcm91cDogNQogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNv bW1hbmQgPSBmdW5jdGlvbihjb21tYW5kLCByZXN1bHQsIGZvcm1hdHRlZFJlc3VsdEVsZW1lbnQs IGxldmVsKQpAQCAtNzM3LDcgKzczNCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlR3JvdXAucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIGVsZW1lbnQgPSBtc2cudG9NZXNzYWdlRWxl bWVudCgpOwogICAgICAgICAKLSAgICAgICAgaWYgKG1zZy5sZXZlbCA9PT0gV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5Hcm91cFRpdGxlKSB7CisgICAgICAgIGlmICht c2cubGV2ZWwgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuU3Rh cnRHcm91cCkgewogICAgICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQucGFyZW50Tm9kZS5p bnNlcnRCZWZvcmUoZWxlbWVudCwgdGhpcy5tZXNzYWdlc0VsZW1lbnQpOwogICAgICAgICAgICAg ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RpdGxlQ2xpY2tlZC5iaW5k KHRoaXMpLCB0cnVlKTsKICAgICAgICAgfSBlbHNlCkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL2luc3BlY3Rvci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2lu c3BlY3Rvci5qcwkocmV2aXNpb24gMzU2NjIpCisrKyBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2lu c3BlY3Rvci5qcwkod29ya2luZyBjb3B5KQpAQCAtODIwLDE2ICs4MjAsNiBAQCBXZWJJbnNwZWN0 b3IuYWRkTWVzc2FnZVRvQ29uc29sZSA9IGZ1bmN0CiAgICAgdGhpcy5jb25zb2xlLmFkZE1lc3Nh Z2UobXNnKTsKIH0KIAotV2ViSW5zcGVjdG9yLnN0YXJ0R3JvdXBJbkNvbnNvbGUgPSBmdW5jdGlv bigpCi17Ci0gICAgdGhpcy5jb25zb2xlLnN0YXJ0R3JvdXAoKTsKLX0KLQotV2ViSW5zcGVjdG9y LmVuZEdyb3VwSW5Db25zb2xlID0gZnVuY3Rpb24oKQotewotICAgIHRoaXMuY29uc29sZS5lbmRH cm91cCgpOwotfQotCiBXZWJJbnNwZWN0b3IuYWRkUHJvZmlsZSA9IGZ1bmN0aW9uKHByb2ZpbGUp CiB7CiAgICAgdGhpcy5wYW5lbHMucHJvZmlsZXMuYWRkUHJvZmlsZShwcm9maWxlKTsK 22793 2008-08-14 08:44:36 -0700 2008-08-14 09:08:55 -0700 removed commented out code patch9.txt text/plain 7729 keishi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDgtMDgtMTEgIEtlaXNoaSBIYXR0b3JpICA8Y2FzZXkuaGF0dG9y aUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4ZWQgQnVnIDIwMjEwOiBDb25zb2xlIGdyb3VwcyBhcmUgaW5jb3JyZWN0IHdoZW4g Y2xvc2luZyBhbmQgcmVvcGVuaW5nIHRoZSBJbnNwZWN0b3IKKworICAgICAgICA8aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjEwPgorCisgICAgICAgICogcGFnZS9D b25zb2xlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwKToKKyAgICAgICAg KFdlYkNvcmU6OkNvbnNvbGU6Omdyb3VwRW5kKToKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuaDoK KyAgICAgICAgKFdlYkNvcmU6Oik6IFJlbW92ZWQgR3JvdXBUaXRsZU1lc3NhZ2VMZXZlbC4gQWRk ZWQgU3RhcnRHcm91cE1lc3NhYWdlTGV2ZWwgYW5kIEVuZEdyb3VwTWVzc2FnZUxldmVsLiAKKyAg ICAgICAgKiBwYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRHcm91cCk6IEluY3JlbWVudHMgZ3JvdXAgbGV2ZWwg Ynkgb25lIGFuZCBhZGRzIGNvbnNvbGUgbWVzc2FnZSB3aXRoIFN0YXJ0R3JvdXBNZXNzYWFnZUxl dmVsLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5kR3JvdXApOiBE ZWNyZW1lbnRzIGdyb3VwIGxldmVsIGJ5IG9uZSBhbmQgYWRkcyBjb25zb2xlIG1lc3NhZ2Ugd2l0 aCBFbmRHcm91cE1lc3NhYWdlTGV2ZWwuCisgICAgICAgICogcGFnZS9JbnNwZWN0b3JDb250cm9s bGVyLmg6CisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZS5hZGRNZXNzYWdlKTogQ3JlYXRlcyBuZXcgQ29u c29sZUdyb3VwIGlmIHRoZSBtZXNzYWdlIGlzIFN0YXJ0R3JvdXBNZXNzYWFnZUxldmVsLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS50b01lc3NhZ2VFbGVt ZW50KTogCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZUdyb3VwLnByb3RvdHlwZS5hZGRN ZXNzYWdlKTogCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzOiAKKwogMjAw OC0wOC0xMyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFuZGVycyBDYXJsc29uLgpJbmRleDogV2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAkocmV2aXNpb24gMzU3NTIpCisrKyBX ZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMiwxMiArMzEyLDcg QEAgdm9pZCBDb25zb2xlOjpncm91cChFeGVjU3RhdGUqIGV4ZWMsIGNvbgogICAgIGlmICghcGFn ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5z dGFydEdyb3VwKCk7Ci0KLSAgICBpZiAoYXJndW1lbnRzLmlzRW1wdHkoKSkKLSAgICAgICAgcGFn ZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNv dXJjZSwgR3JvdXBUaXRsZU1lc3NhZ2VMZXZlbCwgU3RyaW5nKCksIDAsIFN0cmluZygpKTsKLSAg ICBlbHNlCi0gICAgICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+YWRkTWVzc2FnZVRv Q29uc29sZShKU01lc3NhZ2VTb3VyY2UsIEdyb3VwVGl0bGVNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFy Z3VtZW50cywgMCwgU3RyaW5nKCkpOworICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ c3RhcnRHcm91cChKU01lc3NhZ2VTb3VyY2UsIGV4ZWMsIGFyZ3VtZW50cywgMCwgU3RyaW5nKCkp OwogfQogCiB2b2lkIENvbnNvbGU6Omdyb3VwRW5kKCkKQEAgLTMyOSw3ICszMjQsNyBAQCB2b2lk IENvbnNvbGU6Omdyb3VwRW5kKCkKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAot ICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZW5kR3JvdXAoKTsKKyAgICBwYWdlLT5p bnNwZWN0b3JDb250cm9sbGVyKCktPmVuZEdyb3VwKEpTTWVzc2FnZVNvdXJjZSwgMCwgU3RyaW5n KCkpOwogfQogCiB2b2lkIENvbnNvbGU6OmZpbmlzaGVkUHJvZmlsaW5nKFBhc3NSZWZQdHI8UHJv ZmlsZT4gcHJwUHJvZmlsZSkKSW5kZXg6IFdlYkNvcmUvcGFnZS9Db25zb2xlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wYWdlL0NvbnNvbGUuaAkocmV2aXNpb24gMzU3NTIpCisrKyBXZWJDb3Jl L3BhZ2UvQ29uc29sZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgTG9nTWVzc2FnZUxldmVsLAogICAgICAgICBXYXJuaW5nTWVz c2FnZUxldmVsLAogICAgICAgICBFcnJvck1lc3NhZ2VMZXZlbCwKLSAgICAgICAgR3JvdXBUaXRs ZU1lc3NhZ2VMZXZlbAorICAgICAgICBTdGFydEdyb3VwTWVzc2FnZUxldmVsLAorICAgICAgICBF bmRHcm91cE1lc3NhZ2VMZXZlbAogICAgIH07CiAKICAgICBjbGFzcyBDb25zb2xlIDogcHVibGlj IFJlZkNvdW50ZWQ8Q29uc29sZT4sIHB1YmxpYyBLSlM6OlByb2ZpbGVyQ2xpZW50IHsKSW5kZXg6 IFdlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDM1NzUyKQorKysgV2Vi Q29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjc4 LDI3ICsxMjc4LDIxIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6dG9nZ2xlUmVjb3JkQnUK ICAgICBjYWxsRnVuY3Rpb24obV9zY3JpcHRDb250ZXh0LCBtX3NjcmlwdE9iamVjdCwgInNldFJl Y29yZGluZ1Byb2ZpbGUiLCAxLCAmaXNQcm92aW5nVmFsdWUsIGV4Y2VwdGlvbik7CiB9CiAKLXZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRHcm91cCgpCit2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OnN0YXJ0R3JvdXAoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIEV4ZWNTdGF0ZSogZXhlYywg Y29uc3QgQXJnTGlzdCYgYXJndW1lbnRzLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJp bmcmIHNvdXJjZVVSTCkKIHsgICAgCi0gICAgSlNWYWx1ZVJlZiBleGNlcHRpb24gPSAwOwotCiAg ICAgKyttX2dyb3VwTGV2ZWw7CiAKLSAgICBpZiAod2luZG93VmlzaWJsZSgpKQotICAgICAgICBj YWxsRnVuY3Rpb24obV9zY3JpcHRDb250ZXh0LCBtX3NjcmlwdE9iamVjdCwgInN0YXJ0R3JvdXBJ bkNvbnNvbGUiLCAwLCBOVUxMLCBleGNlcHRpb24pOworICAgIGFkZENvbnNvbGVNZXNzYWdlKG5l dyBDb25zb2xlTWVzc2FnZShzb3VyY2UsIFN0YXJ0R3JvdXBNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFy Z3VtZW50cywgbGluZU51bWJlciwgc291cmNlVVJMLCBtX2dyb3VwTGV2ZWwpKTsKIH0KIAotdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjplbmRHcm91cCgpCit2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmVuZEdyb3VwKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBj b25zdCBTdHJpbmcmIHNvdXJjZVVSTCkKIHsKLSAgICBKU1ZhbHVlUmVmIGV4Y2VwdGlvbiA9IDA7 Ci0KICAgICBpZiAobV9ncm91cExldmVsID09IDApCiAgICAgICAgIHJldHVybjsKIAogICAgIC0t bV9ncm91cExldmVsOwogCi0gICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKLSAgICAgICAgY2FsbEZ1 bmN0aW9uKG1fc2NyaXB0Q29udGV4dCwgbV9zY3JpcHRPYmplY3QsICJlbmRHcm91cEluQ29uc29s ZSIsIDAsIE5VTEwsIGV4Y2VwdGlvbik7CisgICAgYWRkQ29uc29sZU1lc3NhZ2UobmV3IENvbnNv bGVNZXNzYWdlKHNvdXJjZSwgRW5kR3JvdXBNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBsaW5lTnVt YmVyLCBzb3VyY2VVUkwsIG1fZ3JvdXBMZXZlbCkpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OmFkZFByb2ZpbGUoUGFzc1JlZlB0cjxQcm9maWxlPiBwcnBQcm9maWxlKQpJbmRleDog V2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5oCShyZXZpc2lvbiAzNTc1MikKKysrIFdlYkNvcmUv cGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3OSw4ICsxNzks OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydFRpbWluZyhjb25zdCBLSlM6OlVTdHJpbmcmIHRp dGxlKTsKICAgICBib29sIHN0b3BUaW1pbmcoY29uc3QgS0pTOjpVU3RyaW5nJiB0aXRsZSwgZG91 YmxlJiBlbGFwc2VkKTsKIAotICAgIHZvaWQgc3RhcnRHcm91cCgpOwotICAgIHZvaWQgZW5kR3Jv dXAoKTsKKyAgICB2b2lkIHN0YXJ0R3JvdXAoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIEtKUzo6RXhl Y1N0YXRlKiBleGVjLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cywgdW5zaWduZWQgbGlu ZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOworICAgIHZvaWQgZW5kR3JvdXAoTWVz c2FnZVNvdXJjZSBzb3VyY2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291 cmNlVVJMKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIGZvY3VzTm9kZSgpOwpJbmRleDogV2ViQ29y ZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9p bnNwZWN0b3IvQ29uc29sZS5qcwkocmV2aXNpb24gMzU3NTIpCisrKyBXZWJDb3JlL3BhZ2UvaW5z cGVjdG9yL0NvbnNvbGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTIyNSwyMyArMjI1LDYgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gcmVzdWx0czsK ICAgICB9LAogCi0gICAgc3RhcnRHcm91cDogZnVuY3Rpb24oKSB7Ci0gICAgICAgIHRoaXMuZ3Jv dXBMZXZlbCsrOwotICAgICAgICAKLSAgICAgICAgdmFyIGdyb3VwID0gbmV3IFdlYkluc3BlY3Rv ci5Db25zb2xlR3JvdXAodGhpcy5jdXJyZW50R3JvdXAsIHRoaXMuZ3JvdXBMZXZlbCk7Ci0gICAg ICAgIHRoaXMuY3VycmVudEdyb3VwLm1lc3NhZ2VzRWxlbWVudC5hcHBlbmRDaGlsZChncm91cC5l bGVtZW50KTsKLSAgICAgICAgdGhpcy5jdXJyZW50R3JvdXAgPSBncm91cDsKLSAgICB9LAotCi0g ICAgZW5kR3JvdXA6IGZ1bmN0aW9uKCkgewotICAgICAgICBpZiAodGhpcy5ncm91cExldmVsIDwg MSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLmdyb3VwTGV2ZWwtLTsKLQot ICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMuY3VycmVudEdyb3VwLnBhcmVudEdyb3Vw OwotICAgIH0sCi0KICAgICBfdG9nZ2xlQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgdGhpcy52aXNpYmxlID0gIXRoaXMudmlzaWJsZTsKQEAgLTYwOSw3ICs1OTIsNyBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gCiAgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3I6CiAgICAg ICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjb25zb2xlLWVycm9yLWxldmVsIik7 CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuR3JvdXBUaXRsZToKKyAgICAgICAgICAgIGNhc2Ug V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5TdGFydEdyb3VwOgogICAg ICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS1ncm91cC10aXRsZS1s ZXZlbCIpOwogICAgICAgICB9CiAKQEAgLTY5OCw3ICs2ODEsOCBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsCiAgICAgTG9nOiAxLAogICAgIFdhcm5pbmc6IDIsCiAg ICAgRXJyb3I6IDMsCi0gICAgR3JvdXBUaXRsZTogNAorICAgIFN0YXJ0R3JvdXA6IDQsCisgICAg RW5kR3JvdXA6IDUKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kID0gZnVuY3Rpb24o Y29tbWFuZCwgcmVzdWx0LCBmb3JtYXR0ZWRSZXN1bHRFbGVtZW50LCBsZXZlbCkKQEAgLTc2NSw3 ICs3NDksNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZUdyb3VwLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHZhciBlbGVtZW50ID0gbXNnLnRvTWVzc2FnZUVsZW1lbnQoKTsKICAgICAgICAg Ci0gICAgICAgIGlmIChtc2cubGV2ZWwgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlTGV2ZWwuR3JvdXBUaXRsZSkgeworICAgICAgICBpZiAobXNnLmxldmVsID09PSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLlN0YXJ0R3JvdXApIHsKICAgICAg ICAgICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LnBhcmVudE5vZGUuaW5zZXJ0QmVmb3JlKGVsZW1l bnQsIHRoaXMubWVzc2FnZXNFbGVtZW50KTsKICAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCB0aGlzLl90aXRsZUNsaWNrZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAg ICAgICAgIH0gZWxzZQpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMJKHJldmlz aW9uIDM1NzUyKQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMJKHdvcmtp bmcgY29weSkKQEAgLTgzMSwxNiArODMxLDYgQEAgV2ViSW5zcGVjdG9yLmFkZE1lc3NhZ2VUb0Nv bnNvbGUgPSBmdW5jdAogICAgIHRoaXMuY29uc29sZS5hZGRNZXNzYWdlKG1zZyk7CiB9CiAKLVdl Ykluc3BlY3Rvci5zdGFydEdyb3VwSW5Db25zb2xlID0gZnVuY3Rpb24oKQotewotICAgIHRoaXMu Y29uc29sZS5zdGFydEdyb3VwKCk7Ci19Ci0KLVdlYkluc3BlY3Rvci5lbmRHcm91cEluQ29uc29s ZSA9IGZ1bmN0aW9uKCkKLXsKLSAgICB0aGlzLmNvbnNvbGUuZW5kR3JvdXAoKTsKLX0KLQogV2Vi SW5zcGVjdG9yLmFkZFByb2ZpbGUgPSBmdW5jdGlvbihwcm9maWxlKQogewogICAgIHRoaXMucGFu ZWxzLnByb2ZpbGVzLmFkZFByb2ZpbGUocHJvZmlsZSk7Cg==