151373 2015-11-17 17:11:29 -0800 Web Inspector: Probes sidebar panel sections should use NavigationBar 2015-11-18 15:48:00 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 151377 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1142719 0 mattbaker 2015-11-17 17:11:29 -0800 * SUMMARY Probes sidebar panel sections should use NavigationBar. Currently the add probe, clear samples, and remove probe buttons are added to the DOM manually, and lack tooltips and enabled/disabled state. The clear samples button should only be enabled when samples exist. 1142720 1 webkit-bug-importer 2015-11-17 17:12:21 -0800 <rdar://problem/23586395> 1142731 2 265721 mattbaker 2015-11-17 17:30:36 -0800 Created attachment 265721 [Patch] Proposed Fix 1142750 3 265727 mattbaker 2015-11-17 19:16:29 -0800 Created attachment 265727 [Patch] Proposed Fix 1142953 4 265727 bburg 2015-11-18 13:16:05 -0800 Comment on attachment 265727 [Patch] Proposed Fix r=me 1142970 5 265727 commit-queue 2015-11-18 14:03:55 -0800 Comment on attachment 265727 [Patch] Proposed Fix Rejecting attachment 265727 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 265727, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: fs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 192583 = 2cdccd4e25f76b98954bfe31ba68605844034e38 r192584 = 355e1772eddb165f3350675b090fc6b42d9696df r192585 = d17e14a3625201fac8271edf221660edd2917f38 r192586 = cb5552d0076102582c50977bd8e82ce3e244a4d3 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.webkit.org/results/446845 1142991 6 265783 mattbaker 2015-11-18 14:50:49 -0800 Created attachment 265783 [Patch] Proposed Fix 1143036 7 265783 commit-queue 2015-11-18 15:47:57 -0800 Comment on attachment 265783 [Patch] Proposed Fix Clearing flags on attachment: 265783 Committed r192594: <http://trac.webkit.org/changeset/192594> 1143037 8 commit-queue 2015-11-18 15:48:00 -0800 All reviewed patches have been landed. Closing bug. 265721 2015-11-17 17:30:36 -0800 2015-11-17 19:16:26 -0800 [Patch] Proposed Fix bug-151373-20151117173024.patch text/plain 11343 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz MmVhNjQwN2E1YzQzODI1YzljNDgyM2RlYTg4NjIzNzFmYmU0N2JhLi5iZjE5ZDAyMTkwNmZhNTlk NjgyZDFkZWYyZDM2YzE0NTA2OWJlNTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0MiBAQAogMjAxNS0xMS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvYmVzIHNpZGViYXIgcGFuZWwgc2VjdGlvbnMg c2hvdWxkIHVzZSBOYXZpZ2F0aW9uQmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTEzNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZXBsYWNlcyBidXR0b24gaW1hZ2VzIHdpdGggYSBOYXZpZ2F0aW9u QmFyIGluc3RhbmNlLiBUaGUgIkNsZWFyIHNhbXBsZXMiCisgICAgICAgIGJ1dHRvbiBpcyBvbmx5 IGVuYWJsZWQgd2hlbiB0aGUgcHJvYmUgc2V0IGNvbnRhaW5zIHNhbXBsZXMuCisKKyAgICAgICAg KiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgIE5l dyBuYXZpZ2F0aW9uIGl0ZW0gbGFiZWxzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2Rl bHMvUHJvYmVTZXQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVTZXQucHJvdG90eXBl Ll9zYW1wbGVDb2xsZWN0ZWQpOgorICAgICAgICBEaXNwYXRjaCBuZXcgZXZlbnQgV2ViSW5zcGVj dG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZUFkZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzOgorICAgICAgICAoLmRldGFpbHMt c2VjdGlvbi5wcm9iZS1zZXQgPiAuaGVhZGVyKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24u cHJvYmUtc2V0IC5vcHRpb25zID4gLm5hdmlnYXRpb24tYmFyKToKKyAgICAgICAgKC5kZXRhaWxz LXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0pOgor ICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiA6bWF0Y2hlcygu cHJvYmUtcmVtb3ZlLCAucHJvYmUtY2xlYXItc2FtcGxlcywgLnByb2JlLWFkZCkpOiBEZWxldGVk LgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUt Y2xlYXItc2FtcGxlcyk6IERlbGV0ZWQuCisgICAgICAgICguZGV0YWlscy1zZWN0aW9uLnByb2Jl LXNldCAub3B0aW9ucyA+IC5wcm9iZS1yZW1vdmUpOiBEZWxldGVkLgorICAgICAgICAoLmRldGFp bHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtYWRkKTogRGVsZXRlZC4KKyAg ICAgICAgTmV3IHN0eWxlcyB0byBzaG93IE5hdmlnYXRpb25CYXIgd2l0aGluIGEgZGV0YWlscyBz ZWN0aW9uIGhlYWRlci4KKyAgICAgICAgUmVtb3ZlZCBvbGQgYnV0dG9uIHN0eWxlcy4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLnByb3RvdHlwZS5fYWRkUHJvYmVCdXR0 b25DbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9u LnByb3RvdHlwZS5fY2xlYXJTYW1wbGVzQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5wcm90b3R5cGUuX3Byb2JlU2V0U2FtcGxlc0No YW5nZWQpOgorICAgICAgICBVcGRhdGUgIkNsZWFyIHNhbXBsZXMiIGVuYWJsZWQgc3RhdGUuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5wcm90b3R5cGUuX3By b2JlU2V0SGFzU2FtcGxlcyk6CisgICAgICAgIEhlbHBlciBmdW5jdGlvbiB0byBjaGVjayBpZiB0 aGUgY3VycmVudCBwcm9iZSBzZXQgaGFzIGF0IGxlYXN0IG9uZSBzYW1wbGUuCisKKzIwMTUtMTEt MTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEJyZWFrcG9pbnQgY29uZGl0aW9uIGZpZWxkIHNob3VsZCB1c2UgQ29kZU1pcnJvcgog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzMzCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGI0YzQ1NWYzNjRjZTE2MzhjNjYy NWM5NzUyZjY4NzZmNjQwNWI3ZTIuLmMyNjMxMDY3M2UyNDgxMjhhZWMyMGMyYzY3YzMzMDkxYzVk ZDliZjggMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMTQ0CnpjbWRuPGgtSzFLbUpPTz4r ekpjQDNgR3EyM2BxPkJsTXxkSkMrOW5IT0AxJUohSEYjRElRaEh+K2gkRU0yTn1eKwp6aEQ0eHAx JV9mRW9lUntPITtzMlFKZWtLKGtgcGQ2eHhtcUlAX1RjeCR1b19GSGE4blJTJStqKyF2a15kUkdA YUsKUD41fnRiPnUhI0dffUN1KyROd3VyCgpkZWx0YSAzMgpxY21WKyowTj8rVDxwakxxMWg2Ujx2 IyVDRjlGc3BoMiRQOTM2MD50TjxnVDs1Oz8rOyUtVlY2ewoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9iZVNldC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9iZVNldC5qcwppbmRleCBiYmQw YWFkNTY4NmYyMDUyMDFkMDViMWYxYTdkMDgwNGRkMjg3Y2MwLi5kZWQwOTE1ZDNjNDRiODI5NGYy M2E3NDZjYmZhYTBiZGE0MWEwOGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0LmpzCkBAIC0xNDEsNiArMTQxLDcgQEAg V2ViSW5zcGVjdG9yLlByb2JlU2V0ID0gY2xhc3MgUHJvYmVTZXQgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2JqZWN0CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5kYXRhVGFibGUpOwogICAg ICAgICB0aGlzLmRhdGFUYWJsZS5hZGRTYW1wbGVGb3JQcm9iZShwcm9iZSwgc2FtcGxlKTsKKyAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlByb2JlU2V0 LkV2ZW50LlNhbXBsZUFkZGVkLCB7cHJvYmUsIHNhbXBsZX0pOwogICAgIH0KIAogICAgIF9icmVh a3BvaW50UmVzb2x2ZWRTdGF0ZURpZENoYW5nZShldmVudCkKQEAgLTE1Myw1ICsxNTQsNiBAQCBX ZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQgPSB7CiAgICAgUHJvYmVBZGRlZDogInByb2JlLXNl dC1wcm9iZS1hZGRlZCIsCiAgICAgUHJvYmVSZW1vdmVkOiAicHJvYmUtc2V0LXByb2JlLXJlbW92 ZWQiLAogICAgIFJlc29sdmVkU3RhdGVEaWRDaGFuZ2U6ICJwcm9iZS1zZXQtcmVzb2x2ZWQtc3Rh dGUtZGlkLWNoYW5nZSIsCisgICAgU2FtcGxlQWRkZWQ6ICJwcm9iZS1zZXQtc2FtcGxlLWFkZGVk IiwKICAgICBTYW1wbGVzQ2xlYXJlZDogInByb2JlLXNldC1zYW1wbGVzLWNsZWFyZWQiLAogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1By b2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDg5OTQ5MDJm NWJiZGY3YjdiOWNiMmRjNWZkOWNiNmQ3M2IxZjFhOTQuLmUwOTFkMTc1MTM2YWNhNzY2NjZlNTVi ZWE4MzgyMjYwN2UxY2VjNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVEZXRhaWxzU2lkZWJhclBh bmVsLmNzcwpAQCAtMzcsMjYgKzM3LDIwIEBACiAgICAgZGlzcGxheTogYmxvY2s7CiB9CiAKLS5k ZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gOm1hdGNoZXMoLnByb2JlLXJlbW92 ZSwgLnByb2JlLWNsZWFyLXNhbXBsZXMsIC5wcm9iZS1hZGQpIHsKLSAgICBmbG9hdDogcmlnaHQ7 Ci0gICAgaGVpZ2h0OiAxMXB4OwotICAgIG1hcmdpbi10b3A6IDFweDsKLSAgICBtYXJnaW4tbGVm dDogNXB4OwotfQotCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAub3B0aW9ucyA+IC5wcm9i ZS1jbGVhci1zYW1wbGVzIHsKLSAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL05hdmlnYXRpb25J dGVtVHJhc2guc3ZnKTsKLSAgICBoZWlnaHQ6IDE0cHg7Ci0gICAgbWFyZ2luLXRvcDogLTFweDsK Ky5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0ID4gLmhlYWRlciB7CisgICAgcGFkZGluZy1yaWdo dDogMDsKIH0KIAotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUt cmVtb3ZlIHsKLSAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnKTsKKy5k ZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gLm5hdmlnYXRpb24tYmFyIHsKKyAg ICBtYXJnaW4tdG9wOiAxcHg7CisgICAgaGVpZ2h0OiAxMDAlOworICAgIGZsb2F0OiByaWdodDsK KyAgICBib3JkZXI6IG5vbmU7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRp b25zID4gLnByb2JlLWFkZCB7Ci0gICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9QbHVzMTMuc3Zn KTsKLSAgICBoZWlnaHQ6IDEzcHg7CisuZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAub3B0aW9u cyA+IC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtIHsKKyAgICB3aWR0aDogMjBweDsKKyAgICBoZWln aHQ6IDEwMCU7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gaW5w dXQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMKaW5kZXggNjkwM2QzNjU1 ZDBlZjJiMzFlNjc1MjQzNDE3NjYyMmMwMmQ3NjQ0MS4uZDFkYjUyYjU0ODkyZDc2ODU5ZDYwYTBl YTVkZmZhM2I3MDAzNjdiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpz CkBAIC01MCwxOSArNTAsMjQgQEAgV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24g PSBjbGFzcyBQcm9iZVNldERldGFpbHNTZWN0aW9uIGV4dGVuZHMgV2ViSW4KICAgICAgICAgdGhp cy5fcHJvYmVTZXQgPSBwcm9iZVNldDsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBkYXRhR3Jp ZDsKIAotICAgICAgICB2YXIgcmVtb3ZlUHJvYmVCdXR0b24gPSBvcHRpb25zRWxlbWVudC5jcmVh dGVDaGlsZCgiaW1nIik7Ci0gICAgICAgIHJlbW92ZVByb2JlQnV0dG9uLmNsYXNzTGlzdC5hZGQo V2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVSZW1vdmVTdHlsZUNsYXNz TmFtZSk7Ci0gICAgICAgIHJlbW92ZVByb2JlQnV0dG9uLmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVj dG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVCdXR0b25FbmFibGVkU3R5bGVDbGFzc05h bWUpOwotICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIocmVtb3ZlUHJvYmVCdXR0b24s ICJjbGljayIsIHRoaXMuX3JlbW92ZUJ1dHRvbkNsaWNrZWQpOworICAgICAgICB0aGlzLl9uYXZp Z2F0aW9uQmFyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyOworICAgICAgICB0aGlz Ll9vcHRpb25zRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0aW9uQmFyLmVsZW1lbnQp OwogCi0gICAgICAgIHZhciBjbGVhclNhbXBsZXNCdXR0b24gPSBvcHRpb25zRWxlbWVudC5jcmVh dGVDaGlsZCgiaW1nIik7Ci0gICAgICAgIGNsZWFyU2FtcGxlc0J1dHRvbi5jbGFzc0xpc3QuYWRk KFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlByb2JlQ2xlYXJTYW1wbGVzU3R5 bGVDbGFzc05hbWUpOwotICAgICAgICBjbGVhclNhbXBsZXNCdXR0b24uY2xhc3NMaXN0LmFkZChX ZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHls ZUNsYXNzTmFtZSk7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihjbGVhclNhbXBs ZXNCdXR0b24sICJjbGljayIsIHRoaXMuX2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQpOworICAg ICAgICB0aGlzLl9hZGRQcm9iZUJ1dHRvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5h dmlnYXRpb25JdGVtKCJhZGQtcHJvYmUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBwcm9i ZSBleHByZXNzaW9uIiksICJJbWFnZXMvUGx1czEzLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgIHRo aXMuX2FkZFByb2JlQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9hZGRQcm9iZUJ1dHRvbkNsaWNr ZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVt KHRoaXMuX2FkZFByb2JlQnV0dG9uSXRlbSk7CiAKLSAgICAgICAgdmFyIGFkZFByb2JlQnV0dG9u ID0gb3B0aW9uc0VsZW1lbnQuY3JlYXRlQ2hpbGQoImltZyIpOwotICAgICAgICBhZGRQcm9iZUJ1 dHRvbi5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLkFk ZFByb2JlVmFsdWVTdHlsZUNsYXNzTmFtZSk7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdp c3RlcihhZGRQcm9iZUJ1dHRvbiwgImNsaWNrIiwgdGhpcy5fYWRkUHJvYmVCdXR0b25DbGlja2Vk KTsKKyAgICAgICAgdGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFyLXNhbXBsZXMiLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNsZWFyIHNhbXBsZXMiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIs IDE0LCAxNCk7CisgICAgICAgIHRoaXMuX2NsZWFyU2FtcGxlc0J1dHRvbkl0ZW0uYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwg dGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX2Ns ZWFyU2FtcGxlc0J1dHRvbkl0ZW0uZW5hYmxlZCA9IHRoaXMuX3Byb2JlU2V0SGFzU2FtcGxlcygp OworICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2Ns ZWFyU2FtcGxlc0J1dHRvbkl0ZW0pOworCisgICAgICAgIHRoaXMuX3JlbW92ZVByb2JlQnV0dG9u SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInJlbW92ZS1wcm9i ZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVtb3ZlIHByb2JlIiksICJJbWFnZXMvQ2xvc2VM YXJnZS5zdmciLCAxMiwgMTIpOworICAgICAgICB0aGlzLl9yZW1vdmVQcm9iZUJ1dHRvbkl0ZW0u YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQu Q2xpY2tlZCwgdGhpcy5fcmVtb3ZlUHJvYmVCdXR0b25DbGlja2VkLCB0aGlzKTsKKyAgICAgICAg dGhpcy5fbmF2aWdhdGlvbkJhci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9yZW1vdmVQcm9iZUJ1 dHRvbkl0ZW0pOworCisgICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3Rlcih0aGlzLl9wcm9i ZVNldCwgV2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZUFkZGVkLCB0aGlzLl9wcm9i ZVNldFNhbXBsZXNDaGFuZ2VkKTsKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKHRo aXMuX3Byb2JlU2V0LCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQuU2FtcGxlc0NsZWFyZWQs IHRoaXMuX3Byb2JlU2V0U2FtcGxlc0NoYW5nZWQpOwogCiAgICAgICAgIC8vIFVwZGF0ZSB0aGUg c291cmNlIGxpbmsgd2hlbiB0aGUgYnJlYWtwb2ludCdzIHJlc29sdmVkIHN0YXRlIGNoYW5nZXMs CiAgICAgICAgIC8vIHNvIHRoYXQgaXQgY2FuIGJlY29tZSBhIGxpdmUgbG9jYXRpb24gbGluayB3 aGVuIHBvc3NpYmxlLgpAQCAtMTExLDQxICsxMTYsNDcgQEAgV2ViSW5zcGVjdG9yLlByb2JlU2V0 RGV0YWlsc1NlY3Rpb24gPSBjbGFzcyBQcm9iZVNldERldGFpbHNTZWN0aW9uIGV4dGVuZHMgV2Vi SW4KICAgICAgICAgewogICAgICAgICAgICAgaWYgKGV2ZW50LmtleUNvZGUgIT09IDEzKQogICAg ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHZhciBleHByZXNzaW9uID0gZXZlbnQu dGFyZ2V0LnZhbHVlOworICAgICAgICAgICAgbGV0IGV4cHJlc3Npb24gPSBldmVudC50YXJnZXQu dmFsdWU7CiAgICAgICAgICAgICB0aGlzLl9wcm9iZVNldC5jcmVhdGVQcm9iZShleHByZXNzaW9u KTsKICAgICAgICAgICAgIHZpc2libGVQb3BvdmVyLmRpc21pc3MoKTsKICAgICAgICAgfQogCi0g ICAgICAgIHZhciBwb3BvdmVyID0gbmV3IFdlYkluc3BlY3Rvci5Qb3BvdmVyOwotICAgICAgICB2 YXIgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICBsZXQg cG9wb3ZlciA9IG5ldyBXZWJJbnNwZWN0b3IuUG9wb3ZlcjsKKyAgICAgICAgbGV0IGNvbnRlbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgY29udGVudC5jbGFzc0xp c3QuYWRkKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlByb2JlUG9wb3ZlckVs ZW1lbnRTdHlsZUNsYXNzTmFtZSk7CiAgICAgICAgIGNvbnRlbnQuY3JlYXRlQ2hpbGQoImRpdiIp LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgTmV3IFByb2JlIEV4cHJl c3Npb24iKTsKLSAgICAgICAgdmFyIHRleHRCb3ggPSBjb250ZW50LmNyZWF0ZUNoaWxkKCJpbnB1 dCIpOworICAgICAgICBsZXQgdGV4dEJveCA9IGNvbnRlbnQuY3JlYXRlQ2hpbGQoImlucHV0Iik7 CiAgICAgICAgIHRleHRCb3guYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCBjcmVhdGVQcm9i ZUZyb21FbnRlcmVkRXhwcmVzc2lvbi5iaW5kKHRoaXMsIHBvcG92ZXIpKTsKICAgICAgICAgdGV4 dEJveC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uIChldmVudCkgeyBldmVudC50 YXJnZXQuc2VsZWN0KCk7IH0pOwogICAgICAgICB0ZXh0Qm94LnR5cGUgPSAidGV4dCI7CiAgICAg ICAgIHRleHRCb3gucGxhY2Vob2xkZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4cHJlc3Np b24iKTsKICAgICAgICAgcG9wb3Zlci5jb250ZW50ID0gY29udGVudDsKLSAgICAgICAgdmFyIHRh cmdldCA9IFdlYkluc3BlY3Rvci5SZWN0LnJlY3RGcm9tQ2xpZW50UmVjdChldmVudC50YXJnZXQu Z2V0Qm91bmRpbmdDbGllbnRSZWN0KCkpOworICAgICAgICBsZXQgdGFyZ2V0ID0gV2ViSW5zcGVj dG9yLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KGV2ZW50LnRhcmdldC5lbGVtZW50LmdldEJvdW5k aW5nQ2xpZW50UmVjdCgpKTsKICAgICAgICAgcG9wb3Zlci5wcmVzZW50KHRhcmdldCwgW1dlYklu c3BlY3Rvci5SZWN0RWRnZS5NQVhfWSwgV2ViSW5zcGVjdG9yLlJlY3RFZGdlLk1JTl9ZLCBXZWJJ bnNwZWN0b3IuUmVjdEVkZ2UuTUFYX1hdKTsKICAgICAgICAgdGV4dEJveC5zZWxlY3QoKTsKICAg ICB9CiAKLSAgICBfcmVtb3ZlQnV0dG9uQ2xpY2tlZChldmVudCkKKyAgICBfY2xlYXJTYW1wbGVz QnV0dG9uQ2xpY2tlZChldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Byb2JlU2V0LmNsZWFy U2FtcGxlcygpOworICAgIH0KKworICAgIF9yZW1vdmVQcm9iZUJ1dHRvbkNsaWNrZWQoZXZlbnQp CiAgICAgewogICAgICAgICB0aGlzLl9wcm9iZVNldC5jbGVhcigpOwogICAgIH0KIAotICAgIF9j bGVhclNhbXBsZXNCdXR0b25DbGlja2VkKGV2ZW50KQorICAgIF9wcm9iZVNldFNhbXBsZXNDaGFu Z2VkKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fcHJvYmVTZXQuY2xlYXJTYW1wbGVzKCk7 CisgICAgICAgIHRoaXMuX2NsZWFyU2FtcGxlc0J1dHRvbkl0ZW0uZW5hYmxlZCA9IHRoaXMuX3By b2JlU2V0SGFzU2FtcGxlcygpOworICAgIH0KKworICAgIF9wcm9iZVNldEhhc1NhbXBsZXMoKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Byb2JlU2V0LnByb2Jlcy5zb21lKChwcm9iZSkg PT4gcHJvYmUuc2FtcGxlcy5sZW5ndGgpOwogICAgIH0KIH07CiAKLVdlYkluc3BlY3Rvci5Qcm9i ZVNldERldGFpbHNTZWN0aW9uLkFkZFByb2JlVmFsdWVTdHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1h ZGQiOwogV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uRG9udEZsb2F0TGlua1N0 eWxlQ2xhc3NOYW1lID0gImRvbnQtZmxvYXQiOwotV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWls c1NlY3Rpb24uUHJvYmVCdXR0b25FbmFibGVkU3R5bGVDbGFzc05hbWUgPSAiZW5hYmxlZCI7CiBX ZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZVBvcG92ZXJFbGVtZW50U3R5 bGVDbGFzc05hbWUgPSAicHJvYmUtcG9wb3ZlciI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRh aWxzU2VjdGlvbi5Qcm9iZUNsZWFyU2FtcGxlc1N0eWxlQ2xhc3NOYW1lID0gInByb2JlLWNsZWFy LXNhbXBsZXMiOwotV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVSZW1v dmVTdHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1yZW1vdmUiOwogV2ViSW5zcGVjdG9yLlByb2JlU2V0 RGV0YWlsc1NlY3Rpb24uU2VjdGlvbk9wdGlvbnNTdHlsZUNsYXNzTmFtZSA9ICJvcHRpb25zIjsK 265727 2015-11-17 19:16:29 -0800 2015-11-18 14:50:46 -0800 [Patch] Proposed Fix bug-151373-20151117191618.patch text/plain 13457 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi ODY3MjY0MjBlMDRjYWJmNjFmMDQ5NjUwMTVkZTJlZTQyM2JkMzQwLi5hODhhMTcwMzcwM2MwY2Q5 ZTliOWY5YTVlN2FmNzhkNjRkMDRkMjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NiBAQAorMjAxNS0xMS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvYmVzIHNpZGViYXIgcGFuZWwgc2VjdGlvbnMg c2hvdWxkIHVzZSBOYXZpZ2F0aW9uQmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTEzNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZXBsYWNlcyBpbWFnZSBlbGVtZW50cyB3aXRoIGEgTmF2aWdhdGlv bkJhciBpbnN0YW5jZS4gVGhlICJDbGVhciBzYW1wbGVzIgorICAgICAgICBidXR0b24gaXMgZGlz YWJsZWQgd2hlbiBubyBzYW1wbGVzIGV4aXN0IGluIHRoZSBwcm9iZSBzZXQuCisKKyAgICAgICAg KiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgIE5l dyBuYXZpZ2F0aW9uIGl0ZW0gbGFiZWxzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2Rl bHMvUHJvYmVTZXQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVTZXQucHJvdG90eXBl Ll9zYW1wbGVDb2xsZWN0ZWQpOgorICAgICAgICBEaXNwYXRjaCBuZXcgZXZlbnQgV2ViSW5zcGVj dG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZUFkZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4g LmhlYWRlciA+IC5vcHRpb25zID4gLm5hdmlnYXRpb24tYmFyKToKKyAgICAgICAgKC5kZXRhaWxz LXNlY3Rpb24gPiAuaGVhZGVyID4gLm9wdGlvbnMgPiAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbSk6 CisgICAgICAgIERlZmluZSBjb25zaXN0ZW50IHN0eWxlIGZvciBzaG93aW5nIGEgTmF2aWdhdGlv bkJhciBpbnNpZGUgdGhlIHNlY3Rpb24gaGVhZGVyLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxz U2VjdGlvbik6CisgICAgICAgIEFkZCAib3B0aW9ucyIgY2xhc3MgbmFtZSBpbiB0aGUgYmFzZSBj bGFzcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVEZXRhaWxzU2lkZWJh clBhbmVsLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25z ID4gOm1hdGNoZXMoLnByb2JlLXJlbW92ZSwgLnByb2JlLWNsZWFyLXNhbXBsZXMsIC5wcm9iZS1h ZGQpKTogRGVsZXRlZC4KKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRp b25zID4gLnByb2JlLWNsZWFyLXNhbXBsZXMpOiBEZWxldGVkLgorICAgICAgICAoLmRldGFpbHMt c2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtcmVtb3ZlKTogRGVsZXRlZC4KKyAg ICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gLnByb2JlLWFkZCk6 IERlbGV0ZWQuCisgICAgICAgIFJlbW92ZSA8aW1nPiBidXR0b24gc3R5bGVzLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJvdG90eXBlLl9hZGRQcm9iZUJ1dHRvbkNs aWNrZWQuY3JlYXRlUHJvYmVGcm9tRW50ZXJlZEV4cHJlc3Npb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJvdG90eXBlLl9hZGRQcm9iZUJ1dHRvbkNs aWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJv dG90eXBlLl9jbGVhclNhbXBsZXNCdXR0b25DbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLnByb3RvdHlwZS5fcHJvYmVTZXRTYW1wbGVzQ2hhbmdl ZCk6CisgICAgICAgIFVwZGF0ZSAiQ2xlYXIgc2FtcGxlcyIgZW5hYmxlZCBzdGF0ZS4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLnByb3RvdHlwZS5fcHJvYmVT ZXRIYXNTYW1wbGVzKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIHRoZSBw cm9iZSBzZXQgaXMgZW1wdHkuCisKIDIwMTUtMTEtMTcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNb3ZlIFRpbWVsaW5lIGNy ZWF0aW9uIGludG8gYSByZWNvcmRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmlu ZGV4IGI0YzQ1NWYzNjRjZTE2MzhjNjYyNWM5NzUyZjY4NzZmNjQwNWI3ZTIuLmMyNjMxMDY3M2Uy NDgxMjhhZWMyMGMyYzY3YzMzMDkxYzVkZDliZjggMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVs dGEgMTQ0CnpjbWRuPGgtSzFLbUpPTz4rekpjQDNgR3EyM2BxPkJsTXxkSkMrOW5IT0AxJUohSEYj RElRaEh+K2gkRU0yTn1eKwp6aEQ0eHAxJV9mRW9lUntPITtzMlFKZWtLKGtgcGQ2eHhtcUlAX1Rj eCR1b19GSGE4blJTJStqKyF2a15kUkdAYUsKUD41fnRiPnUhI0dffUN1KyROd3VyCgpkZWx0YSAz MgpxY21WKyowTj8rVDxwakxxMWg2Ujx2IyVDRjlGc3BoMiRQOTM2MD50TjxnVDs1Oz8rOyUtVlY2 ewoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9Qcm9iZVNldC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9Qcm9iZVNldC5qcwppbmRleCBiYmQwYWFkNTY4NmYyMDUyMDFkMDViMWYxYTdkMDgwNGRkMjg3 Y2MwLi5kZWQwOTE1ZDNjNDRiODI5NGYyM2E3NDZjYmZhYTBiZGE0MWEwOGViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0 LmpzCkBAIC0xNDEsNiArMTQxLDcgQEAgV2ViSW5zcGVjdG9yLlByb2JlU2V0ID0gY2xhc3MgUHJv YmVTZXQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgY29uc29sZS5hc3Nl cnQodGhpcy5kYXRhVGFibGUpOwogICAgICAgICB0aGlzLmRhdGFUYWJsZS5hZGRTYW1wbGVGb3JQ cm9iZShwcm9iZSwgc2FtcGxlKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZUFkZGVkLCB7cHJvYmUsIHNhbXBs ZX0pOwogICAgIH0KIAogICAgIF9icmVha3BvaW50UmVzb2x2ZWRTdGF0ZURpZENoYW5nZShldmVu dCkKQEAgLTE1Myw1ICsxNTQsNiBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQgPSB7CiAg ICAgUHJvYmVBZGRlZDogInByb2JlLXNldC1wcm9iZS1hZGRlZCIsCiAgICAgUHJvYmVSZW1vdmVk OiAicHJvYmUtc2V0LXByb2JlLXJlbW92ZWQiLAogICAgIFJlc29sdmVkU3RhdGVEaWRDaGFuZ2U6 ICJwcm9iZS1zZXQtcmVzb2x2ZWQtc3RhdGUtZGlkLWNoYW5nZSIsCisgICAgU2FtcGxlQWRkZWQ6 ICJwcm9iZS1zZXQtc2FtcGxlLWFkZGVkIiwKICAgICBTYW1wbGVzQ2xlYXJlZDogInByb2JlLXNl dC1zYW1wbGVzLWNsZWFyZWQiLAogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcwppbmRleCA2OGM3 MjAzY2E5ZmJjMjcxZjNkNDNiMWJkMjQ4M2MzODhmMjY3NmUyLi5mODcxM2VmYWEzZTA1ZjYzZjc5 MGJhZDIwOTM3ZWU4Yzc5NmQ2NGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCkBAIC02Myw2 ICs2MywxOCBAQAogICAgIHotaW5kZXg6IDIwMDsKIH0KIAorLmRldGFpbHMtc2VjdGlvbiA+IC5o ZWFkZXIgPiAub3B0aW9ucyA+IC5uYXZpZ2F0aW9uLWJhciB7CisgICAgbWFyZ2luLXRvcDogMXB4 OworICAgIGhlaWdodDogMTAwJTsKKyAgICBmbG9hdDogcmlnaHQ7CisgICAgYm9yZGVyOiBub25l OworfQorCisuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciA+IC5vcHRpb25zID4gLm5hdmlnYXRp b24tYmFyID4gLml0ZW0geworICAgIHdpZHRoOiAyMHB4OworICAgIGhlaWdodDogMTAwJTsKK30K KwogLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CiAgICAgdG9w OiAyMXB4OwogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgMTAwJSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2Vj dGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFp bHNTZWN0aW9uLmpzCmluZGV4IDE1NjRjOTU4ZmJkOTcxYmMxOGI4NWI0YmI4YWY4ZjY1M2I5YTY5 ODcuLjE4YjE1YmYzMWZiZDkzMTcyNWZiYmY1MjJiYWYxYmVlYjIwMzlmZGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9u LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFp bHNTZWN0aW9uLmpzCkBAIC00MSw2ICs0MSw3IEBAIFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlv biA9IGNsYXNzIERldGFpbHNTZWN0aW9uIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAg ICAgICAgIGlmIChvcHRpb25zRWxlbWVudCBpbnN0YW5jZW9mIEhUTUxFbGVtZW50KSB7CiAgICAg ICAgICAgICB0aGlzLl9vcHRpb25zRWxlbWVudCA9IG9wdGlvbnNFbGVtZW50OworICAgICAgICAg ICAgdGhpcy5fb3B0aW9uc0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgib3B0aW9ucyIpOwogICAgICAg ICAgICAgdGhpcy5fb3B0aW9uc0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwg dGhpcy5fb3B0aW9uc0VsZW1lbnRNb3VzZURvd24uYmluZCh0aGlzKSk7CiAgICAgICAgICAgICB0 aGlzLl9vcHRpb25zRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXVwIiwgdGhpcy5fb3B0 aW9uc0VsZW1lbnRNb3VzZVVwLmJpbmQodGhpcykpOwogICAgICAgICAgICAgdGhpcy5faGVhZGVy RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vcHRpb25zRWxlbWVudCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRl YmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UHJvYmVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwppbmRleCA4OTk0OTAyZjViYmRmN2I3YjljYjJk YzVmZDljYjZkNzNiMWYxYTk0Li45YTZlMmNjNTk5ZTczOGIwOTBlZjViMmVjMThjYzA4ODllOTM5 MzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAgLTM3 LDI4ICszNyw2IEBACiAgICAgZGlzcGxheTogYmxvY2s7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24u cHJvYmUtc2V0IC5vcHRpb25zID4gOm1hdGNoZXMoLnByb2JlLXJlbW92ZSwgLnByb2JlLWNsZWFy LXNhbXBsZXMsIC5wcm9iZS1hZGQpIHsKLSAgICBmbG9hdDogcmlnaHQ7Ci0gICAgaGVpZ2h0OiAx MXB4OwotICAgIG1hcmdpbi10b3A6IDFweDsKLSAgICBtYXJnaW4tbGVmdDogNXB4OwotfQotCi0u ZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAub3B0aW9ucyA+IC5wcm9iZS1jbGVhci1zYW1wbGVz IHsKLSAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnKTsK LSAgICBoZWlnaHQ6IDE0cHg7Ci0gICAgbWFyZ2luLXRvcDogLTFweDsKLX0KLQotLmRldGFpbHMt c2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtcmVtb3ZlIHsKLSAgICBjb250ZW50 OiB1cmwoLi4vSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnKTsKLX0KLQotLmRldGFpbHMtc2VjdGlvbi5w cm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtYWRkIHsKLSAgICBjb250ZW50OiB1cmwoLi4vSW1h Z2VzL1BsdXMxMy5zdmcpOwotICAgIGhlaWdodDogMTNweDsKLX0KLQogLmRldGFpbHMtc2VjdGlv bi5wcm9iZS1zZXQgLm9wdGlvbnMgPiBpbnB1dCB7CiAgICAgaGVpZ2h0OiAxMnB4OwogICAgIHdp ZHRoOiA0MHB4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMKaW5kZXggNjkw M2QzNjU1ZDBlZjJiMzFlNjc1MjQzNDE3NjYyMmMwMmQ3NjQ0MS4uMzBhY2M5NWI5OWVlMzg4MWY5 NzA5OGMwNWIyYzdkYTkyN2UzNWZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0 aW9uLmpzCkBAIC0zMSw4ICszMSw2IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0 aW9uID0gY2xhc3MgUHJvYmVTZXREZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdlYkluCiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHByb2JlU2V0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlByb2JlU2V0 LCAiSW52YWxpZCBQcm9iZVNldCBhcmd1bWVudDoiLCBwcm9iZVNldCk7CiAKICAgICAgICAgdmFy IG9wdGlvbnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAg IG9wdGlvbnNFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWls c1NlY3Rpb24uU2VjdGlvbk9wdGlvbnNTdHlsZUNsYXNzTmFtZSk7Ci0KICAgICAgICAgdmFyIGRh dGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkKHByb2JlU2V0KTsKIAog ICAgICAgICB2YXIgc2luZ2xldG9uUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlv blJvdzsKQEAgLTUwLDE5ICs0OCwyNCBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2Vj dGlvbiA9IGNsYXNzIFByb2JlU2V0RGV0YWlsc1NlY3Rpb24gZXh0ZW5kcyBXZWJJbgogICAgICAg ICB0aGlzLl9wcm9iZVNldCA9IHByb2JlU2V0OwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRh dGFHcmlkOwogCi0gICAgICAgIHZhciByZW1vdmVQcm9iZUJ1dHRvbiA9IG9wdGlvbnNFbGVtZW50 LmNyZWF0ZUNoaWxkKCJpbWciKTsKLSAgICAgICAgcmVtb3ZlUHJvYmVCdXR0b24uY2xhc3NMaXN0 LmFkZChXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZVJlbW92ZVN0eWxl Q2xhc3NOYW1lKTsKLSAgICAgICAgcmVtb3ZlUHJvYmVCdXR0b24uY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNs YXNzTmFtZSk7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihyZW1vdmVQcm9iZUJ1 dHRvbiwgImNsaWNrIiwgdGhpcy5fcmVtb3ZlQnV0dG9uQ2xpY2tlZCk7CisgICAgICAgIHRoaXMu X25hdmlnYXRpb25CYXIgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXI7CisgICAgICAg IHRoaXMuX29wdGlvbnNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX25hdmlnYXRpb25CYXIuZWxl bWVudCk7CisKKyAgICAgICAgdGhpcy5fYWRkUHJvYmVCdXR0b25JdGVtID0gbmV3IFdlYkluc3Bl Y3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiYWRkLXByb2JlIiwgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJBZGQgcHJvYmUgZXhwcmVzc2lvbiIpLCAiSW1hZ2VzL1BsdXMxMy5zdmciLCAxMywgMTMp OworICAgICAgICB0aGlzLl9hZGRQcm9iZUJ1dHRvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fYWRkUHJv YmVCdXR0b25DbGlja2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGRO YXZpZ2F0aW9uSXRlbSh0aGlzLl9hZGRQcm9iZUJ1dHRvbkl0ZW0pOwogCi0gICAgICAgIHZhciBj bGVhclNhbXBsZXNCdXR0b24gPSBvcHRpb25zRWxlbWVudC5jcmVhdGVDaGlsZCgiaW1nIik7Ci0g ICAgICAgIGNsZWFyU2FtcGxlc0J1dHRvbi5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qcm9i ZVNldERldGFpbHNTZWN0aW9uLlByb2JlQ2xlYXJTYW1wbGVzU3R5bGVDbGFzc05hbWUpOwotICAg ICAgICBjbGVhclNhbXBsZXNCdXR0b24uY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUHJvYmVT ZXREZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNsYXNzTmFtZSk7Ci0gICAg ICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihjbGVhclNhbXBsZXNCdXR0b24sICJjbGljayIs IHRoaXMuX2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQpOworICAgICAgICB0aGlzLl9jbGVhclNh bXBsZXNCdXR0b25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgi Y2xlYXItc2FtcGxlcyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgc2FtcGxlcyIpLCAi SW1hZ2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnIiwgMTQsIDE0KTsKKyAgICAgICAgdGhpcy5f Y2xlYXJTYW1wbGVzQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9jbGVhclNhbXBsZXNCdXR0b25D bGlja2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbS5lbmFi bGVkID0gdGhpcy5fcHJvYmVTZXRIYXNTYW1wbGVzKCk7CisgICAgICAgIHRoaXMuX25hdmlnYXRp b25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbSk7CiAK LSAgICAgICAgdmFyIGFkZFByb2JlQnV0dG9uID0gb3B0aW9uc0VsZW1lbnQuY3JlYXRlQ2hpbGQo ImltZyIpOwotICAgICAgICBhZGRQcm9iZUJ1dHRvbi5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLkFkZFByb2JlVmFsdWVTdHlsZUNsYXNzTmFtZSk7Ci0g ICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihhZGRQcm9iZUJ1dHRvbiwgImNsaWNrIiwg dGhpcy5fYWRkUHJvYmVCdXR0b25DbGlja2VkKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlUHJvYmVC dXR0b25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVtb3Zl LXByb2JlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUgcHJvYmUiKSwgIkltYWdlcy9D bG9zZUxhcmdlLnN2ZyIsIDEyLCAxMik7CisgICAgICAgIHRoaXMuX3JlbW92ZVByb2JlQnV0dG9u SXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5F dmVudC5DbGlja2VkLCB0aGlzLl9yZW1vdmVQcm9iZUJ1dHRvbkNsaWNrZWQsIHRoaXMpOworICAg ICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX3JlbW92ZVBy b2JlQnV0dG9uSXRlbSk7CisKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKHRoaXMu X3Byb2JlU2V0LCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQuU2FtcGxlQWRkZWQsIHRoaXMu X3Byb2JlU2V0U2FtcGxlc0NoYW5nZWQpOworICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0 ZXIodGhpcy5fcHJvYmVTZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5TYW1wbGVzQ2xl YXJlZCwgdGhpcy5fcHJvYmVTZXRTYW1wbGVzQ2hhbmdlZCk7CiAKICAgICAgICAgLy8gVXBkYXRl IHRoZSBzb3VyY2UgbGluayB3aGVuIHRoZSBicmVha3BvaW50J3MgcmVzb2x2ZWQgc3RhdGUgY2hh bmdlcywKICAgICAgICAgLy8gc28gdGhhdCBpdCBjYW4gYmVjb21lIGEgbGl2ZSBsb2NhdGlvbiBs aW5rIHdoZW4gcG9zc2libGUuCkBAIC0xMTEsNDEgKzExNCw0NiBAQCBXZWJJbnNwZWN0b3IuUHJv YmVTZXREZXRhaWxzU2VjdGlvbiA9IGNsYXNzIFByb2JlU2V0RGV0YWlsc1NlY3Rpb24gZXh0ZW5k cyBXZWJJbgogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSAhPT0gMTMp CiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdmFyIGV4cHJlc3Npb24gPSBl dmVudC50YXJnZXQudmFsdWU7CisgICAgICAgICAgICBsZXQgZXhwcmVzc2lvbiA9IGV2ZW50LnRh cmdldC52YWx1ZTsKICAgICAgICAgICAgIHRoaXMuX3Byb2JlU2V0LmNyZWF0ZVByb2JlKGV4cHJl c3Npb24pOwogICAgICAgICAgICAgdmlzaWJsZVBvcG92ZXIuZGlzbWlzcygpOwogICAgICAgICB9 CiAKLSAgICAgICAgdmFyIHBvcG92ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlBvcG92ZXI7Ci0gICAg ICAgIHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAg IGxldCBwb3BvdmVyID0gbmV3IFdlYkluc3BlY3Rvci5Qb3BvdmVyOworICAgICAgICBsZXQgY29u dGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICBjb250ZW50LmNs YXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVQb3Bv dmVyRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgY29udGVudC5jcmVhdGVDaGlsZCgi ZGl2IikudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBOZXcgUHJvYmUg RXhwcmVzc2lvbiIpOwotICAgICAgICB2YXIgdGV4dEJveCA9IGNvbnRlbnQuY3JlYXRlQ2hpbGQo ImlucHV0Iik7CisgICAgICAgIGxldCB0ZXh0Qm94ID0gY29udGVudC5jcmVhdGVDaGlsZCgiaW5w dXQiKTsKICAgICAgICAgdGV4dEJveC5hZGRFdmVudExpc3RlbmVyKCJrZXlwcmVzcyIsIGNyZWF0 ZVByb2JlRnJvbUVudGVyZWRFeHByZXNzaW9uLmJpbmQodGhpcywgcG9wb3ZlcikpOwogICAgICAg ICB0ZXh0Qm94LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgZnVuY3Rpb24gKGV2ZW50KSB7IGV2 ZW50LnRhcmdldC5zZWxlY3QoKTsgfSk7CiAgICAgICAgIHRleHRCb3gudHlwZSA9ICJ0ZXh0IjsK ICAgICAgICAgdGV4dEJveC5wbGFjZWhvbGRlciA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhw cmVzc2lvbiIpOwogICAgICAgICBwb3BvdmVyLmNvbnRlbnQgPSBjb250ZW50OwotICAgICAgICB2 YXIgdGFyZ2V0ID0gV2ViSW5zcGVjdG9yLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KGV2ZW50LnRh cmdldC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKSk7CisgICAgICAgIGxldCB0YXJnZXQgPSBXZWJJ bnNwZWN0b3IuUmVjdC5yZWN0RnJvbUNsaWVudFJlY3QoZXZlbnQudGFyZ2V0LmVsZW1lbnQuZ2V0 Qm91bmRpbmdDbGllbnRSZWN0KCkpOwogICAgICAgICBwb3BvdmVyLnByZXNlbnQodGFyZ2V0LCBb V2ViSW5zcGVjdG9yLlJlY3RFZGdlLk1BWF9ZLCBXZWJJbnNwZWN0b3IuUmVjdEVkZ2UuTUlOX1ks IFdlYkluc3BlY3Rvci5SZWN0RWRnZS5NQVhfWF0pOwogICAgICAgICB0ZXh0Qm94LnNlbGVjdCgp OwogICAgIH0KIAotICAgIF9yZW1vdmVCdXR0b25DbGlja2VkKGV2ZW50KQorICAgIF9jbGVhclNh bXBsZXNCdXR0b25DbGlja2VkKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJvYmVTZXQu Y2xlYXJTYW1wbGVzKCk7CisgICAgfQorCisgICAgX3JlbW92ZVByb2JlQnV0dG9uQ2xpY2tlZChl dmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Byb2JlU2V0LmNsZWFyKCk7CiAgICAgfQogCi0g ICAgX2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQoZXZlbnQpCisgICAgX3Byb2JlU2V0U2FtcGxl c0NoYW5nZWQoZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9wcm9iZVNldC5jbGVhclNhbXBs ZXMoKTsKKyAgICAgICAgdGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbS5lbmFibGVkID0gdGhp cy5fcHJvYmVTZXRIYXNTYW1wbGVzKCk7CisgICAgfQorCisgICAgX3Byb2JlU2V0SGFzU2FtcGxl cygpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcHJvYmVTZXQucHJvYmVzLnNvbWUoKHBy b2JlKSA9PiBwcm9iZS5zYW1wbGVzLmxlbmd0aCk7CiAgICAgfQogfTsKIAotV2ViSW5zcGVjdG9y LlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uQWRkUHJvYmVWYWx1ZVN0eWxlQ2xhc3NOYW1lID0gInBy b2JlLWFkZCI7CiBXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Eb250RmxvYXRM aW5rU3R5bGVDbGFzc05hbWUgPSAiZG9udC1mbG9hdCI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXRE ZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNsYXNzTmFtZSA9ICJlbmFibGVk IjsKIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlByb2JlUG9wb3ZlckVsZW1l bnRTdHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1wb3BvdmVyIjsKLVdlYkluc3BlY3Rvci5Qcm9iZVNl dERldGFpbHNTZWN0aW9uLlByb2JlQ2xlYXJTYW1wbGVzU3R5bGVDbGFzc05hbWUgPSAicHJvYmUt Y2xlYXItc2FtcGxlcyI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9i ZVJlbW92ZVN0eWxlQ2xhc3NOYW1lID0gInByb2JlLXJlbW92ZSI7Ci1XZWJJbnNwZWN0b3IuUHJv YmVTZXREZXRhaWxzU2VjdGlvbi5TZWN0aW9uT3B0aW9uc1N0eWxlQ2xhc3NOYW1lID0gIm9wdGlv bnMiOwo= 265783 2015-11-18 14:50:49 -0800 2015-11-18 15:47:57 -0800 [Patch] Proposed Fix bug-151373-20151118145038.patch text/plain 13511 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj NWE2YTU0NWY5OTkwYmY5ZDAwNGM5YWViY2NiM2IzZDg1MTg0OWE3Li5jMGUxYTRjM2UwYWZkOGZh ZGVhNWYxNmRhMzkyOTVmYmM0OTZlZjEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0OCBAQAogMjAxNS0xMS0xOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvYmVzIHNpZGViYXIgcGFuZWwgc2VjdGlvbnMg c2hvdWxkIHVzZSBOYXZpZ2F0aW9uQmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTEzNzMKKworICAgICAgICBSZXZpZXdlZCBieSBCcmlhbiBCdXJn LgorCisgICAgICAgIFJlcGxhY2VzIGltYWdlIGVsZW1lbnRzIHdpdGggYSBOYXZpZ2F0aW9uQmFy IGluc3RhbmNlLiBUaGUgIkNsZWFyIHNhbXBsZXMiCisgICAgICAgIGJ1dHRvbiBpcyBkaXNhYmxl ZCB3aGVuIG5vIHNhbXBsZXMgZXhpc3QgaW4gdGhlIHByb2JlIHNldC4KKworICAgICAgICAqIExv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgTmV3IG5h dmlnYXRpb24gaXRlbSBsYWJlbHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Q cm9iZVNldC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9iZVNldC5wcm90b3R5cGUuX3Nh bXBsZUNvbGxlY3RlZCk6CisgICAgICAgIERpc3BhdGNoIG5ldyBldmVudCBXZWJJbnNwZWN0b3Iu UHJvYmVTZXQuRXZlbnQuU2FtcGxlQWRkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0RldGFpbHNTZWN0aW9uLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVh ZGVyID4gLm9wdGlvbnMgPiAubmF2aWdhdGlvbi1iYXIpOgorICAgICAgICAoLmRldGFpbHMtc2Vj dGlvbiA+IC5oZWFkZXIgPiAub3B0aW9ucyA+IC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtKToKKyAg ICAgICAgRGVmaW5lIGNvbnNpc3RlbnQgc3R5bGUgZm9yIHNob3dpbmcgYSBOYXZpZ2F0aW9uQmFy IGluc2lkZSB0aGUgc2VjdGlvbiBoZWFkZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0RldGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0 aW9uKToKKyAgICAgICAgQWRkICJvcHRpb25zIiBjbGFzcyBuYW1lIGluIHRoZSBiYXNlIGNsYXNz LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFu ZWwuY3NzOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiA6 bWF0Y2hlcygucHJvYmUtcmVtb3ZlLCAucHJvYmUtY2xlYXItc2FtcGxlcywgLnByb2JlLWFkZCkp OiBEZWxldGVkLgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMg PiAucHJvYmUtY2xlYXItc2FtcGxlcyk6IERlbGV0ZWQuCisgICAgICAgICguZGV0YWlscy1zZWN0 aW9uLnByb2JlLXNldCAub3B0aW9ucyA+IC5wcm9iZS1yZW1vdmUpOiBEZWxldGVkLgorICAgICAg ICAoLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtYWRkKTogRGVs ZXRlZC4KKyAgICAgICAgUmVtb3ZlIDxpbWc+IGJ1dHRvbiBzdHlsZXMuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5wcm90b3R5cGUuX2FkZFByb2JlQnV0dG9uQ2xpY2tl ZC5jcmVhdGVQcm9iZUZyb21FbnRlcmVkRXhwcmVzc2lvbik6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5wcm90b3R5cGUuX2FkZFByb2JlQnV0dG9uQ2xpY2tl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5wcm90b3R5 cGUuX2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBy b2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJvdG90eXBlLl9wcm9iZVNldFNhbXBsZXNDaGFuZ2VkKToK KyAgICAgICAgVXBkYXRlICJDbGVhciBzYW1wbGVzIiBlbmFibGVkIHN0YXRlLgorICAgICAgICAo V2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24ucHJvdG90eXBlLl9wcm9iZVNldEhh c1NhbXBsZXMpOgorICAgICAgICBIZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sgaWYgdGhlIHByb2Jl IHNldCBpcyBlbXB0eS4KKworMjAxNS0xMS0xOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBs ZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogV2F0Y2ggRXhwcmVzc2lvbnMgZGV0YWls cyBzZWN0aW9uIHNob3VsZCB1c2UgTmF2aWdhdGlvbkJhcgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzc3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCmluZGV4IGQ0ODBiNDM1NDcwYTdhYWY3ZTRhZjljMTY2OTBhN2M4OTZiNTNmOGIu LjYwYzdmZTliYjE5ZDljYTgyM2YxMWRmNjllY2YyMWZmM2I1YjhjN2UgMTAwNjQ0CkdJVCBiaW5h cnkgcGF0Y2gKZGVsdGEgMTQwCnpjbWJSOWh+PzgwbUpMZnFJU1V3eTgxZm1DNypaeihJNz8yQmNq QjVYRTZSWik+TnhxbDVYYT0zcURuQj8le044QQp6TnBseDdCckBiTzZmb29md1oxY3k9N2pTbkNw YTJUd20wQ35lQlE4UEooNVdZNTUmMXM4NURxOHomMWA2RngxXl8KSWBTN3RuMDRLc0x1SylsNQoK ZGVsdGEgMjQKZ2NtZXpMZ2t7Ym5tSkxmcUgqMVMmJCF5K2xSSXpeWisoJWRhMGhMPH1BXi1wWQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Q cm9iZVNldC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Q cm9iZVNldC5qcwppbmRleCBiYmQwYWFkNTY4NmYyMDUyMDFkMDViMWYxYTdkMDgwNGRkMjg3Y2Mw Li5kZWQwOTE1ZDNjNDRiODI5NGYyM2E3NDZjYmZhYTBiZGE0MWEwOGViIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2JlU2V0Lmpz CkBAIC0xNDEsNiArMTQxLDcgQEAgV2ViSW5zcGVjdG9yLlByb2JlU2V0ID0gY2xhc3MgUHJvYmVT ZXQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQo dGhpcy5kYXRhVGFibGUpOwogICAgICAgICB0aGlzLmRhdGFUYWJsZS5hZGRTYW1wbGVGb3JQcm9i ZShwcm9iZSwgc2FtcGxlKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZUFkZGVkLCB7cHJvYmUsIHNhbXBsZX0p OwogICAgIH0KIAogICAgIF9icmVha3BvaW50UmVzb2x2ZWRTdGF0ZURpZENoYW5nZShldmVudCkK QEAgLTE1Myw1ICsxNTQsNiBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQgPSB7CiAgICAg UHJvYmVBZGRlZDogInByb2JlLXNldC1wcm9iZS1hZGRlZCIsCiAgICAgUHJvYmVSZW1vdmVkOiAi cHJvYmUtc2V0LXByb2JlLXJlbW92ZWQiLAogICAgIFJlc29sdmVkU3RhdGVEaWRDaGFuZ2U6ICJw cm9iZS1zZXQtcmVzb2x2ZWQtc3RhdGUtZGlkLWNoYW5nZSIsCisgICAgU2FtcGxlQWRkZWQ6ICJw cm9iZS1zZXQtc2FtcGxlLWFkZGVkIiwKICAgICBTYW1wbGVzQ2xlYXJlZDogInByb2JlLXNldC1z YW1wbGVzLWNsZWFyZWQiLAogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcwppbmRleCA2OGM3MjAz Y2E5ZmJjMjcxZjNkNDNiMWJkMjQ4M2MzODhmMjY3NmUyLi5mODcxM2VmYWEzZTA1ZjYzZjc5MGJh ZDIwOTM3ZWU4Yzc5NmQ2NGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCkBAIC02Myw2ICs2 MywxOCBAQAogICAgIHotaW5kZXg6IDIwMDsKIH0KIAorLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFk ZXIgPiAub3B0aW9ucyA+IC5uYXZpZ2F0aW9uLWJhciB7CisgICAgbWFyZ2luLXRvcDogMXB4Owor ICAgIGhlaWdodDogMTAwJTsKKyAgICBmbG9hdDogcmlnaHQ7CisgICAgYm9yZGVyOiBub25lOwor fQorCisuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciA+IC5vcHRpb25zID4gLm5hdmlnYXRpb24t YmFyID4gLml0ZW0geworICAgIHdpZHRoOiAyMHB4OworICAgIGhlaWdodDogMTAwJTsKK30KKwog LmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CiAgICAgdG9wOiAy MXB4OwogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgMTAwJSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlv bi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNT ZWN0aW9uLmpzCmluZGV4IDE1NjRjOTU4ZmJkOTcxYmMxOGI4NWI0YmI4YWY4ZjY1M2I5YTY5ODcu LjE4YjE1YmYzMWZiZDkzMTcyNWZiYmY1MjJiYWYxYmVlYjIwMzlmZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNT ZWN0aW9uLmpzCkBAIC00MSw2ICs0MSw3IEBAIFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbiA9 IGNsYXNzIERldGFpbHNTZWN0aW9uIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAg ICAgIGlmIChvcHRpb25zRWxlbWVudCBpbnN0YW5jZW9mIEhUTUxFbGVtZW50KSB7CiAgICAgICAg ICAgICB0aGlzLl9vcHRpb25zRWxlbWVudCA9IG9wdGlvbnNFbGVtZW50OworICAgICAgICAgICAg dGhpcy5fb3B0aW9uc0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgib3B0aW9ucyIpOwogICAgICAgICAg ICAgdGhpcy5fb3B0aW9uc0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5fb3B0aW9uc0VsZW1lbnRNb3VzZURvd24uYmluZCh0aGlzKSk7CiAgICAgICAgICAgICB0aGlz Ll9vcHRpb25zRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXVwIiwgdGhpcy5fb3B0aW9u c0VsZW1lbnRNb3VzZVVwLmJpbmQodGhpcykpOwogICAgICAgICAgICAgdGhpcy5faGVhZGVyRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vcHRpb25zRWxlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRlYmFy UGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJv YmVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwppbmRleCA4OTk0OTAyZjViYmRmN2I3YjljYjJkYzVm ZDljYjZkNzNiMWYxYTk0Li45YTZlMmNjNTk5ZTczOGIwOTBlZjViMmVjMThjYzA4ODllOTM5MzQ2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Q cm9iZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAgLTM3LDI4 ICszNyw2IEBACiAgICAgZGlzcGxheTogYmxvY2s7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24ucHJv YmUtc2V0IC5vcHRpb25zID4gOm1hdGNoZXMoLnByb2JlLXJlbW92ZSwgLnByb2JlLWNsZWFyLXNh bXBsZXMsIC5wcm9iZS1hZGQpIHsKLSAgICBmbG9hdDogcmlnaHQ7Ci0gICAgaGVpZ2h0OiAxMXB4 OwotICAgIG1hcmdpbi10b3A6IDFweDsKLSAgICBtYXJnaW4tbGVmdDogNXB4OwotfQotCi0uZGV0 YWlscy1zZWN0aW9uLnByb2JlLXNldCAub3B0aW9ucyA+IC5wcm9iZS1jbGVhci1zYW1wbGVzIHsK LSAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnKTsKLSAg ICBoZWlnaHQ6IDE0cHg7Ci0gICAgbWFyZ2luLXRvcDogLTFweDsKLX0KLQotLmRldGFpbHMtc2Vj dGlvbi5wcm9iZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtcmVtb3ZlIHsKLSAgICBjb250ZW50OiB1 cmwoLi4vSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnKTsKLX0KLQotLmRldGFpbHMtc2VjdGlvbi5wcm9i ZS1zZXQgLm9wdGlvbnMgPiAucHJvYmUtYWRkIHsKLSAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2Vz L1BsdXMxMy5zdmcpOwotICAgIGhlaWdodDogMTNweDsKLX0KLQogLmRldGFpbHMtc2VjdGlvbi5w cm9iZS1zZXQgLm9wdGlvbnMgPiBpbnB1dCB7CiAgICAgaGVpZ2h0OiAxMnB4OwogICAgIHdpZHRo OiA0MHB4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMKaW5kZXggNjkwM2Qz NjU1ZDBlZjJiMzFlNjc1MjQzNDE3NjYyMmMwMmQ3NjQ0MS4uMzBhY2M5NWI5OWVlMzg4MWY5NzA5 OGMwNWIyYzdkYTkyN2UzNWZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9u LmpzCkBAIC0zMSw4ICszMSw2IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9u ID0gY2xhc3MgUHJvYmVTZXREZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdlYkluCiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHByb2JlU2V0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlByb2JlU2V0LCAi SW52YWxpZCBQcm9iZVNldCBhcmd1bWVudDoiLCBwcm9iZVNldCk7CiAKICAgICAgICAgdmFyIG9w dGlvbnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIG9w dGlvbnNFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1Nl Y3Rpb24uU2VjdGlvbk9wdGlvbnNTdHlsZUNsYXNzTmFtZSk7Ci0KICAgICAgICAgdmFyIGRhdGFH cmlkID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkKHByb2JlU2V0KTsKIAogICAg ICAgICB2YXIgc2luZ2xldG9uUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJv dzsKQEAgLTUwLDE5ICs0OCwyNCBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlv biA9IGNsYXNzIFByb2JlU2V0RGV0YWlsc1NlY3Rpb24gZXh0ZW5kcyBXZWJJbgogICAgICAgICB0 aGlzLl9wcm9iZVNldCA9IHByb2JlU2V0OwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFH cmlkOwogCi0gICAgICAgIHZhciByZW1vdmVQcm9iZUJ1dHRvbiA9IG9wdGlvbnNFbGVtZW50LmNy ZWF0ZUNoaWxkKCJpbWciKTsKLSAgICAgICAgcmVtb3ZlUHJvYmVCdXR0b24uY2xhc3NMaXN0LmFk ZChXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZVJlbW92ZVN0eWxlQ2xh c3NOYW1lKTsKLSAgICAgICAgcmVtb3ZlUHJvYmVCdXR0b24uY2xhc3NMaXN0LmFkZChXZWJJbnNw ZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNsYXNz TmFtZSk7Ci0gICAgICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihyZW1vdmVQcm9iZUJ1dHRv biwgImNsaWNrIiwgdGhpcy5fcmVtb3ZlQnV0dG9uQ2xpY2tlZCk7CisgICAgICAgIHRoaXMuX25h dmlnYXRpb25CYXIgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXI7CisgICAgICAgIHRo aXMuX29wdGlvbnNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX25hdmlnYXRpb25CYXIuZWxlbWVu dCk7CisKKyAgICAgICAgdGhpcy5fYWRkUHJvYmVCdXR0b25JdGVtID0gbmV3IFdlYkluc3BlY3Rv ci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiYWRkLXByb2JlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJBZGQgcHJvYmUgZXhwcmVzc2lvbiIpLCAiSW1hZ2VzL1BsdXMxMy5zdmciLCAxMywgMTMpOwor ICAgICAgICB0aGlzLl9hZGRQcm9iZUJ1dHRvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fYWRkUHJvYmVC dXR0b25DbGlja2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGROYXZp Z2F0aW9uSXRlbSh0aGlzLl9hZGRQcm9iZUJ1dHRvbkl0ZW0pOwogCi0gICAgICAgIHZhciBjbGVh clNhbXBsZXNCdXR0b24gPSBvcHRpb25zRWxlbWVudC5jcmVhdGVDaGlsZCgiaW1nIik7Ci0gICAg ICAgIGNsZWFyU2FtcGxlc0J1dHRvbi5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qcm9iZVNl dERldGFpbHNTZWN0aW9uLlByb2JlQ2xlYXJTYW1wbGVzU3R5bGVDbGFzc05hbWUpOwotICAgICAg ICBjbGVhclNhbXBsZXNCdXR0b24uY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUHJvYmVTZXRE ZXRhaWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNsYXNzTmFtZSk7Ci0gICAgICAg IHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihjbGVhclNhbXBsZXNCdXR0b24sICJjbGljayIsIHRo aXMuX2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQpOworICAgICAgICB0aGlzLl9jbGVhclNhbXBs ZXNCdXR0b25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiY2xl YXItc2FtcGxlcyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgc2FtcGxlcyIpLCAiSW1h Z2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnIiwgMTQsIDE0KTsKKyAgICAgICAgdGhpcy5fY2xl YXJTYW1wbGVzQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25O YXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9jbGVhclNhbXBsZXNCdXR0b25DbGlj a2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbS5lbmFibGVk ID0gdGhpcy5fcHJvYmVTZXRIYXNTYW1wbGVzKCk7CisgICAgICAgIHRoaXMuX25hdmlnYXRpb25C YXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbSk7CiAKLSAg ICAgICAgdmFyIGFkZFByb2JlQnV0dG9uID0gb3B0aW9uc0VsZW1lbnQuY3JlYXRlQ2hpbGQoImlt ZyIpOwotICAgICAgICBhZGRQcm9iZUJ1dHRvbi5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Q cm9iZVNldERldGFpbHNTZWN0aW9uLkFkZFByb2JlVmFsdWVTdHlsZUNsYXNzTmFtZSk7Ci0gICAg ICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihhZGRQcm9iZUJ1dHRvbiwgImNsaWNrIiwgdGhp cy5fYWRkUHJvYmVCdXR0b25DbGlja2VkKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlUHJvYmVCdXR0 b25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVtb3ZlLXBy b2JlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUgcHJvYmUiKSwgIkltYWdlcy9DbG9z ZUxhcmdlLnN2ZyIsIDEyLCAxMik7CisgICAgICAgIHRoaXMuX3JlbW92ZVByb2JlQnV0dG9uSXRl bS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVu dC5DbGlja2VkLCB0aGlzLl9yZW1vdmVQcm9iZUJ1dHRvbkNsaWNrZWQsIHRoaXMpOworICAgICAg ICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX3JlbW92ZVByb2Jl QnV0dG9uSXRlbSk7CisKKyAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lzdGVyKHRoaXMuX3By b2JlU2V0LCBXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQuU2FtcGxlQWRkZWQsIHRoaXMuX3By b2JlU2V0U2FtcGxlc0NoYW5nZWQpOworICAgICAgICB0aGlzLl9saXN0ZW5lcnMucmVnaXN0ZXIo dGhpcy5fcHJvYmVTZXQsIFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5TYW1wbGVzQ2xlYXJl ZCwgdGhpcy5fcHJvYmVTZXRTYW1wbGVzQ2hhbmdlZCk7CiAKICAgICAgICAgLy8gVXBkYXRlIHRo ZSBzb3VyY2UgbGluayB3aGVuIHRoZSBicmVha3BvaW50J3MgcmVzb2x2ZWQgc3RhdGUgY2hhbmdl cywKICAgICAgICAgLy8gc28gdGhhdCBpdCBjYW4gYmVjb21lIGEgbGl2ZSBsb2NhdGlvbiBsaW5r IHdoZW4gcG9zc2libGUuCkBAIC0xMTEsNDEgKzExNCw0NiBAQCBXZWJJbnNwZWN0b3IuUHJvYmVT ZXREZXRhaWxzU2VjdGlvbiA9IGNsYXNzIFByb2JlU2V0RGV0YWlsc1NlY3Rpb24gZXh0ZW5kcyBX ZWJJbgogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSAhPT0gMTMpCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdmFyIGV4cHJlc3Npb24gPSBldmVu dC50YXJnZXQudmFsdWU7CisgICAgICAgICAgICBsZXQgZXhwcmVzc2lvbiA9IGV2ZW50LnRhcmdl dC52YWx1ZTsKICAgICAgICAgICAgIHRoaXMuX3Byb2JlU2V0LmNyZWF0ZVByb2JlKGV4cHJlc3Np b24pOwogICAgICAgICAgICAgdmlzaWJsZVBvcG92ZXIuZGlzbWlzcygpOwogICAgICAgICB9CiAK LSAgICAgICAgdmFyIHBvcG92ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlBvcG92ZXI7Ci0gICAgICAg IHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGxl dCBwb3BvdmVyID0gbmV3IFdlYkluc3BlY3Rvci5Qb3BvdmVyOworICAgICAgICBsZXQgY29udGVu dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICBjb250ZW50LmNsYXNz TGlzdC5hZGQoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24uUHJvYmVQb3BvdmVy RWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgY29udGVudC5jcmVhdGVDaGlsZCgiZGl2 IikudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBOZXcgUHJvYmUgRXhw cmVzc2lvbiIpOwotICAgICAgICB2YXIgdGV4dEJveCA9IGNvbnRlbnQuY3JlYXRlQ2hpbGQoImlu cHV0Iik7CisgICAgICAgIGxldCB0ZXh0Qm94ID0gY29udGVudC5jcmVhdGVDaGlsZCgiaW5wdXQi KTsKICAgICAgICAgdGV4dEJveC5hZGRFdmVudExpc3RlbmVyKCJrZXlwcmVzcyIsIGNyZWF0ZVBy b2JlRnJvbUVudGVyZWRFeHByZXNzaW9uLmJpbmQodGhpcywgcG9wb3ZlcikpOwogICAgICAgICB0 ZXh0Qm94LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgZnVuY3Rpb24gKGV2ZW50KSB7IGV2ZW50 LnRhcmdldC5zZWxlY3QoKTsgfSk7CiAgICAgICAgIHRleHRCb3gudHlwZSA9ICJ0ZXh0IjsKICAg ICAgICAgdGV4dEJveC5wbGFjZWhvbGRlciA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhwcmVz c2lvbiIpOwogICAgICAgICBwb3BvdmVyLmNvbnRlbnQgPSBjb250ZW50OwotICAgICAgICB2YXIg dGFyZ2V0ID0gV2ViSW5zcGVjdG9yLlJlY3QucmVjdEZyb21DbGllbnRSZWN0KGV2ZW50LnRhcmdl dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKSk7CisgICAgICAgIGxldCB0YXJnZXQgPSBXZWJJbnNw ZWN0b3IuUmVjdC5yZWN0RnJvbUNsaWVudFJlY3QoZXZlbnQudGFyZ2V0LmVsZW1lbnQuZ2V0Qm91 bmRpbmdDbGllbnRSZWN0KCkpOwogICAgICAgICBwb3BvdmVyLnByZXNlbnQodGFyZ2V0LCBbV2Vi SW5zcGVjdG9yLlJlY3RFZGdlLk1BWF9ZLCBXZWJJbnNwZWN0b3IuUmVjdEVkZ2UuTUlOX1ksIFdl Ykluc3BlY3Rvci5SZWN0RWRnZS5NQVhfWF0pOwogICAgICAgICB0ZXh0Qm94LnNlbGVjdCgpOwog ICAgIH0KIAotICAgIF9yZW1vdmVCdXR0b25DbGlja2VkKGV2ZW50KQorICAgIF9jbGVhclNhbXBs ZXNCdXR0b25DbGlja2VkKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJvYmVTZXQuY2xl YXJTYW1wbGVzKCk7CisgICAgfQorCisgICAgX3JlbW92ZVByb2JlQnV0dG9uQ2xpY2tlZChldmVu dCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Byb2JlU2V0LmNsZWFyKCk7CiAgICAgfQogCi0gICAg X2NsZWFyU2FtcGxlc0J1dHRvbkNsaWNrZWQoZXZlbnQpCisgICAgX3Byb2JlU2V0U2FtcGxlc0No YW5nZWQoZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9wcm9iZVNldC5jbGVhclNhbXBsZXMo KTsKKyAgICAgICAgdGhpcy5fY2xlYXJTYW1wbGVzQnV0dG9uSXRlbS5lbmFibGVkID0gdGhpcy5f cHJvYmVTZXRIYXNTYW1wbGVzKCk7CisgICAgfQorCisgICAgX3Byb2JlU2V0SGFzU2FtcGxlcygp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcHJvYmVTZXQucHJvYmVzLnNvbWUoKHByb2Jl KSA9PiBwcm9iZS5zYW1wbGVzLmxlbmd0aCk7CiAgICAgfQogfTsKIAotV2ViSW5zcGVjdG9yLlBy b2JlU2V0RGV0YWlsc1NlY3Rpb24uQWRkUHJvYmVWYWx1ZVN0eWxlQ2xhc3NOYW1lID0gInByb2Jl LWFkZCI7CiBXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Eb250RmxvYXRMaW5r U3R5bGVDbGFzc05hbWUgPSAiZG9udC1mbG9hdCI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRh aWxzU2VjdGlvbi5Qcm9iZUJ1dHRvbkVuYWJsZWRTdHlsZUNsYXNzTmFtZSA9ICJlbmFibGVkIjsK IFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uLlByb2JlUG9wb3ZlckVsZW1lbnRT dHlsZUNsYXNzTmFtZSA9ICJwcm9iZS1wb3BvdmVyIjsKLVdlYkluc3BlY3Rvci5Qcm9iZVNldERl dGFpbHNTZWN0aW9uLlByb2JlQ2xlYXJTYW1wbGVzU3R5bGVDbGFzc05hbWUgPSAicHJvYmUtY2xl YXItc2FtcGxlcyI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Qcm9iZVJl bW92ZVN0eWxlQ2xhc3NOYW1lID0gInByb2JlLXJlbW92ZSI7Ci1XZWJJbnNwZWN0b3IuUHJvYmVT ZXREZXRhaWxzU2VjdGlvbi5TZWN0aW9uT3B0aW9uc1N0eWxlQ2xhc3NOYW1lID0gIm9wdGlvbnMi Owo=