110466 2013-02-21 06:58:17 -0800 Web Inspector: Remove CPU profile from a group causes exception 2013-02-25 07:24:32 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 alph alph apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 838392 0 alph 2013-02-21 06:58:17 -0800 To reproduce collect several CPU profiles with the same name, e.g.: console.profile("alph"); console.profileEnd("alph"); console.profile("alph"); console.profileEnd("alph"); and try to remove these profiles one-by-one from UI. An exception is raised. 838435 1 189533 alph 2013-02-21 08:15:47 -0800 Created attachment 189533 Patch 839319 2 189533 yurys 2013-02-22 00:19:36 -0800 Comment on attachment 189533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189533&action=review > Source/WebCore/inspector/front-end/ProfilesPanel.js:559 > + if (!WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(profile.title) && !profile.isTemporary) { Why do we skip temporary profiles? > LayoutTests/inspector/profiler/cpu-profiler-profile-removal.html:18 > + InspectorTest.runProfilerTestSuite([ You don't need the suite since there is only one test. > LayoutTests/inspector/profiler/cpu-profiler-profile-removal.html:24 > + profiles._removeProfileHeader(profiles._profiles[0]); Can you check that the group and all profiles are actually removed from the profiles panel sidebar? 839388 3 189719 alph 2013-02-22 01:52:52 -0800 Created attachment 189719 Patch 839393 4 189533 alph 2013-02-22 01:57:15 -0800 Comment on attachment 189533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189533&action=review >> Source/WebCore/inspector/front-end/ProfilesPanel.js:559 >> + if (!WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(profile.title) && !profile.isTemporary) { > > Why do we skip temporary profiles? I don't want'em to form groups. >> LayoutTests/inspector/profiler/cpu-profiler-profile-removal.html:18 >> + InspectorTest.runProfilerTestSuite([ > > You don't need the suite since there is only one test. I made it consistent to other tests, e.g. cpu-profiler-profiling.html Well, removed the suite usage. >> LayoutTests/inspector/profiler/cpu-profiler-profile-removal.html:24 >> + profiles._removeProfileHeader(profiles._profiles[0]); > > Can you check that the group and all profiles are actually removed from the profiles panel sidebar? _profiles should be empty because of the loop condition. Added a check for _profileGroups. 839441 5 yurys 2013-02-22 03:46:31 -0800 (In reply to comment #4) > (From update of attachment 189533 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189533&action=review > >> LayoutTests/inspector/profiler/cpu-profiler-profile-removal.html:24 > >> + profiles._removeProfileHeader(profiles._profiles[0]); > > > > Can you check that the group and all profiles are actually removed from the profiles panel sidebar? > > _profiles should be empty because of the loop condition. Added a check for _profileGroups. I meant checking that there are no entries in the sidebar no in the profiles collection. 839527 6 189719 webkit.review.bot 2013-02-22 05:57:41 -0800 Comment on attachment 189719 Patch Rejecting attachment 189719 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-04', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 189719, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: fatal: read error: Connection reset by peer Died at Tools/Scripts/update-webkit line 151. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 2 Updating OpenSource fatal: read error: Connection reset by peer Died at Tools/Scripts/update-webkit line 151. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 2 Updating OpenSource fatal: read error: Connection reset by peer Died at Tools/Scripts/update-webkit line 151. Full output: http://queues.webkit.org/results/16694853 840932 7 190048 alph 2013-02-25 06:42:02 -0800 Created attachment 190048 Patch 840949 8 190048 webkit.review.bot 2013-02-25 07:24:29 -0800 Comment on attachment 190048 Patch Clearing flags on attachment: 190048 Committed r143923: <http://trac.webkit.org/changeset/143923> 840950 9 webkit.review.bot 2013-02-25 07:24:32 -0800 All reviewed patches have been landed. Closing bug. 189533 2013-02-21 08:15:47 -0800 2013-02-22 01:57:29 -0800 Patch bug-110466-20130221201207.patch text/plain 6465 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNjN2Q5MzVkNzAyMTZm NDk5MTc5YzZlZjM0MTlmZGI1YjYyY2MyZC4uNmVkZWZiMWYzNjZkYTQxZThiNDA4NWZlYTQ4NTBj OTg4MWI4YWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTIxICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgQ1BVIHByb2ZpbGUgZnJvbSBhIGdyb3VwIGNhdXNlcyBleGNlcHRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ2NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLl9yZW1vdmVQcm9maWxlSGFuZGxlIGRpZCBub3QgaGFuZGxlCisgICAgICAg IHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAuIFRoZSBmaXggdGFrZXMgY2FyZSBvZiB0aGlz IGNhc2UuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1w cm9maWxlLXJlbW92YWwuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLmFkZFByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLl9yZW1vdmVQcm9maWxlSGVhZGVyKToKKwogMjAxMy0wMi0yMSAgQWxiZXJ0 byBHYXJjaWEgIDxhbGJnYXJjaWFAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRml4 IGFjY2VzcyB0byBSZXNvdXJjZUhhbmRsZTo6Y29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IDlhYzc1MTEwYzlj NDRlYWRlNTQwN2JhZTZlZmMzNDNmZDE0NTgzNTYuLjZmZDAwZmY3ZjAyZDdhZjk0NWFjMDMxYzRi YTUyNjkxODljMGIzYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTU1Niw3ICs1NTYsNyBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Byb2ZpbGVzLnB1c2go cHJvZmlsZSk7CiAgICAgICAgIHRoaXMuX3Byb2ZpbGVzSWRNYXBbdGhpcy5fbWFrZUtleShwcm9m aWxlLnVpZCwgdHlwZUlkKV0gPSBwcm9maWxlOwogCi0gICAgICAgIGlmICghV2ViSW5zcGVjdG9y LlByb2ZpbGVzUGFuZWxEZXNjcmlwdG9yLmlzVXNlckluaXRpYXRlZFByb2ZpbGUocHJvZmlsZS50 aXRsZSkpIHsKKyAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbERlc2NyaXB0 b3IuaXNVc2VySW5pdGlhdGVkUHJvZmlsZShwcm9maWxlLnRpdGxlKSAmJiAhcHJvZmlsZS5pc1Rl bXBvcmFyeSkgewogICAgICAgICAgICAgdmFyIHByb2ZpbGVUaXRsZUtleSA9IHRoaXMuX21ha2VU aXRsZUtleShwcm9maWxlLnRpdGxlLCB0eXBlSWQpOwogICAgICAgICAgICAgaWYgKCEocHJvZmls ZVRpdGxlS2V5IGluIHRoaXMuX3Byb2ZpbGVHcm91cHMpKQogICAgICAgICAgICAgICAgIHRoaXMu X3Byb2ZpbGVHcm91cHNbcHJvZmlsZVRpdGxlS2V5XSA9IFtdOwpAQCAtNjE0LDggKzYxNCw2IEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBf cmVtb3ZlUHJvZmlsZUhlYWRlcjogZnVuY3Rpb24ocHJvZmlsZSkKICAgICB7Ci0gICAgICAgIHZh ciBzaWRlYmFyUGFyZW50ID0gcHJvZmlsZS5wcm9maWxlVHlwZSgpLnRyZWVFbGVtZW50OwotCiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcHJvZmlsZXMubGVuZ3RoOyArK2kpIHsK ICAgICAgICAgICAgIGlmICh0aGlzLl9wcm9maWxlc1tpXS51aWQgPT09IHByb2ZpbGUudWlkKSB7 CiAgICAgICAgICAgICAgICAgcHJvZmlsZSA9IHRoaXMuX3Byb2ZpbGVzW2ldOwpAQCAtNjI2LDkg KzYyNCwyMSBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KICAgICAgICAgZGVsZXRlIHRoaXMuX3Byb2ZpbGVzSWRNYXBbdGhpcy5fbWFrZUtleShw cm9maWxlLnVpZCwgcHJvZmlsZS5wcm9maWxlVHlwZSgpLmlkKV07CiAKKyAgICAgICAgdmFyIHNp ZGViYXJQYXJlbnQgPSBwcm9maWxlLnByb2ZpbGVUeXBlKCkudHJlZUVsZW1lbnQ7CiAgICAgICAg IHZhciBwcm9maWxlVGl0bGVLZXkgPSB0aGlzLl9tYWtlVGl0bGVLZXkocHJvZmlsZS50aXRsZSwg cHJvZmlsZS5wcm9maWxlVHlwZSgpLmlkKTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX3Byb2ZpbGVH cm91cHNbcHJvZmlsZVRpdGxlS2V5XTsKLQorICAgICAgICB2YXIgZ3JvdXAgPSB0aGlzLl9wcm9m aWxlR3JvdXBzW3Byb2ZpbGVUaXRsZUtleV07CisgICAgICAgIGlmIChncm91cCAmJiBncm91cC5s ZW5ndGggPiAxKSB7CisgICAgICAgICAgICBncm91cC5zcGxpY2UoZ3JvdXAuaW5kZXhPZihwcm9m aWxlKSwgMSk7CisgICAgICAgICAgICBpZiAoZ3JvdXAubGVuZ3RoID09PSAxKSB7CisgICAgICAg ICAgICAgICAgLy8gTW92ZSB0aGUgbGFzdCBwcm9maWxlIG91dCBvZiBpdHMgZ3JvdXAgYW5kIHJl bW92ZSB0aGUgZ3JvdXAuCisgICAgICAgICAgICAgICAgdmFyIGluZGV4ID0gc2lkZWJhclBhcmVu dC5jaGlsZHJlbi5pbmRleE9mKGdyb3VwLl9wcm9maWxlc1RyZWVFbGVtZW50KTsKKyAgICAgICAg ICAgICAgICBzaWRlYmFyUGFyZW50Lmluc2VydENoaWxkKGdyb3VwWzBdLl9wcm9maWxlc1RyZWVF bGVtZW50LCBpbmRleCk7CisgICAgICAgICAgICAgICAgZ3JvdXBbMF0uX3Byb2ZpbGVzVHJlZUVs ZW1lbnQuc21hbGwgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBncm91cFswXS5fcHJvZmlsZXNU cmVlRWxlbWVudC5tYWluVGl0bGUgPSBncm91cFswXS50aXRsZTsKKyAgICAgICAgICAgICAgICBz aWRlYmFyUGFyZW50LnJlbW92ZUNoaWxkKGdyb3VwLl9wcm9maWxlc1RyZWVFbGVtZW50KTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIHNpZGViYXJQYXJlbnQgPSBncm91cC5fcHJvZmlsZXNU cmVlRWxlbWVudDsKKyAgICAgICAgfQogICAgICAgICBzaWRlYmFyUGFyZW50LnJlbW92ZUNoaWxk KHByb2ZpbGUuX3Byb2ZpbGVzVHJlZUVsZW1lbnQpOwogCiAgICAgICAgIGlmICghcHJvZmlsZS5p c1RlbXBvcmFyeSkgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGIzYWVhOTE5ZGY5N2Y1ODljMTQyNDk0NjM1ZmIxOWI4Yjk2 MjZhMjYuLjBjZjk0Njk2MTEzNjhmNTVjNDAzOGY1MDcxMjUyNjMyNzRhYmQyZjAgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMy0wMi0yMSAgQWxleGVpIEZpbGlwcG92ICA8YWxwaEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIENQVSBwcm9maWxlIGZyb20g YSBncm91cCBjYXVzZXMgZXhjZXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTA0NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5fcmVtb3ZlUHJvZmls ZUhhbmRsZSBkaWQgbm90IGhhbmRsZQorICAgICAgICBwcm9maWxlIHJlbW92YWwgZnJvbSBhIGdy b3VwLiBUaGUgZml4IHRha2VzIGNhcmUgb2YgdGhpcyBjYXNlLgorCisgICAgICAgIFRlc3Q6IGlu c3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLmh0bWwKKworICAg ICAgICAqIGluc3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9m aWxlci1wcm9maWxlLXJlbW92YWwuaHRtbDogQWRkZWQuCisKIDIwMTMtMDItMjEgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxNDM1ODEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv cHJvZmlsZXIvY3B1LXByb2ZpbGVyLXByb2ZpbGUtcmVtb3ZhbC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvY3B1LXByb2ZpbGVyLXByb2ZpbGUtcmVtb3ZhbC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmMzZWU0YzI2NmNlYTg0NDMzZjU5YTljMDJhMDY2NmU2 OTQyNTNhNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxl ci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDgg QEAKK1Rlc3RzIHRoYXQgQ1BVIHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAgd29ya3MuIEJ1 ZyAxMTA0NjYKKworUHJvZmlsZXIgd2FzIGVuYWJsZWQuCisKK1J1bm5pbmc6IHRlc3RQcm9maWxp bmcKKworUHJvZmlsZXIgd2FzIGRpc2FibGVkLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvcHJvZmlsZXIvY3B1LXByb2ZpbGVyLXByb2ZpbGUtcmVtb3ZhbC5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi42OTNlYjJkZmJhMWFiNDZjZjQzMjkwOTA4NmM0ZTAxNzg0ODFiNjMw Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1w cm9maWxlci1wcm9maWxlLXJlbW92YWwuaHRtbApAQCAtMCwwICsxLDQzIEBACis8aHRtbD4KKzxo ZWFkPgorICA8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9y LXRlc3QuanMiPjwvc2NyaXB0PgorICA8c2NyaXB0IHNyYz0icHJvZmlsZXItdGVzdC5qcyI+PC9z Y3JpcHQ+Cis8c2NyaXB0PgorCitmdW5jdGlvbiBwYWdlRnVuY3Rpb24oKSB7CisgICAgY29uc29s ZS5wcm9maWxlKCJwMSIpOworICAgIGNvbnNvbGUucHJvZmlsZUVuZCgicDEiKTsKKyAgICBjb25z b2xlLnByb2ZpbGUoInAxIik7CisgICAgY29uc29sZS5wcm9maWxlRW5kKCJwMSIpOworICAgIGNv bnNvbGUucHJvZmlsZSgicDIiKTsKKyAgICBjb25zb2xlLnByb2ZpbGVFbmQoInAyIik7Cit9CisK K2Z1bmN0aW9uIHRlc3QoKQoreworICAgIEluc3BlY3RvclRlc3QucnVuUHJvZmlsZXJUZXN0U3Vp dGUoWworICAgICAgICBmdW5jdGlvbiB0ZXN0UHJvZmlsaW5nKG5leHQpCisgICAgICAgIHsKKyAg ICAgICAgICAgIGZ1bmN0aW9uIHZpZXdMb2FkZWQodmlldykgeworICAgICAgICAgICAgICAgIHZh ciBwcm9maWxlcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXM7CisgICAgICAgICAgICAg ICAgd2hpbGUgKHByb2ZpbGVzLl9wcm9maWxlcy5sZW5ndGggIT09IDApCisgICAgICAgICAgICAg ICAgICAgIHByb2ZpbGVzLl9yZW1vdmVQcm9maWxlSGVhZGVyKHByb2ZpbGVzLl9wcm9maWxlc1sw XSk7CisgICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgfQorICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluQ29uc29sZSgicGFnZUZ1bmN0aW9uKCkiLCBmdW5jdGlv bigpIHt9KTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Byb2ZpbGVXaGVuQWRkZWQo InAyIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LndhaXRVbnRpbFByb2ZpbGVWaWV3SXNT aG93bigicDIiLCB2aWV3TG9hZGVkKTsKKyAgICAgICAgfQorICAgIF0pOworfQorCis8L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPgorVGVzdHMgdGhhdCBD UFUgcHJvZmlsZSByZW1vdmFsIGZyb20gYSBncm91cCB3b3Jrcy4KKworPGEgaHJlZj0iaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ2NiI+QnVnIDExMDQ2NjwvYT4K KzwvcD4KKzwvYm9keT4KKzwvaHRtbD4K 189719 2013-02-22 01:52:52 -0800 2013-02-25 06:41:58 -0800 Patch bug-110466-20130222134911.patch text/plain 6775 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNjN2Q5MzVkNzAyMTZm NDk5MTc5YzZlZjM0MTlmZGI1YjYyY2MyZC4uNmVkZWZiMWYzNjZkYTQxZThiNDA4NWZlYTQ4NTBj OTg4MWI4YWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTIxICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgQ1BVIHByb2ZpbGUgZnJvbSBhIGdyb3VwIGNhdXNlcyBleGNlcHRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ2NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLl9yZW1vdmVQcm9maWxlSGFuZGxlIGRpZCBub3QgaGFuZGxlCisgICAgICAg IHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAuIFRoZSBmaXggdGFrZXMgY2FyZSBvZiB0aGlz IGNhc2UuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1w cm9maWxlLXJlbW92YWwuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLmFkZFByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLl9yZW1vdmVQcm9maWxlSGVhZGVyKToKKwogMjAxMy0wMi0yMSAgQWxiZXJ0 byBHYXJjaWEgIDxhbGJnYXJjaWFAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRml4 IGFjY2VzcyB0byBSZXNvdXJjZUhhbmRsZTo6Y29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IDlhYzc1MTEwYzlj NDRlYWRlNTQwN2JhZTZlZmMzNDNmZDE0NTgzNTYuLjhiYmRiYWRiOWEyYzBlMWNkZjY5ZmM0N2Zl YjM3ZDkyNzFlMGFhODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTU1Niw3ICs1NTYsNyBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Byb2ZpbGVzLnB1c2go cHJvZmlsZSk7CiAgICAgICAgIHRoaXMuX3Byb2ZpbGVzSWRNYXBbdGhpcy5fbWFrZUtleShwcm9m aWxlLnVpZCwgdHlwZUlkKV0gPSBwcm9maWxlOwogCi0gICAgICAgIGlmICghV2ViSW5zcGVjdG9y LlByb2ZpbGVzUGFuZWxEZXNjcmlwdG9yLmlzVXNlckluaXRpYXRlZFByb2ZpbGUocHJvZmlsZS50 aXRsZSkpIHsKKyAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbERlc2NyaXB0 b3IuaXNVc2VySW5pdGlhdGVkUHJvZmlsZShwcm9maWxlLnRpdGxlKSAmJiAhcHJvZmlsZS5pc1Rl bXBvcmFyeSkgewogICAgICAgICAgICAgdmFyIHByb2ZpbGVUaXRsZUtleSA9IHRoaXMuX21ha2VU aXRsZUtleShwcm9maWxlLnRpdGxlLCB0eXBlSWQpOwogICAgICAgICAgICAgaWYgKCEocHJvZmls ZVRpdGxlS2V5IGluIHRoaXMuX3Byb2ZpbGVHcm91cHMpKQogICAgICAgICAgICAgICAgIHRoaXMu X3Byb2ZpbGVHcm91cHNbcHJvZmlsZVRpdGxlS2V5XSA9IFtdOwpAQCAtNjE0LDggKzYxNCw2IEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBf cmVtb3ZlUHJvZmlsZUhlYWRlcjogZnVuY3Rpb24ocHJvZmlsZSkKICAgICB7Ci0gICAgICAgIHZh ciBzaWRlYmFyUGFyZW50ID0gcHJvZmlsZS5wcm9maWxlVHlwZSgpLnRyZWVFbGVtZW50OwotCiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcHJvZmlsZXMubGVuZ3RoOyArK2kpIHsK ICAgICAgICAgICAgIGlmICh0aGlzLl9wcm9maWxlc1tpXS51aWQgPT09IHByb2ZpbGUudWlkKSB7 CiAgICAgICAgICAgICAgICAgcHJvZmlsZSA9IHRoaXMuX3Byb2ZpbGVzW2ldOwpAQCAtNjI2LDkg KzYyNCwyNCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KICAgICAgICAgZGVsZXRlIHRoaXMuX3Byb2ZpbGVzSWRNYXBbdGhpcy5fbWFrZUtleShw cm9maWxlLnVpZCwgcHJvZmlsZS5wcm9maWxlVHlwZSgpLmlkKV07CiAKKyAgICAgICAgdmFyIHNp ZGViYXJQYXJlbnQgPSBwcm9maWxlLnByb2ZpbGVUeXBlKCkudHJlZUVsZW1lbnQ7CiAgICAgICAg IHZhciBwcm9maWxlVGl0bGVLZXkgPSB0aGlzLl9tYWtlVGl0bGVLZXkocHJvZmlsZS50aXRsZSwg cHJvZmlsZS5wcm9maWxlVHlwZSgpLmlkKTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX3Byb2ZpbGVH cm91cHNbcHJvZmlsZVRpdGxlS2V5XTsKLQorICAgICAgICB2YXIgZ3JvdXAgPSB0aGlzLl9wcm9m aWxlR3JvdXBzW3Byb2ZpbGVUaXRsZUtleV07CisgICAgICAgIGlmIChncm91cCkgeworICAgICAg ICAgICAgZ3JvdXAuc3BsaWNlKGdyb3VwLmluZGV4T2YocHJvZmlsZSksIDEpOworICAgICAgICAg ICAgaWYgKGdyb3VwLmxlbmd0aCA9PT0gMSkgeworICAgICAgICAgICAgICAgIC8vIE1vdmUgdGhl IGxhc3QgcHJvZmlsZSBvdXQgb2YgaXRzIGdyb3VwIGFuZCByZW1vdmUgdGhlIGdyb3VwLgorICAg ICAgICAgICAgICAgIHZhciBpbmRleCA9IHNpZGViYXJQYXJlbnQuY2hpbGRyZW4uaW5kZXhPZihn cm91cC5fcHJvZmlsZXNUcmVlRWxlbWVudCk7CisgICAgICAgICAgICAgICAgc2lkZWJhclBhcmVu dC5pbnNlcnRDaGlsZChncm91cFswXS5fcHJvZmlsZXNUcmVlRWxlbWVudCwgaW5kZXgpOworICAg ICAgICAgICAgICAgIGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVtZW50LnNtYWxsID0gZmFsc2U7 CisgICAgICAgICAgICAgICAgZ3JvdXBbMF0uX3Byb2ZpbGVzVHJlZUVsZW1lbnQubWFpblRpdGxl ID0gZ3JvdXBbMF0udGl0bGU7CisgICAgICAgICAgICAgICAgc2lkZWJhclBhcmVudC5yZW1vdmVD aGlsZChncm91cC5fcHJvZmlsZXNUcmVlRWxlbWVudCk7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBpZiAoZ3JvdXAubGVuZ3RoICE9PSAwKQorICAgICAgICAgICAgICAgIHNpZGViYXJQYXJl bnQgPSBncm91cC5fcHJvZmlsZXNUcmVlRWxlbWVudDsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICBkZWxldGUgdGhpcy5fcHJvZmlsZUdyb3Vwc1twcm9maWxlVGl0bGVLZXldOwor ICAgICAgICB9CiAgICAgICAgIHNpZGViYXJQYXJlbnQucmVtb3ZlQ2hpbGQocHJvZmlsZS5fcHJv ZmlsZXNUcmVlRWxlbWVudCk7CiAKICAgICAgICAgaWYgKCFwcm9maWxlLmlzVGVtcG9yYXJ5KSB7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggYjNhZWE5MTlkZjk3ZjU4OWMxNDI0OTQ2MzVmYjE5YjhiOTYyNmEyNi4uMGNmOTQ2 OTYxMTM2OGY1NWM0MDM4ZjUwNzEyNTI2MzI3NGFiZDJmMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBA CisyMDEzLTAyLTIxICBBbGV4ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgQ1BVIHByb2ZpbGUgZnJvbSBhIGdyb3VwIGNhdXNl cyBleGNlcHRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDQ2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLl9yZW1vdmVQcm9maWxlSGFuZGxlIGRpZCBu b3QgaGFuZGxlCisgICAgICAgIHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAuIFRoZSBmaXgg dGFrZXMgY2FyZSBvZiB0aGlzIGNhc2UuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3Byb2Zp bGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwuaHRtbAorCisgICAgICAgICogaW5zcGVj dG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvZmlsZXIvY3B1LXByb2ZpbGVyLXByb2ZpbGUt cmVtb3ZhbC5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQu cmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjE0MzU4MS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jcHUt cHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi43MzRmZTFjYzRjODVkNzhiMmI1MjVhZjU5NjlhNzY3YWRlZWE5MzAzCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxl ci1wcm9maWxlLXJlbW92YWwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGVzdHMgdGhh dCBDUFUgcHJvZmlsZSByZW1vdmFsIGZyb20gYSBncm91cCB3b3Jrcy4gQnVnIDExMDQ2NgorCitQ cm9maWxlciB3YXMgZW5hYmxlZC4KK1Byb2ZpbGUgZ3JvdXBzIGFmdGVyIHJlbW92YWw6CisKK1By b2ZpbGVyIHdhcyBkaXNhYmxlZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3Byb2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwuaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZGM5Mjg4NjA3ZTExZTUyZDQ0ZGNiNTE4N2M5MTEzOTYwMDgxMWI1ZgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXIt cHJvZmlsZS1yZW1vdmFsLmh0bWwKQEAgLTAsMCArMSw0NCBAQAorPGh0bWw+Cis8aGVhZD4KKyAg PHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0Lmpz Ij48L3NjcmlwdD4KKyAgPHNjcmlwdCBzcmM9InByb2ZpbGVyLXRlc3QuanMiPjwvc2NyaXB0Pgor PHNjcmlwdD4KKworZnVuY3Rpb24gcGFnZUZ1bmN0aW9uKCkgeworICAgIGNvbnNvbGUucHJvZmls ZSgicDEiKTsKKyAgICBjb25zb2xlLnByb2ZpbGVFbmQoInAxIik7CisgICAgY29uc29sZS5wcm9m aWxlKCJwMSIpOworICAgIGNvbnNvbGUucHJvZmlsZUVuZCgicDEiKTsKKyAgICBjb25zb2xlLnBy b2ZpbGUoInAyIik7CisgICAgY29uc29sZS5wcm9maWxlRW5kKCJwMiIpOworfQorCitmdW5jdGlv biB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LnN0YXJ0UHJvZmlsZXJUZXN0KGZ1bmN0aW9u KCkgeworICAgICAgICBmdW5jdGlvbiB2aWV3TG9hZGVkKHZpZXcpIHsKKyAgICAgICAgICAgIHZh ciBwcm9maWxlcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXM7CisgICAgICAgICAgICB3 aGlsZSAocHJvZmlsZXMuX3Byb2ZpbGVzLmxlbmd0aCAhPT0gMCkKKyAgICAgICAgICAgICAgICBw cm9maWxlcy5fcmVtb3ZlUHJvZmlsZUhlYWRlcihwcm9maWxlcy5fcHJvZmlsZXNbMF0pOworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlByb2ZpbGUgZ3JvdXBzIGFmdGVyIHJl bW92YWw6Iik7CisgICAgICAgICAgICBmb3IgKHZhciBrZXkgaW4gcHJvZmlsZXMuX3Byb2ZpbGVH cm91cHMpCisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoa2V5ICsgIjog IiArIHByb2ZpbGVzLl9wcm9maWxlR3JvdXBzW2tleV0ubGVuZ3RoKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuY29tcGxldGVQcm9maWxlclRlc3QoKTsKKyAgICAgICAgfQorICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJwcm9maWxlcyIpOworICAgICAgICBJbnNwZWN0b3JUZXN0 LmV2YWx1YXRlSW5Db25zb2xlKCJwYWdlRnVuY3Rpb24oKSIsIGZ1bmN0aW9uKCkge30pOworICAg ICAgICBJbnNwZWN0b3JUZXN0LnNob3dQcm9maWxlV2hlbkFkZGVkKCJwMiIpOworICAgICAgICBJ bnNwZWN0b3JUZXN0LndhaXRVbnRpbFByb2ZpbGVWaWV3SXNTaG93bigicDIiLCB2aWV3TG9hZGVk KTsKKyAgICB9KTsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRl c3QoKSI+Cis8cD4KK1Rlc3RzIHRoYXQgQ1BVIHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAg d29ya3MuCisKKzxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTA0NjYiPkJ1ZyAxMTA0NjY8L2E+Cis8L3A+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 190048 2013-02-25 06:42:02 -0800 2013-02-25 07:24:29 -0800 Patch bug-110466-20130225183818.patch text/plain 6612 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzZkNmY5NTRjYWE0OTM2 ODlmYjE2NDUwMThhMWM3YzY1YzFiNzA3Yy4uNDNiZTUzNTRiYzNiZGM3OTA5OWY5MDU5NWRmNTRm YjYwZGU1NjY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTIxICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgQ1BVIHByb2ZpbGUgZnJvbSBhIGdyb3VwIGNhdXNlcyBleGNlcHRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDQ2NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLl9yZW1vdmVQcm9maWxlSGFuZGxlIGRpZCBub3QgaGFuZGxlCisgICAgICAg IHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAuIFRoZSBmaXggdGFrZXMgY2FyZSBvZiB0aGlz IGNhc2UuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1w cm9maWxlLXJlbW92YWwuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLmFkZFByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLl9yZW1vdmVQcm9maWxlSGVhZGVyKToKKwogMjAxMy0wMi0yMyAgSWx5YSBU aWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogTmF0aXZlIE1lbW9yeSBJbnN0cnVtZW50YXRpb246IHJlcGxhY2UgU3RyaW5nIHdpdGggY29u c3QgY2hhciogaW4gTWVtb3J5T2JqZWN0SW5mbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IDE4YzM3MDUxMGEyNmQ0OTI4 YThjZDliZmY3YzIxNzdjODgxOTE3MTEuLmI1MGE0ZjIyYTNlNTU2MTUxOTI4Njc3NDk0MzkyZjlm ODYyMTliNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UHJvZmlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVzUGFuZWwuanMKQEAgLTY0MCw3ICs2NDAsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmls ZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBzbWFsbCA9IGZhbHNlOwogICAgICAg ICB2YXIgYWx0ZXJuYXRlVGl0bGU7CiAKLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuUHJvZmls ZXNQYW5lbERlc2NyaXB0b3IuaXNVc2VySW5pdGlhdGVkUHJvZmlsZShwcm9maWxlLnRpdGxlKSkg eworICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsRGVzY3JpcHRvci5pc1Vz ZXJJbml0aWF0ZWRQcm9maWxlKHByb2ZpbGUudGl0bGUpICYmICFwcm9maWxlLmlzVGVtcG9yYXJ5 KSB7CiAgICAgICAgICAgICB2YXIgcHJvZmlsZVRpdGxlS2V5ID0gdGhpcy5fbWFrZVRpdGxlS2V5 KHByb2ZpbGUudGl0bGUsIHR5cGVJZCk7CiAgICAgICAgICAgICBpZiAoIShwcm9maWxlVGl0bGVL ZXkgaW4gdGhpcy5fcHJvZmlsZUdyb3VwcykpCiAgICAgICAgICAgICAgICAgdGhpcy5fcHJvZmls ZUdyb3Vwc1twcm9maWxlVGl0bGVLZXldID0gW107CkBAIC03MDQsMTIgKzcwNCwyMCBAQCBXZWJJ bnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBwcm9maWxl VGl0bGVLZXkgPSB0aGlzLl9tYWtlVGl0bGVLZXkocHJvZmlsZS50aXRsZSwgcHJvZmlsZS5wcm9m aWxlVHlwZSgpLmlkKTsKICAgICAgICAgdmFyIGdyb3VwID0gdGhpcy5fcHJvZmlsZUdyb3Vwc1tw cm9maWxlVGl0bGVLZXldOwogICAgICAgICBpZiAoZ3JvdXApIHsKLSAgICAgICAgICAgIHZhciBp bmRleCA9IGdyb3VwLmluZGV4T2YocHJvZmlsZSk7Ci0gICAgICAgICAgICBzaWRlYmFyUGFyZW50 ID0gZ3JvdXAuX3Byb2ZpbGVzVHJlZUVsZW1lbnQgfHwgc2lkZWJhclBhcmVudDsKLSAgICAgICAg ICAgIGlmIChpbmRleCAhPT0gLTEpCi0gICAgICAgICAgICAgICAgZ3JvdXAuc3BsaWNlKGluZGV4 LCAxKTsKKyAgICAgICAgICAgIGdyb3VwLnNwbGljZShncm91cC5pbmRleE9mKHByb2ZpbGUpLCAx KTsKKyAgICAgICAgICAgIGlmIChncm91cC5sZW5ndGggPT09IDEpIHsKKyAgICAgICAgICAgICAg ICAvLyBNb3ZlIHRoZSBsYXN0IHByb2ZpbGUgb3V0IG9mIGl0cyBncm91cCBhbmQgcmVtb3ZlIHRo ZSBncm91cC4KKyAgICAgICAgICAgICAgICB2YXIgaW5kZXggPSBzaWRlYmFyUGFyZW50LmNoaWxk cmVuLmluZGV4T2YoZ3JvdXAuX3Byb2ZpbGVzVHJlZUVsZW1lbnQpOworICAgICAgICAgICAgICAg IHNpZGViYXJQYXJlbnQuaW5zZXJ0Q2hpbGQoZ3JvdXBbMF0uX3Byb2ZpbGVzVHJlZUVsZW1lbnQs IGluZGV4KTsKKyAgICAgICAgICAgICAgICBncm91cFswXS5fcHJvZmlsZXNUcmVlRWxlbWVudC5z bWFsbCA9IGZhbHNlOworICAgICAgICAgICAgICAgIGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVt ZW50Lm1haW5UaXRsZSA9IGdyb3VwWzBdLnRpdGxlOworICAgICAgICAgICAgICAgIHNpZGViYXJQ YXJlbnQucmVtb3ZlQ2hpbGQoZ3JvdXAuX3Byb2ZpbGVzVHJlZUVsZW1lbnQpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgaWYgKGdyb3VwLmxlbmd0aCAhPT0gMCkKKyAgICAgICAgICAgICAg ICBzaWRlYmFyUGFyZW50ID0gZ3JvdXAuX3Byb2ZpbGVzVHJlZUVsZW1lbnQ7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3Byb2ZpbGVHcm91cHNbcHJvZmls ZVRpdGxlS2V5XTsKICAgICAgICAgfQotCiAgICAgICAgIHNpZGViYXJQYXJlbnQucmVtb3ZlQ2hp bGQocHJvZmlsZS5fcHJvZmlsZXNUcmVlRWxlbWVudCk7CiAKICAgICAgICAgLy8gTm8gb3RoZXIg aXRlbSB3aWxsIGJlIHNlbGVjdGVkIGlmIHRoZXJlIGFyZW4ndCBhbnkgb3RoZXIgcHJvZmlsZXMs IHNvCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNWJjN2E2ZTJjMzIzZDMyN2IyZDMyNTBiNWI0ZjlkZDQwNTYwYjE5OC4uZWUy MzhlMjY1NGE2Y2U1OTUxNTNjMmUxZGQyNDY4OWVhNjFiOTk2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEzLTAyLTIxICBBbGV4ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgQ1BVIHByb2ZpbGUgZnJvbSBhIGdyb3VwIGNh dXNlcyBleGNlcHRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMDQ2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLl9yZW1vdmVQcm9maWxlSGFuZGxlIGRp ZCBub3QgaGFuZGxlCisgICAgICAgIHByb2ZpbGUgcmVtb3ZhbCBmcm9tIGEgZ3JvdXAuIFRoZSBm aXggdGFrZXMgY2FyZSBvZiB0aGlzIGNhc2UuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3By b2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwuaHRtbAorCisgICAgICAgICogaW5z cGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvZmlsZXIvY3B1LXByb2ZpbGVyLXByb2Zp bGUtcmVtb3ZhbC5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yNSAgVnNldm9sb2QgVmxhc292ICA8 dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGNocm9taXVtIHRlc3Qg ZXhwZWN0YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9w cm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MzRmZTFjYzRjODVkNzhiMmI1MjVhZjU5NjlhNzY3YWRl ZWE5MzAzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVy L2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBA QAorVGVzdHMgdGhhdCBDUFUgcHJvZmlsZSByZW1vdmFsIGZyb20gYSBncm91cCB3b3Jrcy4gQnVn IDExMDQ2NgorCitQcm9maWxlciB3YXMgZW5hYmxlZC4KK1Byb2ZpbGUgZ3JvdXBzIGFmdGVyIHJl bW92YWw6CisKK1Byb2ZpbGVyIHdhcyBkaXNhYmxlZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NwdS1wcm9maWxlci1wcm9maWxlLXJlbW92YWwuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jcHUtcHJvZmlsZXItcHJvZmlsZS1yZW1v dmFsLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMzlkNDQwMDNjYjVjNGMzNDZmYTNhN2E5MDNiYTQ4MjI1ZmFh YzUxYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9j cHUtcHJvZmlsZXItcHJvZmlsZS1yZW1vdmFsLmh0bWwKQEAgLTAsMCArMSw0NiBAQAorPGh0bWw+ Cis8aGVhZD4KKyAgPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3Bl Y3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKyAgPHNjcmlwdCBzcmM9InByb2ZpbGVyLXRlc3QuanMi Pjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gcGFnZUZ1bmN0aW9uKCkgeworICAgIGNv bnNvbGUucHJvZmlsZSgicDEiKTsKKyAgICBjb25zb2xlLnByb2ZpbGVFbmQoInAxIik7CisgICAg Y29uc29sZS5wcm9maWxlKCJwMSIpOworICAgIGNvbnNvbGUucHJvZmlsZUVuZCgicDEiKTsKKyAg ICBjb25zb2xlLnByb2ZpbGUoInAyIik7CisgICAgY29uc29sZS5wcm9maWxlRW5kKCJwMiIpOwor fQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LnN0YXJ0UHJvZmlsZXJU ZXN0KGZ1bmN0aW9uKCkgeworICAgICAgICBmdW5jdGlvbiB2aWV3TG9hZGVkKHZpZXcpIHsKKyAg ICAgICAgICAgIHZhciBwcm9maWxlcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXM7Cisg ICAgICAgICAgICB2YXIgdHlwZSA9IHByb2ZpbGVzLmdldFByb2ZpbGVUeXBlKCJDUFUiKTsKKyAg ICAgICAgICAgIHdoaWxlICh0eXBlLmdldFByb2ZpbGVzKCkubGVuZ3RoICE9PSAwKQorICAgICAg ICAgICAgICAgIHByb2ZpbGVzLl9yZW1vdmVQcm9maWxlSGVhZGVyKHR5cGUuZ2V0UHJvZmlsZXMo KVswXSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiUHJvZmlsZSBncm91 cHMgYWZ0ZXIgcmVtb3ZhbDoiKTsKKyAgICAgICAgICAgIGZvciAodmFyIGtleSBpbiBwcm9maWxl cy5fcHJvZmlsZUdyb3VwcykKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3Vs dChrZXkgKyAiOiAiICsgcHJvZmlsZXMuX3Byb2ZpbGVHcm91cHNba2V5XS5sZW5ndGgpOworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoMCwgdHlwZS50cmVlRWxlbWVudC5j aGlsZHJlbi5sZW5ndGgsICJBbGwgY2hpbGRyZW4gaGFzIGJlZW4gcmVtb3ZlZCIpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVByb2ZpbGVyVGVzdCgpOworICAgICAgICB9Cisg ICAgICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoInByb2ZpbGVzIik7CisgICAgICAgIEluc3Bl Y3RvclRlc3QuZXZhbHVhdGVJbkNvbnNvbGUoInBhZ2VGdW5jdGlvbigpIiwgZnVuY3Rpb24oKSB7 fSk7CisgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Byb2ZpbGVXaGVuQWRkZWQoInAyIik7Cisg ICAgICAgIEluc3BlY3RvclRlc3Qud2FpdFVudGlsUHJvZmlsZVZpZXdJc1Nob3duKCJwMiIsIHZp ZXdMb2FkZWQpOworICAgIH0pOworfQorCis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9h ZD0icnVuVGVzdCgpIj4KKzxwPgorVGVzdHMgdGhhdCBDUFUgcHJvZmlsZSByZW1vdmFsIGZyb20g YSBncm91cCB3b3Jrcy4KKworPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDQ2NiI+QnVnIDExMDQ2NjwvYT4KKzwvcD4KKzwvYm9keT4KKzwvaHRtbD4K