57985 2011-04-06 14:52:49 -0700 Fix some threading issues in IconDatabase. 2011-04-14 16:52:40 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 58092 1 levin levin beidson commit-queue oldest_to_newest 380862 0 levin 2011-04-06 14:52:49 -0700 Fix some threading issues that I uncovered while working on bug 31639. 380867 1 88520 levin 2011-04-06 14:57:05 -0700 Created attachment 88520 Patch 381730 2 88703 levin 2011-04-07 14:44:51 -0700 Created attachment 88703 Patch 386014 3 88703 beidson 2011-04-14 13:57:40 -0700 Comment on attachment 88703 Patch Okay! 386085 4 88703 commit-queue 2011-04-14 15:10:04 -0700 Comment on attachment 88703 Patch Rejecting attachment 88703 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sf', 'ap..." exit_code: 2 Last 500 characters of output: Tools/Scripts/svn-apply', u'--reviewer', u'Brady Eidson', u'--force']" exit_code: 1 Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/loader/icon/IconDatabase.cpp Hunk #3 FAILED at 1571. 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/loader/icon/IconDatabase.cpp.rej Failed to run "[u'/Projects/CommitQueue/Tools/Scripts/svn-apply', u'--reviewer', u'Brady Eidson', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8398759 386090 5 levin 2011-04-14 15:11:45 -0700 Will land by hand shortly. 386183 6 levin 2011-04-14 16:52:40 -0700 Committed as http://trac.webkit.org/changeset/83913 88520 2011-04-06 14:57:05 -0700 2011-04-07 14:44:48 -0700 Patch bug-57985-20110406145704.patch text/plain 5834 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ZWRlZGVmN2JjZjNlZTRm OGI2OWY0ZjhmMTZjY2RjZmY5NjgxNjJhLi5hYzkwMGZlODY4YmJlMmUyNjc5OGQzODc0NGUwZDI1 ODVhNTliOWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMDYgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzb21lIHRocmVhZGluZyBpc3N1ZXMgaW4gSWNvbkRh dGFiYXNlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTc5ODUKKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZSBzbyBubyBuZXcgdGVzdHMu IEl0IHdvdWxkIGJlIHZlcnkgaGFyZCB0byB0ZXN0IHRoaXMsIGJ1dAorICAgICAgICBJIGFtIHdv cmtpbmcgb24gYSBjaGFuZ2UgZm9yIGJ1ZyAzMTYzOSB0byBkZXRlY3QgdGhlc2UgKHdoaWNoIG1h a2VzIGxheW91dCB0ZXN0cworICAgICAgICBmYWlsIGZvciBhdCBsZWFzdCBvbmUgb2YgdGhlc2Ug aXNzdWVzKS4KKworICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OnJlYWRGcm9tRGF0YWJhc2UpOiBSZWxlYXNlIGlt YWdlRGF0YSBzbyB0aGF0IGl0IHdvbid0IGdldCBkZXJlZidlZCBvdXRzaWRlIG9mIGxvY2tzLgor ICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjp3cml0ZVRvRGF0YWJhc2UpOiBBY3F1aXJl IG1fdXJsQW5kSWNvbkxvY2sgYmVjYXVzZSB0aGUgU2hhcmVkQnVmZmVyPD4gZGF0YQorICAgICAg ICBpcyB1c2VkLCBhbmQgdGhpcyBsb2NrIHNlZW1zIHRvIGJlIHRoZSBvbmUgd2hpY2ggY29uc2lz dGVudGx5IGd1YXJkcyBpdC4KKwogMjAxMS0wNC0wNCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFw QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAKaW5kZXggYzJjYmI2YTJkZjZk MTdmOGUzNjIyNDRiZmM0NWYzMjE5ZjYzZTZiYy4uZDRkODVmZGE3YWVlYzU0YWIwNDBiYzU5MTZl MjViNjcyOTQwMDY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNv bkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJh c2UuY3BwCkBAIC0xNDgyLDcgKzE0ODIsNyBAQCBib29sIEljb25EYXRhYmFzZTo6cmVhZEZyb21E YXRhYmFzZSgpCiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgaWYgKG1faWNvbnNQ ZW5kaW5nUmVhZGluZy5jb250YWlucyhpY29uc1tpXSkpIHsKICAgICAgICAgICAgICAgICAgICAg Ly8gU2V0IHRoZSBuZXcgZGF0YQotICAgICAgICAgICAgICAgICAgICBpY29uc1tpXS0+c2V0SW1h Z2VEYXRhKGltYWdlRGF0YS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIGljb25zW2ldLT5z ZXRJbWFnZURhdGEoaW1hZ2VEYXRhLnJlbGVhc2UoKSk7CiAgICAgICAgICAgICAgICAgICAgIAog ICAgICAgICAgICAgICAgICAgICAvLyBSZW1vdmUgdGhpcyBpY29uIGZyb20gdGhlIHNldCB0aGF0 IG5lZWRzIHRvIGJlIHJlYWQKICAgICAgICAgICAgICAgICAgICAgbV9pY29uc1BlbmRpbmdSZWFk aW5nLnJlbW92ZShpY29uc1tpXSk7CkBAIC0xNTcxLDQxICsxNTcxLDQ0IEBAIGJvb2wgSWNvbkRh dGFiYXNlOjp3cml0ZVRvRGF0YWJhc2UoKQogICAgIC8vIFdlIGNhbiBjb3B5IHRoZSBjdXJyZW50 IHdvcmsgcXVldWUgdGhlbiBjbGVhciBpdCBvdXQgLSBJZiBhbnkgbmV3IHdvcmsgY29tZXMgaW4g d2hpbGUgd2UncmUgd3JpdGluZyBvdXQsCiAgICAgLy8gd2UnbGwgcGljayBpdCB1cCBvbiB0aGUg bmV4dCBwYXNzLiAgVGhpcyBncmVhdGx5IHNpbXBsaWZpZXMgdGhlIGxvY2tpbmcgc3RyYXRlZ3kg Zm9yIHRoaXMgbWV0aG9kIGFuZCByZW1haW5zIGNvaGVzaXZlIHdpdGggY2hhbmdlcwogICAgIC8v IGFza2VkIGZvciBieSB0aGUgZGF0YWJhc2Ugb24gdGhlIG1haW4gdGhyZWFkCi0gICAgVmVjdG9y PEljb25TbmFwc2hvdD4gaWNvblNuYXBzaG90czsKLSAgICBWZWN0b3I8UGFnZVVSTFNuYXBzaG90 PiBwYWdlU25hcHNob3RzOwogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fcGVu ZGluZ1N5bmNMb2NrKTsKLSAgICAgICAgCi0gICAgICAgIGljb25TbmFwc2hvdHMuYXBwZW5kUmFu Z2UobV9pY29uc1BlbmRpbmdTeW5jLmJlZ2luKCkudmFsdWVzKCksIG1faWNvbnNQZW5kaW5nU3lu Yy5lbmQoKS52YWx1ZXMoKSk7Ci0gICAgICAgIG1faWNvbnNQZW5kaW5nU3luYy5jbGVhcigpOwot ICAgICAgICAKLSAgICAgICAgcGFnZVNuYXBzaG90cy5hcHBlbmRSYW5nZShtX3BhZ2VVUkxzUGVu ZGluZ1N5bmMuYmVnaW4oKS52YWx1ZXMoKSwgbV9wYWdlVVJMc1BlbmRpbmdTeW5jLmVuZCgpLnZh bHVlcygpKTsKLSAgICAgICAgbV9wYWdlVVJMc1BlbmRpbmdTeW5jLmNsZWFyKCk7Ci0gICAgfQot ICAgIAotICAgIGlmIChpY29uU25hcHNob3RzLnNpemUoKSB8fCBwYWdlU25hcHNob3RzLnNpemUo KSkKLSAgICAgICAgZGlkQW55V29yayA9IHRydWU7Ci0gICAgICAgIAotICAgIFNRTGl0ZVRyYW5z YWN0aW9uIHN5bmNUcmFuc2FjdGlvbihtX3N5bmNEQik7Ci0gICAgc3luY1RyYW5zYWN0aW9uLmJl Z2luKCk7Ci0gICAgCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGljb25TbmFwc2hvdHMu c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgd3JpdGVJY29uU25hcHNob3RUb1NRTERhdGFiYXNlKGlj b25TbmFwc2hvdHNbaV0pOwotICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiV3JvdGUgSWNvblJl Y29yZCBmb3IgSWNvblVSTCAlcyB3aXRoIHRpbWVTdGFtcCBvZiAlaSB0byB0aGUgREIiLCB1cmxG b3JMb2dnaW5nKGljb25TbmFwc2hvdHNbaV0uaWNvblVSTCkuYXNjaWkoKS5kYXRhKCksIGljb25T bmFwc2hvdHNbaV0udGltZXN0YW1wKTsKLSAgICB9Ci0gICAgCi0gICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IHBhZ2VTbmFwc2hvdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgLy8gSWYgdGhl IGljb24gVVJMIGlzIGVtcHR5LCB0aGlzIHBhZ2UgaXMgbWVhbnQgdG8gYmUgZGVsZXRlZAotICAg ICAgICAvLyBBU1NFUlRzIGFyZSBzYW5pdHkgY2hlY2tzIHRvIG1ha2Ugc3VyZSB0aGUgbWFwcGlu Z3MgZXhpc3QgaWYgdGhleSBzaG91bGQgYW5kIGRvbid0IGlmIHRoZXkgc2hvdWxkbid0Ci0gICAg ICAgIGlmIChwYWdlU25hcHNob3RzW2ldLmljb25VUkwuaXNFbXB0eSgpKQotICAgICAgICAgICAg cmVtb3ZlUGFnZVVSTEZyb21TUUxEYXRhYmFzZShwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwpOwot ICAgICAgICBlbHNlCi0gICAgICAgICAgICBzZXRJY29uVVJMRm9yUGFnZVVSTEluU1FMRGF0YWJh c2UocGFnZVNuYXBzaG90c1tpXS5pY29uVVJMLCBwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwpOwot ICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiQ29tbWl0dGVkIEljb25VUkwgZm9yIFBhZ2VVUkwg JXMgdG8gZGF0YWJhc2UiLCB1cmxGb3JMb2dnaW5nKHBhZ2VTbmFwc2hvdHNbaV0ucGFnZVVSTCku YXNjaWkoKS5kYXRhKCkpOworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV91cmxBbmRJY29u TG9jayk7CisgICAgICAgIFZlY3RvcjxJY29uU25hcHNob3Q+IGljb25TbmFwc2hvdHM7CisgICAg ICAgIFZlY3RvcjxQYWdlVVJMU25hcHNob3Q+IHBhZ2VTbmFwc2hvdHM7CisgICAgICAgIHsKKyAg ICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3BlbmRpbmdTeW5jTG9jayk7CisKKyAgICAg ICAgICAgIGljb25TbmFwc2hvdHMuYXBwZW5kUmFuZ2UobV9pY29uc1BlbmRpbmdTeW5jLmJlZ2lu KCkudmFsdWVzKCksIG1faWNvbnNQZW5kaW5nU3luYy5lbmQoKS52YWx1ZXMoKSk7CisgICAgICAg ICAgICBtX2ljb25zUGVuZGluZ1N5bmMuY2xlYXIoKTsKKworICAgICAgICAgICAgcGFnZVNuYXBz aG90cy5hcHBlbmRSYW5nZShtX3BhZ2VVUkxzUGVuZGluZ1N5bmMuYmVnaW4oKS52YWx1ZXMoKSwg bV9wYWdlVVJMc1BlbmRpbmdTeW5jLmVuZCgpLnZhbHVlcygpKTsKKyAgICAgICAgICAgIG1fcGFn ZVVSTHNQZW5kaW5nU3luYy5jbGVhcigpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGljb25T bmFwc2hvdHMuc2l6ZSgpIHx8IHBhZ2VTbmFwc2hvdHMuc2l6ZSgpKQorICAgICAgICAgICAgZGlk QW55V29yayA9IHRydWU7CisKKyAgICAgICAgU1FMaXRlVHJhbnNhY3Rpb24gc3luY1RyYW5zYWN0 aW9uKG1fc3luY0RCKTsKKyAgICAgICAgc3luY1RyYW5zYWN0aW9uLmJlZ2luKCk7CisKKyAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGljb25TbmFwc2hvdHMuc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgICAgIHdyaXRlSWNvblNuYXBzaG90VG9TUUxEYXRhYmFzZShpY29uU25hcHNob3Rz W2ldKTsKKyAgICAgICAgICAgIExPRyhJY29uRGF0YWJhc2UsICJXcm90ZSBJY29uUmVjb3JkIGZv ciBJY29uVVJMICVzIHdpdGggdGltZVN0YW1wIG9mICVpIHRvIHRoZSBEQiIsIHVybEZvckxvZ2dp bmcoaWNvblNuYXBzaG90c1tpXS5pY29uVVJMKS5hc2NpaSgpLmRhdGEoKSwgaWNvblNuYXBzaG90 c1tpXS50aW1lc3RhbXApOworICAgICAgICB9CisKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHBhZ2VTbmFwc2hvdHMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAgIC8vIElmIHRo ZSBpY29uIFVSTCBpcyBlbXB0eSwgdGhpcyBwYWdlIGlzIG1lYW50IHRvIGJlIGRlbGV0ZWQKKyAg ICAgICAgICAgIC8vIEFTU0VSVHMgYXJlIHNhbml0eSBjaGVja3MgdG8gbWFrZSBzdXJlIHRoZSBt YXBwaW5ncyBleGlzdCBpZiB0aGV5IHNob3VsZCBhbmQgZG9uJ3QgaWYgdGhleSBzaG91bGRuJ3QK KyAgICAgICAgICAgIGlmIChwYWdlU25hcHNob3RzW2ldLmljb25VUkwuaXNFbXB0eSgpKQorICAg ICAgICAgICAgICAgIHJlbW92ZVBhZ2VVUkxGcm9tU1FMRGF0YWJhc2UocGFnZVNuYXBzaG90c1tp XS5wYWdlVVJMKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBzZXRJY29uVVJM Rm9yUGFnZVVSTEluU1FMRGF0YWJhc2UocGFnZVNuYXBzaG90c1tpXS5pY29uVVJMLCBwYWdlU25h cHNob3RzW2ldLnBhZ2VVUkwpOworICAgICAgICAgICAgTE9HKEljb25EYXRhYmFzZSwgIkNvbW1p dHRlZCBJY29uVVJMIGZvciBQYWdlVVJMICVzIHRvIGRhdGFiYXNlIiwgdXJsRm9yTG9nZ2luZyhw YWdlU25hcHNob3RzW2ldLnBhZ2VVUkwpLmFzY2lpKCkuZGF0YSgpKTsKKyAgICAgICAgfQorCisg ICAgICAgIHN5bmNUcmFuc2FjdGlvbi5jb21taXQoKTsKICAgICB9CiAKLSAgICBzeW5jVHJhbnNh Y3Rpb24uY29tbWl0KCk7Ci0gICAgCiAgICAgLy8gQ2hlY2sgdG8gbWFrZSBzdXJlIHRoZXJlIGFy ZSBubyBkYW5nbGluZyBQYWdlVVJMcyAtIElmIHRoZXJlIGFyZSwgd2Ugd2FudCB0byBvdXRwdXQg b25lIGxvZyBtZXNzYWdlIGJ1dCBub3Qgc3BhbSB0aGUgY29uc29sZSBwb3RlbnRpYWxseSBldmVy eSBmZXcgc2Vjb25kcwogICAgIGlmIChkaWRBbnlXb3JrKQogICAgICAgICBjaGVja0ZvckRhbmds aW5nUGFnZVVSTHMoZmFsc2UpOwo= 88703 2011-04-07 14:44:51 -0700 2011-04-14 15:10:04 -0700 Patch bug-57985-20110407144450.patch text/plain 6334 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ZWRlZGVmN2JjZjNlZTRm OGI2OWY0ZjhmMTZjY2RjZmY5NjgxNjJhLi5hMDBiODliMzJjMmQxZWYwNDA1YmY5ZTQ0NzAyOWYz N2U1ZGJjZTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMDcgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzb21lIHRocmVhZGluZyBpc3N1ZXMgaW4gSWNvbkRh dGFiYXNlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTc5ODUKKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZSBzbyBubyBuZXcgdGVzdHMu IEl0IHdvdWxkIGJlIHZlcnkgaGFyZCB0byB0ZXN0IHRoaXMsIGJ1dAorICAgICAgICBJIGFtIHdv cmtpbmcgb24gYSBjaGFuZ2UgZm9yIGJ1ZyAzMTYzOSB0byBkZXRlY3QgdGhlc2UgKHdoaWNoIG1h a2VzIGxheW91dCB0ZXN0cworICAgICAgICBmYWlsIGZvciBhdCBsZWFzdCBvbmUgb2YgdGhlc2Ug aXNzdWVzKS4KKworICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OnNldEljb25EYXRhRm9ySWNvblVSTCk6IFJlbGVh c2UgaW1hZ2VEYXRhIHNvIHRoYXQgaXQgd29uJ3QgZ2V0IGRlcmVmJ2VkIG91dHNpZGUgb2YgbG9j a3MuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OnJlYWRGcm9tRGF0YWJhc2UpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6d3JpdGVUb0RhdGFiYXNlKTog QWNxdWlyZSBtX3VybEFuZEljb25Mb2NrIGJlY2F1c2UgdGhlIFNoYXJlZEJ1ZmZlcjw+IGRhdGEK KyAgICAgICAgaXMgdXNlZCwgYW5kIHRoaXMgbG9jayBzZWVtcyB0byBiZSB0aGUgb25lIHdoaWNo IGNvbnNpc3RlbnRseSBndWFyZHMgaXQuCisKIDIwMTEtMDQtMDQgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCmluZGV4IGMyY2Ji NmEyZGY2ZDE3ZjhlMzYyMjQ0YmZjNDVmMzIxOWY2M2U2YmMuLmM1ZGQ5YTYwNWZlOTYxM2JiYTQz NDFkNjRmZjZhMzA1OWQzMzg1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9p Y29uL0ljb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNv bkRhdGFiYXNlLmNwcApAQCAtNTI4LDcgKzUyOCw3IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzZXRJ Y29uRGF0YUZvckljb25VUkwoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGRhdGFPcmlnaW5hbCwK ICAgICAgICAgICAgIGljb24gPSBnZXRPckNyZWF0ZUljb25SZWNvcmQoaWNvblVSTCk7CiAgICAg CiAgICAgICAgIC8vIFVwZGF0ZSB0aGUgZGF0YSBhbmQgc2V0IHRoZSB0aW1lIHN0YW1wCi0gICAg ICAgIGljb24tPnNldEltYWdlRGF0YShkYXRhKTsKKyAgICAgICAgaWNvbi0+c2V0SW1hZ2VEYXRh KGRhdGEucmVsZWFzZSgpKTsKICAgICAgICAgaWNvbi0+c2V0VGltZXN0YW1wKChpbnQpY3VycmVu dFRpbWUoKSk7CiAgICAgICAgIAogICAgICAgICAvLyBDb3B5IHRoZSBjdXJyZW50IHJldGFpbmlu ZyBwYWdlVVJMcyAtIGlmIGFueSAtIHRvIG5vdGlmeSB0aGVtIG9mIHRoZSBjaGFuZ2UKQEAgLTE0 ODIsNyArMTQ4Miw3IEBAIGJvb2wgSWNvbkRhdGFiYXNlOjpyZWFkRnJvbURhdGFiYXNlKCkKICAg ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAobV9pY29uc1BlbmRpbmdSZWFkaW5n LmNvbnRhaW5zKGljb25zW2ldKSkgewogICAgICAgICAgICAgICAgICAgICAvLyBTZXQgdGhlIG5l dyBkYXRhCi0gICAgICAgICAgICAgICAgICAgIGljb25zW2ldLT5zZXRJbWFnZURhdGEoaW1hZ2VE YXRhLmdldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgaWNvbnNbaV0tPnNldEltYWdlRGF0YShp bWFnZURhdGEucmVsZWFzZSgpKTsKICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg ICAgICAgIC8vIFJlbW92ZSB0aGlzIGljb24gZnJvbSB0aGUgc2V0IHRoYXQgbmVlZHMgdG8gYmUg cmVhZAogICAgICAgICAgICAgICAgICAgICBtX2ljb25zUGVuZGluZ1JlYWRpbmcucmVtb3ZlKGlj b25zW2ldKTsKQEAgLTE1NzEsNDEgKzE1NzEsNDQgQEAgYm9vbCBJY29uRGF0YWJhc2U6OndyaXRl VG9EYXRhYmFzZSgpCiAgICAgLy8gV2UgY2FuIGNvcHkgdGhlIGN1cnJlbnQgd29yayBxdWV1ZSB0 aGVuIGNsZWFyIGl0IG91dCAtIElmIGFueSBuZXcgd29yayBjb21lcyBpbiB3aGlsZSB3ZSdyZSB3 cml0aW5nIG91dCwKICAgICAvLyB3ZSdsbCBwaWNrIGl0IHVwIG9uIHRoZSBuZXh0IHBhc3MuICBU aGlzIGdyZWF0bHkgc2ltcGxpZmllcyB0aGUgbG9ja2luZyBzdHJhdGVneSBmb3IgdGhpcyBtZXRo b2QgYW5kIHJlbWFpbnMgY29oZXNpdmUgd2l0aCBjaGFuZ2VzCiAgICAgLy8gYXNrZWQgZm9yIGJ5 IHRoZSBkYXRhYmFzZSBvbiB0aGUgbWFpbiB0aHJlYWQKLSAgICBWZWN0b3I8SWNvblNuYXBzaG90 PiBpY29uU25hcHNob3RzOwotICAgIFZlY3RvcjxQYWdlVVJMU25hcHNob3Q+IHBhZ2VTbmFwc2hv dHM7CiAgICAgewotICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9wZW5kaW5nU3luY0xvY2sp OwotICAgICAgICAKLSAgICAgICAgaWNvblNuYXBzaG90cy5hcHBlbmRSYW5nZShtX2ljb25zUGVu ZGluZ1N5bmMuYmVnaW4oKS52YWx1ZXMoKSwgbV9pY29uc1BlbmRpbmdTeW5jLmVuZCgpLnZhbHVl cygpKTsKLSAgICAgICAgbV9pY29uc1BlbmRpbmdTeW5jLmNsZWFyKCk7Ci0gICAgICAgIAotICAg ICAgICBwYWdlU25hcHNob3RzLmFwcGVuZFJhbmdlKG1fcGFnZVVSTHNQZW5kaW5nU3luYy5iZWdp bigpLnZhbHVlcygpLCBtX3BhZ2VVUkxzUGVuZGluZ1N5bmMuZW5kKCkudmFsdWVzKCkpOwotICAg ICAgICBtX3BhZ2VVUkxzUGVuZGluZ1N5bmMuY2xlYXIoKTsKLSAgICB9Ci0gICAgCi0gICAgaWYg KGljb25TbmFwc2hvdHMuc2l6ZSgpIHx8IHBhZ2VTbmFwc2hvdHMuc2l6ZSgpKQotICAgICAgICBk aWRBbnlXb3JrID0gdHJ1ZTsKLSAgICAgICAgCi0gICAgU1FMaXRlVHJhbnNhY3Rpb24gc3luY1Ry YW5zYWN0aW9uKG1fc3luY0RCKTsKLSAgICBzeW5jVHJhbnNhY3Rpb24uYmVnaW4oKTsKLSAgICAK LSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaWNvblNuYXBzaG90cy5zaXplKCk7ICsraSkg ewotICAgICAgICB3cml0ZUljb25TbmFwc2hvdFRvU1FMRGF0YWJhc2UoaWNvblNuYXBzaG90c1tp XSk7Ci0gICAgICAgIExPRyhJY29uRGF0YWJhc2UsICJXcm90ZSBJY29uUmVjb3JkIGZvciBJY29u VVJMICVzIHdpdGggdGltZVN0YW1wIG9mICVpIHRvIHRoZSBEQiIsIHVybEZvckxvZ2dpbmcoaWNv blNuYXBzaG90c1tpXS5pY29uVVJMKS5hc2NpaSgpLmRhdGEoKSwgaWNvblNuYXBzaG90c1tpXS50 aW1lc3RhbXApOwotICAgIH0KLSAgICAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcGFn ZVNuYXBzaG90cy5zaXplKCk7ICsraSkgewotICAgICAgICAvLyBJZiB0aGUgaWNvbiBVUkwgaXMg ZW1wdHksIHRoaXMgcGFnZSBpcyBtZWFudCB0byBiZSBkZWxldGVkCi0gICAgICAgIC8vIEFTU0VS VHMgYXJlIHNhbml0eSBjaGVja3MgdG8gbWFrZSBzdXJlIHRoZSBtYXBwaW5ncyBleGlzdCBpZiB0 aGV5IHNob3VsZCBhbmQgZG9uJ3QgaWYgdGhleSBzaG91bGRuJ3QKLSAgICAgICAgaWYgKHBhZ2VT bmFwc2hvdHNbaV0uaWNvblVSTC5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZW1vdmVQYWdlVVJM RnJvbVNRTERhdGFiYXNlKHBhZ2VTbmFwc2hvdHNbaV0ucGFnZVVSTCk7Ci0gICAgICAgIGVsc2UK LSAgICAgICAgICAgIHNldEljb25VUkxGb3JQYWdlVVJMSW5TUUxEYXRhYmFzZShwYWdlU25hcHNo b3RzW2ldLmljb25VUkwsIHBhZ2VTbmFwc2hvdHNbaV0ucGFnZVVSTCk7Ci0gICAgICAgIExPRyhJ Y29uRGF0YWJhc2UsICJDb21taXR0ZWQgSWNvblVSTCBmb3IgUGFnZVVSTCAlcyB0byBkYXRhYmFz ZSIsIHVybEZvckxvZ2dpbmcocGFnZVNuYXBzaG90c1tpXS5wYWdlVVJMKS5hc2NpaSgpLmRhdGEo KSk7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3VybEFuZEljb25Mb2NrKTsKKyAgICAg ICAgVmVjdG9yPEljb25TbmFwc2hvdD4gaWNvblNuYXBzaG90czsKKyAgICAgICAgVmVjdG9yPFBh Z2VVUkxTbmFwc2hvdD4gcGFnZVNuYXBzaG90czsKKyAgICAgICAgeworICAgICAgICAgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fcGVuZGluZ1N5bmNMb2NrKTsKKworICAgICAgICAgICAgaWNvblNu YXBzaG90cy5hcHBlbmRSYW5nZShtX2ljb25zUGVuZGluZ1N5bmMuYmVnaW4oKS52YWx1ZXMoKSwg bV9pY29uc1BlbmRpbmdTeW5jLmVuZCgpLnZhbHVlcygpKTsKKyAgICAgICAgICAgIG1faWNvbnNQ ZW5kaW5nU3luYy5jbGVhcigpOworCisgICAgICAgICAgICBwYWdlU25hcHNob3RzLmFwcGVuZFJh bmdlKG1fcGFnZVVSTHNQZW5kaW5nU3luYy5iZWdpbigpLnZhbHVlcygpLCBtX3BhZ2VVUkxzUGVu ZGluZ1N5bmMuZW5kKCkudmFsdWVzKCkpOworICAgICAgICAgICAgbV9wYWdlVVJMc1BlbmRpbmdT eW5jLmNsZWFyKCk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoaWNvblNuYXBzaG90cy5zaXpl KCkgfHwgcGFnZVNuYXBzaG90cy5zaXplKCkpCisgICAgICAgICAgICBkaWRBbnlXb3JrID0gdHJ1 ZTsKKworICAgICAgICBTUUxpdGVUcmFuc2FjdGlvbiBzeW5jVHJhbnNhY3Rpb24obV9zeW5jREIp OworICAgICAgICBzeW5jVHJhbnNhY3Rpb24uYmVnaW4oKTsKKworICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgaWNvblNuYXBzaG90cy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAg d3JpdGVJY29uU25hcHNob3RUb1NRTERhdGFiYXNlKGljb25TbmFwc2hvdHNbaV0pOworICAgICAg ICAgICAgTE9HKEljb25EYXRhYmFzZSwgIldyb3RlIEljb25SZWNvcmQgZm9yIEljb25VUkwgJXMg d2l0aCB0aW1lU3RhbXAgb2YgJWkgdG8gdGhlIERCIiwgdXJsRm9yTG9nZ2luZyhpY29uU25hcHNo b3RzW2ldLmljb25VUkwpLmFzY2lpKCkuZGF0YSgpLCBpY29uU25hcHNob3RzW2ldLnRpbWVzdGFt cCk7CisgICAgICAgIH0KKworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcGFnZVNu YXBzaG90cy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIGljb24gVVJMIGlz IGVtcHR5LCB0aGlzIHBhZ2UgaXMgbWVhbnQgdG8gYmUgZGVsZXRlZAorICAgICAgICAgICAgLy8g QVNTRVJUcyBhcmUgc2FuaXR5IGNoZWNrcyB0byBtYWtlIHN1cmUgdGhlIG1hcHBpbmdzIGV4aXN0 IGlmIHRoZXkgc2hvdWxkIGFuZCBkb24ndCBpZiB0aGV5IHNob3VsZG4ndAorICAgICAgICAgICAg aWYgKHBhZ2VTbmFwc2hvdHNbaV0uaWNvblVSTC5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAg cmVtb3ZlUGFnZVVSTEZyb21TUUxEYXRhYmFzZShwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHNldEljb25VUkxGb3JQYWdlVVJMSW5T UUxEYXRhYmFzZShwYWdlU25hcHNob3RzW2ldLmljb25VUkwsIHBhZ2VTbmFwc2hvdHNbaV0ucGFn ZVVSTCk7CisgICAgICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiQ29tbWl0dGVkIEljb25VUkwg Zm9yIFBhZ2VVUkwgJXMgdG8gZGF0YWJhc2UiLCB1cmxGb3JMb2dnaW5nKHBhZ2VTbmFwc2hvdHNb aV0ucGFnZVVSTCkuYXNjaWkoKS5kYXRhKCkpOworICAgICAgICB9CisKKyAgICAgICAgc3luY1Ry YW5zYWN0aW9uLmNvbW1pdCgpOwogICAgIH0KIAotICAgIHN5bmNUcmFuc2FjdGlvbi5jb21taXQo KTsKLSAgICAKICAgICAvLyBDaGVjayB0byBtYWtlIHN1cmUgdGhlcmUgYXJlIG5vIGRhbmdsaW5n IFBhZ2VVUkxzIC0gSWYgdGhlcmUgYXJlLCB3ZSB3YW50IHRvIG91dHB1dCBvbmUgbG9nIG1lc3Nh Z2UgYnV0IG5vdCBzcGFtIHRoZSBjb25zb2xlIHBvdGVudGlhbGx5IGV2ZXJ5IGZldyBzZWNvbmRz CiAgICAgaWYgKGRpZEFueVdvcmspCiAgICAgICAgIGNoZWNrRm9yRGFuZ2xpbmdQYWdlVVJMcyhm YWxzZSk7Cg==