153820 2016-02-02 21:40:35 -0800 Remove calls to parseInt in order to work with non-integer revisions 2016-02-10 16:30:59 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=152345 P2 Normal --- 152345 1 jmarcell webkit-unassigned adele ap dbates dburkart dean_johnson dino jmarcell lforschler matthew_hanson oldest_to_newest 1161537 0 jmarcell 2016-02-02 21:40:35 -0800 Remove calls to parseInt in order to work with non-integer revisions 1161539 1 270549 jmarcell 2016-02-02 21:42:25 -0800 Created attachment 270549 Patch 1161876 2 270624 jmarcell 2016-02-03 20:36:06 -0800 Created attachment 270624 Patch 1162258 3 270709 jmarcell 2016-02-04 17:48:43 -0800 Created attachment 270709 Patch 1163665 4 jmarcell 2016-02-10 16:30:59 -0800 Landed: http://trac.webkit.org/changeset/196403 270549 2016-02-02 21:42:25 -0800 2016-02-03 20:36:02 -0800 Patch bug-153820-20160202214201.patch text/plain 14673 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MDQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTMyYjUzYmJkM2MyYjEyZDU2Njc2Zjg2Njc5Y2RjNWEw ZGQ1MWQ1Yi4uNWNjMDhlZGZlZWQyYWM2M2Y1ZmM4YTk3NzMwNzMxODJkNzMzNDQ4ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDE2LTAyLTAyICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIFJlbW92ZSBjYWxscyB0byBwYXJzZUludCBpbiBvcmRlciB0byB3b3JrIHdpdGggbm9u LWludGVnZXIgcmV2aXNpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTM4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tCdWlsZGJvdFF1ZXVlVmlldy5q czoKKyAgICAgICAgKE1vY2tCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2xhdGVzdFByb2R1 Y3RpdmVJdGVyYXRpb24pOiBSZW1vdmUgY2FsbHMgdG8gcGFyc2VJbnQgaW4gb3JkZXIgdG8gd29y ayB3aXRoIG5vbi1pbnRlZ2VyCisgICAgICAgIHJldmlzaW9ucy4KKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qczoKKyAgICAgICAgKE1vY2tUcmFjLnByb3RvdHlwZS5n ZXQgb2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcik6IERpdHRvLgorICAgICAgICAoTW9ja1Ry YWMucHJvdG90eXBlLmdldCBsYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyKTogRGl0dG8uCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanM6IERpdHRvLgorCisyMDE2LTAy LTAyICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCBz cGVjaWFsIGxvZ2ljIGZvciBHaXQgcmV2aXNpb25zIGluIHRoZSBwb3BvdmVyCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM4MTgKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcwppbmRleCAzNzc4NGVjODVlNjQ0ZmQwOWNl NjI2Njk4ZTI5NjZlYzJmMjJjMWI5Li5lMjhjMzFlM2ZjNTMxN2Y2YjgyMWZlMWI2YTFlYThhNGVk NzJkMTdmIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlv bi5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcwpAQCAt MjE0LDE3ICsyMTQsMTQgQEAgQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgIGZhbGxiYWNrS2V5ID0gbnVsbDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IHZhciByZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShyZXZpc2lvblByb3BlcnR5LCBr ZXksIGZhbGxiYWNrS2V5KTsKLSAgICAgICAgICAgIGlmIChyZXBvc2l0b3J5LmlzU1ZOKQotICAg ICAgICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdID0gcGFyc2VJbnQocmV2 aXNpb24pOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMucmV2aXNpb25b cmVwb3NpdG9yeU5hbWVdID0gcmV2aXNpb247CisgICAgICAgICAgICB0aGlzLnJldmlzaW9uW3Jl cG9zaXRvcnlOYW1lXSA9IHJldmlzaW9uOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24g c291cmNlU3RhbXBDaGFuZ2VzKHNvdXJjZVN0YW1wKSB7CiAgICAgICAgICAgICB2YXIgcmVzdWx0 ID0gW107CiAgICAgICAgICAgICB2YXIgY2hhbmdlcyA9IHNvdXJjZVN0YW1wLmNoYW5nZXM7CiAg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNoYW5nZXMubGVuZ3RoOyArK2kpIHsKLSAg ICAgICAgICAgICAgICB2YXIgY2hhbmdlID0geyByZXZpc2lvbk51bWJlcjogcGFyc2VJbnQoY2hh bmdlc1tpXS5yZXZpc2lvbiwgMTApIH0KKyAgICAgICAgICAgICAgICB2YXIgY2hhbmdlID0geyBy ZXZpc2lvbk51bWJlcjogY2hhbmdlc1tpXS5yZXZpc2lvbiB9CiAgICAgICAgICAgICAgICAgaWYg KGNoYW5nZXNbaV0ucmVwb3NpdG9yeSkKICAgICAgICAgICAgICAgICAgICAgY2hhbmdlLnJlcG9z aXRvcnkgPSBjaGFuZ2VzW2ldLnJlcG9zaXRvcnk7CiAgICAgICAgICAgICAgICAgaWYgKGNoYW5n ZXNbaV0uYnJhbmNoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RR dWV1ZS5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUuanMKaW5kZXggNGY5 YzkyMjNlNWRjNTUzMThlMTNkNTNlY2Y3NTRmMTgxYWVmNWJhYi4uMDk2OWZmMTIxZjA1Zjg0MGI3 MGQ5NTFiYzc5ZTViYmVkNTQ4NzVkZSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv QnVpbGRib3RRdWV1ZS5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl LmpzCkBAIC0yMDksNyArMjA5LDcgQEAgQnVpbGRib3RRdWV1ZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBmb3IgKHZhciBpID0gZGF0YS5jYWNoZWRCdWlsZHMubGVuZ3RoIC0gMTsgaSA+PSAw OyAtLWkpIHsKICAgICAgICAgICAgICAgICB2YXIgaXRlcmF0aW9uID0gdGhpcy5fa25vd25JdGVy YXRpb25zW2RhdGEuY2FjaGVkQnVpbGRzW2ldXTsKICAgICAgICAgICAgICAgICBpZiAoIWl0ZXJh dGlvbikgewotICAgICAgICAgICAgICAgICAgICBpdGVyYXRpb24gPSBuZXcgQnVpbGRib3RJdGVy YXRpb24odGhpcywgcGFyc2VJbnQoZGF0YS5jYWNoZWRCdWlsZHNbaV0sIDEwKSwgIShkYXRhLmNh Y2hlZEJ1aWxkc1tpXSBpbiBjdXJyZW50QnVpbGRzKSk7CisgICAgICAgICAgICAgICAgICAgIGl0 ZXJhdGlvbiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLCBkYXRhLmNhY2hlZEJ1aWxkc1tp XSwgIShkYXRhLmNhY2hlZEJ1aWxkc1tpXSBpbiBjdXJyZW50QnVpbGRzKSk7CiAgICAgICAgICAg ICAgICAgICAgIG5ld0l0ZXJhdGlvbnMucHVzaChpdGVyYXRpb24pOwogICAgICAgICAgICAgICAg ICAgICB0aGlzLml0ZXJhdGlvbnMucHVzaChpdGVyYXRpb24pOwogICAgICAgICAgICAgICAgICAg ICB0aGlzLl9rbm93bkl0ZXJhdGlvbnNbaXRlcmF0aW9uLmlkXSA9IGl0ZXJhdGlvbjsKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tCdWlsZGJvdFF1ZXVlVmlldy5q cyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tCdWlsZGJvdFF1ZXVlVmlldy5qcwpp bmRleCBjZTZmYTE5NGU2MTYyM2UwN2Q4YjQzOTVjYjgwNzEyOTY0NzhlZTk1Li5iMWU2ZTgyMTkx ZGFiMjJlNjc1NmNlMDhmYzFmMWY5ZmQxOTMyNDUwIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy90ZXN0cy9Nb2NrQnVpbGRib3RRdWV1ZVZpZXcuanMKKysrIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvdGVzdHMvTW9ja0J1aWxkYm90UXVldWVWaWV3LmpzCkBAIC00NCw3ICs0NCw3IEBA IE1vY2tCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICByZXR1 cm4gewogICAgICAgICAgICAgcmV2aXNpb246IHsKLSAgICAgICAgICAgICAgICAib3BlblNvdXJj ZSI6IDMzMDIwCisgICAgICAgICAgICAgICAgIm9wZW5Tb3VyY2UiOiAiMzMwMjAiCiAgICAgICAg ICAgICB9CiAgICAgICAgIH07CiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvdGVzdHMvTW9ja1RyYWMuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJh Yy5qcwppbmRleCA2MGY1NTAyYjQ1MjRhN2Q2ZGNiMWFkN2IzNjdlZDc4YTM4ZWU5NzYxLi5jNmI5 YzkwYjM3YjUyYmRmNzJjZGIzNTI0MmIxNjMwMzg4ODAxMWM3IDEwMDY0NAotLS0gYS9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy90ZXN0cy9Nb2NrVHJhYy5qcwpAQCAtMzYsMTIgKzM2LDEyIEBAIE1vY2tUcmFjLnByb3RvdHlw ZSA9IHsKIAogICAgIGdldCBvbGRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyKCkKICAgICB7Ci0g ICAgICAgIHJldHVybiAzMzAxODsKKyAgICAgICAgcmV0dXJuICIzMzAxOCI7CiAgICAgfSwKIAog ICAgIGdldCBsYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyKCkKICAgICB7Ci0gICAgICAgIHJl dHVybiAzMzAyMjsKKyAgICAgICAgcmV0dXJuICIzMzAyMiI7CiAgICAgfSwKIAogICAgIGxvYWRN b3JlSGlzdG9yaWNhbERhdGE6IGZ1bmN0aW9uKCkKQEAgLTUxLDcgKzUxLDcgQEAgTW9ja1RyYWMu cHJvdG90eXBlID0gewogCiBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUyA9IFsKICAgICB7 Ci0gICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDE4LAorICAgICAgICAicmV2aXNpb25OdW1i ZXIiOiAiMzMwMTgiLAogICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvMzMwMTgiLAogICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBt ZXNzYWdlIiB9LAogICAgICAgICAiYXV0aG9yIjogImpvaG5Ad2Via2l0Lm9yZyIsCkBAIC02MSw3 ICs2MSw3IEBAIE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRTID0gWwogICAgICAgICAiYnJh bmNoZXMiOiBbInRydW5rIl0KICAgICB9LAogICAgIHsKLSAgICAgICAgInJldmlzaW9uTnVtYmVy IjogMzMwMTksCisgICAgICAgICJyZXZpc2lvbk51bWJlciI6ICIzMzAxOSIsCiAgICAgICAgICJs aW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAxOSIsCiAgICAgICAg ICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCiAgICAgICAgICJhdXRo b3IiOiAicGF1bEB3ZWJraXQub3JnIiwKQEAgLTcxLDcgKzcxLDcgQEAgTW9ja1RyYWMuRVhBTVBM RV9UUkFDX0NPTU1JVFMgPSBbCiAgICAgICAgICJicmFuY2hlcyI6IFsic29tZU90aGVyQnJhbmNo Il0KICAgICB9LAogICAgIHsKLSAgICAgICAgInJldmlzaW9uTnVtYmVyIjogMzMwMjAsCisgICAg ICAgICJyZXZpc2lvbk51bWJlciI6ICIzMzAyMCIsCiAgICAgICAgICJsaW5rIjogImh0dHBzOi8v dHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyMCIsCiAgICAgICAgICJ0aXRsZSI6IHsgaW5u ZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCiAgICAgICAgICJhdXRob3IiOiAiZ2VvcmdlQHdl YmtpdC5vcmciLApAQCAtODEsNyArODEsNyBAQCBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlU UyA9IFsKICAgICAgICAgImJyYW5jaGVzIjogWyJ0cnVuayJdCiAgICAgfSwKICAgICB7Ci0gICAg ICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDIxLAorICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAi MzMwMjEiLAogICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvMzMwMjEiLAogICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNzYWdl IiB9LAogICAgICAgICAiYXV0aG9yIjogInJpbmdvQHdlYmtpdC5vcmciLApAQCAtOTEsNyArOTEs NyBAQCBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUyA9IFsKICAgICAgICAgImJyYW5jaGVz IjogWyJzb21lT3RoZXJCcmFuY2giXQogICAgIH0sCiAgICAgewotICAgICAgICAicmV2aXNpb25O dW1iZXIiOiAzMzAyMiwKKyAgICAgICAgInJldmlzaW9uTnVtYmVyIjogIjMzMDIyIiwKICAgICAg ICAgImxpbmsiOiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIyIiwKICAg ICAgICAgInRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKICAgICAgICAg ImF1dGhvciI6ICJib2JAd2Via2l0Lm9yZyIsCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy90ZXN0cy90ZXN0cy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpz CmluZGV4IGU0Y2UyNzFmMWU5Y2QyZDU5NTk3ZmVkZTAyMzFmNzJiZjNmZjAxZmMuLmZiNjgyZmRl YjAyYWRiYjVlMWFlY2NkMmQwNDVmMTQwYjZjMDlmMDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3Rz L3Rlc3RzLmpzCkBAIC03NSwyNyArNzUsMjcgQEAgdGVzdCgiX3BhcnNlUmV2aXNpb25Gcm9tVVJM IiwgZnVuY3Rpb24oKQogdGVzdCgibmV4dFJldmlzaW9uIiwgZnVuY3Rpb24oKQogewogICAgIHRo aXMudHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUzsK LSAgICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMubmV4dFJldmlzaW9uKCJ0cnVuayIsIDMzMDIwKSwg MzMwMjIsICJuZXh0UmV2aXNpb24gc2FtZSBicmFuY2giKTsKLSAgICBzdHJpY3RFcXVhbCh0aGlz LnRyYWMubmV4dFJldmlzaW9uKCJ0cnVuayIsIDMzMDE5KSwgMzMwMjAsICJuZXh0UmV2aXNpb24g ZGlmZmVyZW50IGJyYW5jaCIpOworICAgIHN0cmljdEVxdWFsKHRoaXMudHJhYy5uZXh0UmV2aXNp b24oInRydW5rIiwgIjMzMDIwIiksICIzMzAyMiIsICJuZXh0UmV2aXNpb24gc2FtZSBicmFuY2gi KTsKKyAgICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMubmV4dFJldmlzaW9uKCJ0cnVuayIsICIzMzAx OSIpLCAiMzMwMjAiLCAibmV4dFJldmlzaW9uIGRpZmZlcmVudCBicmFuY2giKTsKIH0pOwogCiB0 ZXN0KCJpbmRleE9mUmV2aXNpb24iLCBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy50cmFjLnJlY29y ZGVkQ29tbWl0cyA9IE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRTOwotICAgIHN0cmljdEVx dWFsKHRoaXMudHJhYy5pbmRleE9mUmV2aXNpb24oMzMwMjApLCAyLCAiaW5kZXhPZlJldmlzaW9u Iik7CisgICAgc3RyaWN0RXF1YWwodGhpcy50cmFjLmluZGV4T2ZSZXZpc2lvbigiMzMwMjAiKSwg MiwgImluZGV4T2ZSZXZpc2lvbiIpOwogfSk7CiAKIHRlc3QoImNvbW1pdHNPbkJyYW5jaExhdGVy VGhhblJldmlzaW9uIiwgZnVuY3Rpb24oKQogewogICAgIHRoaXMudHJhYy5yZWNvcmRlZENvbW1p dHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUzsKLSAgICB2YXIgY29tbWl0cyA9IHRo aXMudHJhYy5jb21taXRzT25CcmFuY2hMYXRlclRoYW5SZXZpc2lvbigidHJ1bmsiLCAzMzAyMCk7 CisgICAgdmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMuY29tbWl0c09uQnJhbmNoTGF0ZXJUaGFuUmV2 aXNpb24oInRydW5rIiwgIjMzMDIwIik7CiAgICAgZXF1YWwoY29tbWl0cy5sZW5ndGgsIDEsICJn cmVhdGVyIHRoYW4gMzMwMjAiKTsKIH0pOwogCiB0ZXN0KCJjb21taXRzT25CcmFuY2hJblJldmlz aW9uUmFuZ2UiLCBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy50cmFjLnJlY29yZGVkQ29tbWl0cyA9 IE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRTOwotICAgIHZhciBjb21taXRzID0gdGhpcy50 cmFjLmNvbW1pdHNPbkJyYW5jaEluUmV2aXNpb25SYW5nZSgidHJ1bmsiLCAzMzAyMCwgMzMwMjIp OworICAgIHZhciBjb21taXRzID0gdGhpcy50cmFjLmNvbW1pdHNPbkJyYW5jaEluUmV2aXNpb25S YW5nZSgidHJ1bmsiLCAiMzMwMjAiLCAiMzMwMjIiKTsKICAgICBlcXVhbChjb21taXRzLmxlbmd0 aCwgMiwgImluIHJhbmdlIDMzMDIwLCAzMzAyMiIpOwogfSk7CiAKQEAgLTEyNyw3ICsxMjcsNyBA QCB0ZXN0KCJfYXBwZW5kUGVuZGluZ1JldmlzaW9uQ291bnQiLCBmdW5jdGlvbigpCiAKIHRlc3Qo Il9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5nZSIsIGZ1bmN0aW9uKCkKIHsKLSAgICB2YXIgbGlu ZXMgPSB0aGlzLnZpZXcuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKHRoaXMudHJhYywgdGhp cy50cnVua0JyYW5jaCwgMzMwMTgsIDMzMDIwKTsKKyAgICB2YXIgbGluZXMgPSB0aGlzLnZpZXcu X3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKHRoaXMudHJhYywgdGhpcy50cnVua0JyYW5jaCwg IjMzMDE4IiwgIjMzMDIwIik7CiAgICAgc3RyaWN0RXF1YWwobGluZXMubGVuZ3RoLCAyLCAiaGFz IDIgbGluZXMiKTsKIH0pOwogCkBAIC0xNDcsOCArMTQ3LDggQEAgdGVzdCgiX3ByZXNlbnRQb3Bv dmVyRm9yUmV2aXNpb25SYW5nZSIsIGZ1bmN0aW9uKCkKICAgICB2YXIgY29udGV4dCA9IHsKICAg ICAgICAgdHJhYzogdGhpcy50cmFjLAogICAgICAgICBicmFuY2g6IHRoaXMudHJ1bmtCcmFuY2gs Ci0gICAgICAgIGZpcnN0UmV2aXNpb246IDMzMDE4LAotICAgICAgICBsYXN0UmV2aXNpb246IDMz MDIwCisgICAgICAgIGZpcnN0UmV2aXNpb246ICIzMzAxOCIsCisgICAgICAgIGxhc3RSZXZpc2lv bjogIjMzMDIwIgogICAgIH07CiAgICAgdGhpcy52aWV3Ll9wcmVzZW50UG9wb3ZlckZvclJldmlz aW9uUmFuZ2UoZWxlbWVudCwgcG9wb3ZlciwgY29udGV4dCk7CiAgICAgdmFyIG5vZGVMaXN0ID0g cG9wb3Zlci5fZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJwZW5kaW5nLWNvbW1pdCIp OwpAQCAtMTYyLDggKzE2Miw4IEBAIHRlc3QoIl9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFu Z2Ugbm8gY29tbWl0cyIsIGZ1bmN0aW9uKCkKICAgICB2YXIgY29udGV4dCA9IHsKICAgICAgICAg dHJhYzogdGhpcy50cmFjLAogICAgICAgICBicmFuY2g6IHRoaXMudHJ1bmtCcmFuY2gsCi0gICAg ICAgIGZpcnN0UmV2aXNpb246IDMzMDIwLAotICAgICAgICBsYXN0UmV2aXNpb246IDMzMDE4Cisg ICAgICAgIGZpcnN0UmV2aXNpb246ICIzMzAyMCIsCisgICAgICAgIGxhc3RSZXZpc2lvbjogIjMz MDE4IgogICAgIH07CiAgICAgdGhpcy52aWV3Ll9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFu Z2UoZWxlbWVudCwgcG9wb3ZlciwgY29udGV4dCk7CiAgICAgdmFyIG5vZGVMaXN0ID0gcG9wb3Zl ci5fZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJwZW5kaW5nLWNvbW1pdCIpOwpAQCAt MTc0LDcgKzE3NCw3IEBAIHRlc3QoIl9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJh dGlvbiIsIGZ1bmN0aW9uKCkKIHsKICAgICB2YXIgZmluaXNoZWQgPSBmYWxzZTsKICAgICB2YXIg aXRlcmF0aW9uID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVk KTsKLSAgICBpdGVyYXRpb24ucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTggfTsKKyAg ICBpdGVyYXRpb24ucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE4IiB9OwogICAgIHZh ciBwcmV2aW91c0l0ZXJhdGlvbiA9IG51bGw7CiAgICAgdmFyIGNvbnRlbnQgPSB0aGlzLnZpZXcu X3JldmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uKGl0ZXJhdGlvbiwgcHJldmlv dXNJdGVyYXRpb24sIHRoaXMudHJ1bmtCcmFuY2gpOwogICAgIHN0cmljdEVxdWFsKGNvbnRlbnQu aW5uZXJIVE1MLCAicjMzMDE4IiwgInNob3VsZCBoYXZlIGNvcnJlY3QgcmV2aXNpb24gbnVtYmVy LiIpOwpAQCAtMTg2LDkgKzE4Niw5IEBAIHRlc3QoIl9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3Zl ckZvckl0ZXJhdGlvbiBoYXMgcHJldmlvdXNJdGVyYXRpb24iLCBmdW5jdGlvbigpCiB7CiAgICAg dmFyIGZpbmlzaGVkID0gZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbiA9IG5ldyBCdWlsZGJvdEl0 ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9uLnJldmlzaW9u ID0geyAib3BlblNvdXJjZSI6IDMzMDIyIH07CisgICAgaXRlcmF0aW9uLnJldmlzaW9uID0geyAi b3BlblNvdXJjZSI6ICIzMzAyMiIgfTsKICAgICB2YXIgcHJldmlvdXNJdGVyYXRpb24gPSBuZXcg QnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwotICAgIHByZXZpb3Vz SXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE4IH07CisgICAgcHJldmlv dXNJdGVyYXRpb24ucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE4IiB9OwogICAgIHZh ciBjb250ZW50ID0gdGhpcy52aWV3Ll9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJh dGlvbihpdGVyYXRpb24sIHByZXZpb3VzSXRlcmF0aW9uLCB0aGlzLnRydW5rQnJhbmNoKTsKICAg ICBzdHJpY3RFcXVhbChjb250ZW50LmlubmVySFRNTCwgInIzMzAyMiIsICJzaG91bGQgaGF2ZSBj b3JyZWN0IHJldmlzaW9uIG51bWJlci4iKTsKICAgICBzdHJpY3RFcXVhbChjb250ZW50LmNsYXNz TGlzdC5jb250YWlucygicmV2aXNpb24tbnVtYmVyIiksIHRydWUsICJzaG91bGQgaGF2ZSBjbGFz cyAncmV2aXNpb24tbnVtYmVyJy4iKTsKQEAgLTIxOCw4ICsyMTgsOCBAQCB0ZXN0KCJjb21wYXJl SXRlcmF0aW9ucyBieSByZXZpc2lvbnMiLCBmdW5jdGlvbigpCiAgICAgdmFyIGZpbmlzaGVkID0g ZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbjEgPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5x dWV1ZSwgMSwgZmluaXNoZWQpOwogICAgIHZhciBpdGVyYXRpb24yID0gbmV3IEJ1aWxkYm90SXRl cmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKLSAgICBpdGVyYXRpb24xLnJldmlzaW9u ID0geyAib3BlblNvdXJjZSI6IDMzMDE4IH07Ci0gICAgaXRlcmF0aW9uMi5yZXZpc2lvbiA9IHsg Im9wZW5Tb3VyY2UiOiAzMzAxOSB9OworICAgIGl0ZXJhdGlvbjEucmV2aXNpb24gPSB7ICJvcGVu U291cmNlIjogIjMzMDE4IiB9OworICAgIGl0ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291 cmNlIjogIjMzMDE5IiB9OwogICAgIGl0ZXJhdGlvbjEubG9hZGVkID0gdHJ1ZTsKICAgICBpdGVy YXRpb24yLmxvYWRlZCA9IHRydWU7CiAgICAgb2sodGhpcy5xdWV1ZS5jb21wYXJlSXRlcmF0aW9u cyhpdGVyYXRpb24yLCBpdGVyYXRpb24xKSA8IDAsICJjb21wYXJlSXRlcmF0aW9uczogbGVzcyB0 aGFuIik7CkBAIC0yMzMsNyArMjMzLDcgQEAgdGVzdCgiY29tcGFyZUl0ZXJhdGlvbnMgYnkgbG9h ZGVkIChvbmUgcmV2aXNpb24gbWlzc2luZykiLCBmdW5jdGlvbigpCiAgICAgdmFyIGl0ZXJhdGlv bjEgPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwogICAg IHZhciBpdGVyYXRpb24yID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZp bmlzaGVkKTsKICAgICBpdGVyYXRpb24xLnJldmlzaW9uID0ge307Ci0gICAgaXRlcmF0aW9uMi5y ZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOSB9OworICAgIGl0ZXJhdGlvbjIucmV2aXNp b24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OwogICAgIGl0ZXJhdGlvbjEubG9hZGVkID0g ZmFsc2U7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSB0cnVlOwogICAgIG9rKHRoaXMucXVldWUu Y29tcGFyZUl0ZXJhdGlvbnMoaXRlcmF0aW9uMSwgaXRlcmF0aW9uMikgPiAwLCAiY29tcGFyZUl0 ZXJhdGlvbnM6IGdyZWF0ZXIgdGhhbiIpOwpAQCAtMjQ1LDggKzI0NSw4IEBAIHRlc3QoImNvbXBh cmVJdGVyYXRpb25zIGJ5IGxvYWRlZCAoc2FtZSByZXZpc2lvbikiLCBmdW5jdGlvbigpCiAgICAg dmFyIGZpbmlzaGVkID0gZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbjEgPSBuZXcgQnVpbGRib3RJ dGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwogICAgIHZhciBpdGVyYXRpb24yID0g bmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKLSAgICBpdGVy YXRpb24xLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE5IH07Ci0gICAgaXRlcmF0aW9u Mi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOSB9OworICAgIGl0ZXJhdGlvbjEucmV2 aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OworICAgIGl0ZXJhdGlvbjIucmV2aXNp b24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OwogICAgIGl0ZXJhdGlvbjEubG9hZGVkID0g ZmFsc2U7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSB0cnVlOwogICAgIG9rKHRoaXMucXVldWUu Y29tcGFyZUl0ZXJhdGlvbnMoaXRlcmF0aW9uMSwgaXRlcmF0aW9uMikgPiAwLCAiY29tcGFyZUl0 ZXJhdGlvbnM6IGdyZWF0ZXIgdGhhbiIpOwpAQCAtMjcyLDggKzI3Miw4IEBAIHRlc3QoImNvbXBh cmVJdGVyYXRpb25zIGJ5IGlkIChzYW1lIHJldmlzaW9uKSIsIGZ1bmN0aW9uKCkKICAgICB2YXIg ZmluaXNoZWQgPSBmYWxzZTsKICAgICB2YXIgaXRlcmF0aW9uMSA9IG5ldyBCdWlsZGJvdEl0ZXJh dGlvbih0aGlzLnF1ZXVlLCAxLCBmaW5pc2hlZCk7CiAgICAgdmFyIGl0ZXJhdGlvbjIgPSBuZXcg QnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMiwgZmluaXNoZWQpOwotICAgIGl0ZXJhdGlv bjEucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKLSAgICBpdGVyYXRpb24yLnJl dmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE5IH07CisgICAgaXRlcmF0aW9uMS5yZXZpc2lv biA9IHsgIm9wZW5Tb3VyY2UiOiAiMzMwMTkiIH07CisgICAgaXRlcmF0aW9uMi5yZXZpc2lvbiA9 IHsgIm9wZW5Tb3VyY2UiOiAiMzMwMTkiIH07CiAgICAgaXRlcmF0aW9uMS5sb2FkZWQgPSBmYWxz ZTsKICAgICBpdGVyYXRpb24yLmxvYWRlZCA9IGZhbHNlOwogICAgIG9rKHRoaXMucXVldWUuY29t cGFyZUl0ZXJhdGlvbnMoaXRlcmF0aW9uMiwgaXRlcmF0aW9uMSkgPCAwLCAiY29tcGFyZUl0ZXJh dGlvbnM6IGxlc3MgdGhhbiIpOwpAQCAtMjg2LDggKzI4Niw4IEBAIHRlc3QoImNvbXBhcmVJdGVy YXRpb25zQnlSZXZpc2lvbnMiLCBmdW5jdGlvbigpCiAgICAgdmFyIGZpbmlzaGVkID0gZmFsc2U7 CiAgICAgdmFyIGl0ZXJhdGlvbjEgPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwg MSwgZmluaXNoZWQpOwogICAgIHZhciBpdGVyYXRpb24yID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9u KHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKLSAgICBpdGVyYXRpb24xLnJldmlzaW9uID0geyAi b3BlblNvdXJjZSI6IDMzMDE4IH07Ci0gICAgaXRlcmF0aW9uMi5yZXZpc2lvbiA9IHsgIm9wZW5T b3VyY2UiOiAzMzAxOSB9OworICAgIGl0ZXJhdGlvbjEucmV2aXNpb24gPSB7ICJvcGVuU291cmNl IjogIjMzMDE4IiB9OworICAgIGl0ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjog IjMzMDE5IiB9OwogICAgIGl0ZXJhdGlvbjEubG9hZGVkID0gdHJ1ZTsKICAgICBpdGVyYXRpb24y LmxvYWRlZCA9IGZhbHNlOwogICAgIG9rKHRoaXMucXVldWUuY29tcGFyZUl0ZXJhdGlvbnNCeVJl dmlzaW9ucyhpdGVyYXRpb24yLCBpdGVyYXRpb24xKSA8IDAsICJjb21wYXJlSXRlcmF0aW9uc0J5 UmV2aXNpb25zOiBsZXNzIHRoYW4iKTsK 270624 2016-02-03 20:36:06 -0800 2016-02-04 17:48:40 -0800 Patch bug-153820-20160203203542.patch text/plain 15547 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MTA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzJhYzJjYjBkMzdiZjBlNzJkNDJiMTI3NjJhOWNlOGNl NmZiZGMxMC4uY2E2OWFkYjdhYmYzNmVjYTNiMGViNjhiZDNjODkyNTAxYzM0YWM2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDE2LTAyLTAzICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIFJlbW92ZSBjYWxscyB0byBwYXJzZUludCBpbiBvcmRlciB0byB3b3JrIHdpdGggbm9u LWludGVnZXIgcmV2aXNpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTM4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzOgorICAgICAg ICAoQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlLnNvdXJjZVN0YW1wQ2hhbmdlcyk6IFJlbW92 ZSBjYWxscyB0byBwYXJzZUludCBpbiBvcmRlciB0byB3b3JrIHdpdGggbm9uLWludGVnZXIKKyAg ICAgICAgcmV2aXNpb25zLgorICAgICAgICAoQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlLl9w YXJzZURhdGEpOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZS5wcm90b3R5cGUudXBkYXRlKTogRGl0dG8uCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja0J1aWxkYm90UXVldWVWaWV3LmpzOgor ICAgICAgICAoTW9ja0J1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fbGF0ZXN0UHJvZHVjdGl2 ZUl0ZXJhdGlvbik6IENoYW5nZSBpbnRlZ2VycyB0byBzdHJpbmdzIGluIHRlc3QgY29kZS4KKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qczoKKyAgICAgICAgKE1vY2tU cmFjLnByb3RvdHlwZS5nZXQgb2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcik6IERpdHRvLgor ICAgICAgICAoTW9ja1RyYWMucHJvdG90eXBlLmdldCBsYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVt YmVyKTogRGl0dG8uCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanM6IERp dHRvLgorCisyMDE2LTAyLTAzICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgor CiAgICAgICAgIEZvcm1hdCByZXZpc2lvbnMgZm9yIGRpc3BsYXkgYWNjb3JkaW5nIHRvIHJlcG9z aXRvcnkgdHlwZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzODE4CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRl cmF0aW9uLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKaW5k ZXggMzc3ODRlYzg1ZTY0NGZkMDljZTYyNjY5OGUyOTY2ZWMyZjIyYzFiOS4uZTI4YzMxZTNmYzUz MTdmNmI4MjFmZTFiNmExZWE4YTRlZDcyZDE3ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RJdGVyYXRpb24uanMKQEAgLTIxNCwxNyArMjE0LDE0IEBAIEJ1aWxkYm90SXRlcmF0aW9u LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBmYWxsYmFja0tleSA9IG51bGw7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB2YXIgcmV2aXNpb24gPSBwYXJzZVJldmlzaW9uUHJvcGVy dHkocmV2aXNpb25Qcm9wZXJ0eSwga2V5LCBmYWxsYmFja0tleSk7Ci0gICAgICAgICAgICBpZiAo cmVwb3NpdG9yeS5pc1NWTikKLSAgICAgICAgICAgICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRv cnlOYW1lXSA9IHBhcnNlSW50KHJldmlzaW9uKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICB0aGlzLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSA9IHJldmlzaW9uOworICAgICAg ICAgICAgdGhpcy5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0gPSByZXZpc2lvbjsKICAgICAgICAg fQogCiAgICAgICAgIGZ1bmN0aW9uIHNvdXJjZVN0YW1wQ2hhbmdlcyhzb3VyY2VTdGFtcCkgewog ICAgICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwogICAgICAgICAgICAgdmFyIGNoYW5nZXMgPSBz b3VyY2VTdGFtcC5jaGFuZ2VzOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGFu Z2VzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGNoYW5nZSA9IHsgcmV2aXNp b25OdW1iZXI6IHBhcnNlSW50KGNoYW5nZXNbaV0ucmV2aXNpb24sIDEwKSB9CisgICAgICAgICAg ICAgICAgdmFyIGNoYW5nZSA9IHsgcmV2aXNpb25OdW1iZXI6IGNoYW5nZXNbaV0ucmV2aXNpb24g fQogICAgICAgICAgICAgICAgIGlmIChjaGFuZ2VzW2ldLnJlcG9zaXRvcnkpCiAgICAgICAgICAg ICAgICAgICAgIGNoYW5nZS5yZXBvc2l0b3J5ID0gY2hhbmdlc1tpXS5yZXBvc2l0b3J5OwogICAg ICAgICAgICAgICAgIGlmIChjaGFuZ2VzW2ldLmJyYW5jaCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdFF1ZXVlLmpzCmluZGV4IGJlNzI5NzU1MWM3YmE3ODk5NzdmNTQ4NjEwNzhjYjQ3MzNkNmJi NTEuLmNiZGViNGM1NWNmZjVmY2QxYzM4NTY3ZmE5ZThlZGQ0OTgwYTJmM2MgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWUuanMKKysrIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qcwpAQCAtMjA5LDcgKzIwOSw3IEBAIEJ1aWxkYm90UXVl dWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZm9yICh2YXIgaSA9IGRhdGEuY2FjaGVkQnVp bGRzLmxlbmd0aCAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgICAgICAgICAgICAgdmFyIGl0ZXJh dGlvbiA9IHRoaXMuX2tub3duSXRlcmF0aW9uc1tkYXRhLmNhY2hlZEJ1aWxkc1tpXV07CiAgICAg ICAgICAgICAgICAgaWYgKCFpdGVyYXRpb24pIHsKLSAgICAgICAgICAgICAgICAgICAgaXRlcmF0 aW9uID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMsIHBhcnNlSW50KGRhdGEuY2FjaGVkQnVp bGRzW2ldLCAxMCksICEoZGF0YS5jYWNoZWRCdWlsZHNbaV0gaW4gY3VycmVudEJ1aWxkcykpOwor ICAgICAgICAgICAgICAgICAgICBpdGVyYXRpb24gPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhp cywgZGF0YS5jYWNoZWRCdWlsZHNbaV0sICEoZGF0YS5jYWNoZWRCdWlsZHNbaV0gaW4gY3VycmVu dEJ1aWxkcykpOwogICAgICAgICAgICAgICAgICAgICBuZXdJdGVyYXRpb25zLnB1c2goaXRlcmF0 aW9uKTsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5pdGVyYXRpb25zLnB1c2goaXRlcmF0aW9u KTsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fa25vd25JdGVyYXRpb25zW2l0ZXJhdGlvbi5p ZF0gPSBpdGVyYXRpb247CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9N b2NrQnVpbGRib3RRdWV1ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2Nr QnVpbGRib3RRdWV1ZVZpZXcuanMKaW5kZXggY2U2ZmExOTRlNjE2MjNlMDdkOGI0Mzk1Y2I4MDcx Mjk2NDc4ZWU5NS4uYjFlNmU4MjE5MWRhYjIyZTY3NTZjZTA4ZmMxZjFmOWZkMTkzMjQ1MCAxMDA2 NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja0J1aWxkYm90UXVldWVWaWV3 LmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tCdWlsZGJvdFF1ZXVlVmll dy5qcwpAQCAtNDQsNyArNDQsNyBAQCBNb2NrQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIHJldmlzaW9uOiB7Ci0gICAg ICAgICAgICAgICAgIm9wZW5Tb3VyY2UiOiAzMzAyMAorICAgICAgICAgICAgICAgICJvcGVuU291 cmNlIjogIjMzMDIwIgogICAgICAgICAgICAgfQogICAgICAgICB9OwogICAgIH0KZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tUcmFjLmpzIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMKaW5kZXggNjBmNTUwMmI0NTI0YTdkNmRjYjFhZDdi MzY3ZWQ3OGEzOGVlOTc2MS4uYzZiOWM5MGIzN2I1MmJkZjcyY2RiMzUyNDJiMTYzMDM4ODgwMTFj NyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMKKysr IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMKQEAgLTM2LDEyICszNiwx MiBAQCBNb2NrVHJhYy5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgb2xkZXN0UmVjb3JkZWRSZXZp c2lvbk51bWJlcigpCiAgICAgewotICAgICAgICByZXR1cm4gMzMwMTg7CisgICAgICAgIHJldHVy biAiMzMwMTgiOwogICAgIH0sCiAKICAgICBnZXQgbGF0ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJl cigpCiAgICAgewotICAgICAgICByZXR1cm4gMzMwMjI7CisgICAgICAgIHJldHVybiAiMzMwMjIi OwogICAgIH0sCiAKICAgICBsb2FkTW9yZUhpc3RvcmljYWxEYXRhOiBmdW5jdGlvbigpCkBAIC01 MSw3ICs1MSw3IEBAIE1vY2tUcmFjLnByb3RvdHlwZSA9IHsKIAogTW9ja1RyYWMuRVhBTVBMRV9U UkFDX0NPTU1JVFMgPSBbCiAgICAgewotICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAxOCwK KyAgICAgICAgInJldmlzaW9uTnVtYmVyIjogIjMzMDE4IiwKICAgICAgICAgImxpbmsiOiAiaHR0 cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDE4IiwKICAgICAgICAgInRpdGxlIjog eyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKICAgICAgICAgImF1dGhvciI6ICJqb2hu QHdlYmtpdC5vcmciLApAQCAtNjEsNyArNjEsNyBAQCBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09N TUlUUyA9IFsKICAgICAgICAgImJyYW5jaGVzIjogWyJ0cnVuayJdCiAgICAgfSwKICAgICB7Ci0g ICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDE5LAorICAgICAgICAicmV2aXNpb25OdW1iZXIi OiAiMzMwMTkiLAogICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvMzMwMTkiLAogICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNz YWdlIiB9LAogICAgICAgICAiYXV0aG9yIjogInBhdWxAd2Via2l0Lm9yZyIsCkBAIC03MSw3ICs3 MSw3IEBAIE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRTID0gWwogICAgICAgICAiYnJhbmNo ZXMiOiBbInNvbWVPdGhlckJyYW5jaCJdCiAgICAgfSwKICAgICB7Ci0gICAgICAgICJyZXZpc2lv bk51bWJlciI6IDMzMDIwLAorICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAiMzMwMjAiLAogICAg ICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjAiLAog ICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNzYWdlIiB9LAogICAgICAg ICAiYXV0aG9yIjogImdlb3JnZUB3ZWJraXQub3JnIiwKQEAgLTgxLDcgKzgxLDcgQEAgTW9ja1Ry YWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMgPSBbCiAgICAgICAgICJicmFuY2hlcyI6IFsidHJ1bmsi XQogICAgIH0sCiAgICAgewotICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAyMSwKKyAgICAg ICAgInJldmlzaW9uTnVtYmVyIjogIjMzMDIxIiwKICAgICAgICAgImxpbmsiOiAiaHR0cHM6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIxIiwKICAgICAgICAgInRpdGxlIjogeyBpbm5l ckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKICAgICAgICAgImF1dGhvciI6ICJyaW5nb0B3ZWJr aXQub3JnIiwKQEAgLTkxLDcgKzkxLDcgQEAgTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMg PSBbCiAgICAgICAgICJicmFuY2hlcyI6IFsic29tZU90aGVyQnJhbmNoIl0KICAgICB9LAogICAg IHsKLSAgICAgICAgInJldmlzaW9uTnVtYmVyIjogMzMwMjIsCisgICAgICAgICJyZXZpc2lvbk51 bWJlciI6ICIzMzAyMiIsCiAgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8zMzAyMiIsCiAgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0 IG1lc3NhZ2UiIH0sCiAgICAgICAgICJhdXRob3IiOiAiYm9iQHdlYmtpdC5vcmciLApkaWZmIC0t Z2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy90ZXN0cy90ZXN0cy5qcwppbmRleCA0YmFiNGU3Nzk2MWY1ZDYyMTk3OWU1ZjM5MDUz M2Y4MmYzNzQ1ZmYyLi42ZjJhNzNiMmNhYWRkZjQyNzRjN2Q2MWQyOWRmYTc5NWU0MTNiY2FmIDEw MDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcworKysgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcwpAQCAtNzUsMjcgKzc1LDI3IEBAIHRlc3Qo Il9wYXJzZVJldmlzaW9uRnJvbVVSTCIsIGZ1bmN0aW9uKCkKIHRlc3QoIm5leHRSZXZpc2lvbiIs IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnRyYWMucmVjb3JkZWRDb21taXRzID0gTW9ja1RyYWMu RVhBTVBMRV9UUkFDX0NPTU1JVFM7Ci0gICAgc3RyaWN0RXF1YWwodGhpcy50cmFjLm5leHRSZXZp c2lvbigidHJ1bmsiLCAzMzAyMCksIDMzMDIyLCAibmV4dFJldmlzaW9uIHNhbWUgYnJhbmNoIik7 Ci0gICAgc3RyaWN0RXF1YWwodGhpcy50cmFjLm5leHRSZXZpc2lvbigidHJ1bmsiLCAzMzAxOSks IDMzMDIwLCAibmV4dFJldmlzaW9uIGRpZmZlcmVudCBicmFuY2giKTsKKyAgICBzdHJpY3RFcXVh bCh0aGlzLnRyYWMubmV4dFJldmlzaW9uKCJ0cnVuayIsICIzMzAyMCIpLCAiMzMwMjIiLCAibmV4 dFJldmlzaW9uIHNhbWUgYnJhbmNoIik7CisgICAgc3RyaWN0RXF1YWwodGhpcy50cmFjLm5leHRS ZXZpc2lvbigidHJ1bmsiLCAiMzMwMTkiKSwgIjMzMDIwIiwgIm5leHRSZXZpc2lvbiBkaWZmZXJl bnQgYnJhbmNoIik7CiB9KTsKIAogdGVzdCgiaW5kZXhPZlJldmlzaW9uIiwgZnVuY3Rpb24oKQog ewogICAgIHRoaXMudHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNf Q09NTUlUUzsKLSAgICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMuaW5kZXhPZlJldmlzaW9uKDMzMDIw KSwgMiwgImluZGV4T2ZSZXZpc2lvbiIpOworICAgIHN0cmljdEVxdWFsKHRoaXMudHJhYy5pbmRl eE9mUmV2aXNpb24oIjMzMDIwIiksIDIsICJpbmRleE9mUmV2aXNpb24iKTsKIH0pOwogCiB0ZXN0 KCJjb21taXRzT25CcmFuY2hMYXRlclRoYW5SZXZpc2lvbiIsIGZ1bmN0aW9uKCkKIHsKICAgICB0 aGlzLnRyYWMucmVjb3JkZWRDb21taXRzID0gTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFM7 Ci0gICAgdmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMuY29tbWl0c09uQnJhbmNoTGF0ZXJUaGFuUmV2 aXNpb24oInRydW5rIiwgMzMwMjApOworICAgIHZhciBjb21taXRzID0gdGhpcy50cmFjLmNvbW1p dHNPbkJyYW5jaExhdGVyVGhhblJldmlzaW9uKCJ0cnVuayIsICIzMzAyMCIpOwogICAgIGVxdWFs KGNvbW1pdHMubGVuZ3RoLCAxLCAiZ3JlYXRlciB0aGFuIDMzMDIwIik7CiB9KTsKIAogdGVzdCgi Y29tbWl0c09uQnJhbmNoSW5SZXZpc2lvblJhbmdlIiwgZnVuY3Rpb24oKQogewogICAgIHRoaXMu dHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUzsKLSAg ICB2YXIgY29tbWl0cyA9IHRoaXMudHJhYy5jb21taXRzT25CcmFuY2hJblJldmlzaW9uUmFuZ2Uo InRydW5rIiwgMzMwMjAsIDMzMDIyKTsKKyAgICB2YXIgY29tbWl0cyA9IHRoaXMudHJhYy5jb21t aXRzT25CcmFuY2hJblJldmlzaW9uUmFuZ2UoInRydW5rIiwgIjMzMDIwIiwgIjMzMDIyIik7CiAg ICAgZXF1YWwoY29tbWl0cy5sZW5ndGgsIDIsICJpbiByYW5nZSAzMzAyMCwgMzMwMjIiKTsKIH0p OwogCkBAIC0xMjcsNyArMTI3LDcgQEAgdGVzdCgiX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50 IiwgZnVuY3Rpb24oKQogCiB0ZXN0KCJfcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UiLCBmdW5j dGlvbigpCiB7Ci0gICAgdmFyIGxpbmVzID0gdGhpcy52aWV3Ll9wb3BvdmVyTGluZXNGb3JDb21t aXRSYW5nZSh0aGlzLnRyYWMsIHRoaXMudHJ1bmtCcmFuY2gsIDMzMDE4LCAzMzAyMCk7CisgICAg dmFyIGxpbmVzID0gdGhpcy52aWV3Ll9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5nZSh0aGlzLnRy YWMsIHRoaXMudHJ1bmtCcmFuY2gsICIzMzAxOCIsICIzMzAyMCIpOwogICAgIHN0cmljdEVxdWFs KGxpbmVzLmxlbmd0aCwgMiwgImhhcyAyIGxpbmVzIik7CiB9KTsKIApAQCAtMTQ3LDggKzE0Nyw4 IEBAIHRlc3QoIl9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFuZ2UiLCBmdW5jdGlvbigpCiAg ICAgdmFyIGNvbnRleHQgPSB7CiAgICAgICAgIHRyYWM6IHRoaXMudHJhYywKICAgICAgICAgYnJh bmNoOiB0aGlzLnRydW5rQnJhbmNoLAotICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAxOCwKLSAg ICAgICAgbGFzdFJldmlzaW9uOiAzMzAyMAorICAgICAgICBmaXJzdFJldmlzaW9uOiAiMzMwMTgi LAorICAgICAgICBsYXN0UmV2aXNpb246ICIzMzAyMCIKICAgICB9OwogICAgIHRoaXMudmlldy5f cHJlc2VudFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlKGVsZW1lbnQsIHBvcG92ZXIsIGNvbnRleHQp OwogICAgIHZhciBub2RlTGlzdCA9IHBvcG92ZXIuX2VsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNz TmFtZSgicGVuZGluZy1jb21taXQiKTsKQEAgLTE2Miw4ICsxNjIsOCBAQCB0ZXN0KCJfcHJlc2Vu dFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlIG5vIGNvbW1pdHMiLCBmdW5jdGlvbigpCiAgICAgdmFy IGNvbnRleHQgPSB7CiAgICAgICAgIHRyYWM6IHRoaXMudHJhYywKICAgICAgICAgYnJhbmNoOiB0 aGlzLnRydW5rQnJhbmNoLAotICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAyMCwKLSAgICAgICAg bGFzdFJldmlzaW9uOiAzMzAxOAorICAgICAgICBmaXJzdFJldmlzaW9uOiAiMzMwMjAiLAorICAg ICAgICBsYXN0UmV2aXNpb246ICIzMzAxOCIKICAgICB9OwogICAgIHRoaXMudmlldy5fcHJlc2Vu dFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlKGVsZW1lbnQsIHBvcG92ZXIsIGNvbnRleHQpOwogICAg IHZhciBub2RlTGlzdCA9IHBvcG92ZXIuX2VsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgi cGVuZGluZy1jb21taXQiKTsKQEAgLTE3NCw3ICsxNzQsNyBAQCB0ZXN0KCJfcmV2aXNpb25Db250 ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24iLCBmdW5jdGlvbigpCiB7CiAgICAgdmFyIGZpbmlz aGVkID0gZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0 aGlzLnF1ZXVlLCAxLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9uLnJldmlzaW9uID0geyAib3Bl blNvdXJjZSI6IDMzMDE4IH07CisgICAgaXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJj ZSI6ICIzMzAxOCIgfTsKICAgICB2YXIgcHJldmlvdXNJdGVyYXRpb24gPSBudWxsOwogICAgIHZh ciBjb250ZW50ID0gdGhpcy52aWV3Ll9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJh dGlvbihpdGVyYXRpb24sIHByZXZpb3VzSXRlcmF0aW9uLCB0aGlzLnRydW5rQnJhbmNoKTsKICAg ICBzdHJpY3RFcXVhbChjb250ZW50LmlubmVySFRNTCwgInIzMzAxOCIsICJzaG91bGQgaGF2ZSBj b3JyZWN0IHJldmlzaW9uIG51bWJlci4iKTsKQEAgLTE4Niw5ICsxODYsOSBAQCB0ZXN0KCJfcmV2 aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24gaGFzIHByZXZpb3VzSXRlcmF0aW9u IiwgZnVuY3Rpb24oKQogewogICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVy YXRpb24gPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMiwgZmluaXNoZWQpOwot ICAgIGl0ZXJhdGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAyMiB9OworICAgIGl0 ZXJhdGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAiMzMwMjIiIH07CiAgICAgdmFyIHBy ZXZpb3VzSXRlcmF0aW9uID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZp bmlzaGVkKTsKLSAgICBwcmV2aW91c0l0ZXJhdGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2Ui OiAzMzAxOCB9OworICAgIHByZXZpb3VzSXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJj ZSI6ICIzMzAxOCIgfTsKICAgICB2YXIgY29udGVudCA9IHRoaXMudmlldy5fcmV2aXNpb25Db250 ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0l0ZXJhdGlvbiwg dGhpcy50cnVua0JyYW5jaCk7CiAgICAgc3RyaWN0RXF1YWwoY29udGVudC5pbm5lckhUTUwsICJy MzMwMjIiLCAic2hvdWxkIGhhdmUgY29ycmVjdCByZXZpc2lvbiBudW1iZXIuIik7CiAgICAgc3Ry aWN0RXF1YWwoY29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInJldmlzaW9uLW51bWJlciIpLCB0 cnVlLCAic2hvdWxkIGhhdmUgY2xhc3MgJ3JldmlzaW9uLW51bWJlcicuIik7CkBAIC0yMDUsNyAr MjA1LDcgQEAgdGVzdCgiX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSBTdWJ2ZXJzaW9uIiwgZnVu Y3Rpb24oKQogICAgIHZhciByZXBvc2l0b3J5ID0gdGhpcy50cnVua0JyYW5jaC5yZXBvc2l0b3J5 OwogICAgIHJlcG9zaXRvcnkuaXNTVk4gPSB0cnVlOwogICAgIHJlcG9zaXRvcnkuaXNHaXQgPSBm YWxzZTsKLSAgICBzdHJpY3RFcXVhbCh0aGlzLnZpZXcuX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxh eSgzMzAxOCwgcmVwb3NpdG9yeSksICJyMzMwMTgiLCAiU2hvdWxkIGJlIHIzMzAxOCIpCisgICAg c3RyaWN0RXF1YWwodGhpcy52aWV3Ll9mb3JtYXRSZXZpc2lvbkZvckRpc3BsYXkoIjMzMDE4Iiwg cmVwb3NpdG9yeSksICJyMzMwMTgiLCAiU2hvdWxkIGJlIHIzMzAxOCIpCiB9KTsKIAogdGVzdCgi X2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSBHaXQiLCBmdW5jdGlvbigpCkBAIC0yMzQsOCArMjM0 LDggQEAgdGVzdCgiY29tcGFyZUl0ZXJhdGlvbnMgYnkgcmV2aXNpb25zIiwgZnVuY3Rpb24oKQog ICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24xID0gbmV3IEJ1aWxk Ym90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRlcmF0aW9u MiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7Ci0gICAg aXRlcmF0aW9uMS5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9OwotICAgIGl0ZXJh dGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVyYXRpb24x LnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOCIgfTsKKyAgICBpdGVyYXRpb24yLnJl dmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24xLmxvYWRl ZCA9IHRydWU7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSB0cnVlOwogICAgIG9rKHRoaXMucXVl dWUuY29tcGFyZUl0ZXJhdGlvbnMoaXRlcmF0aW9uMiwgaXRlcmF0aW9uMSkgPCAwLCAiY29tcGFy ZUl0ZXJhdGlvbnM6IGxlc3MgdGhhbiIpOwpAQCAtMjQ5LDcgKzI0OSw3IEBAIHRlc3QoImNvbXBh cmVJdGVyYXRpb25zIGJ5IGxvYWRlZCAob25lIHJldmlzaW9uIG1pc3NpbmcpIiwgZnVuY3Rpb24o KQogICAgIHZhciBpdGVyYXRpb24xID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUs IDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRlcmF0aW9uMiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlv bih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7CiAgICAgaXRlcmF0aW9uMS5yZXZpc2lvbiA9IHt9 OwotICAgIGl0ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAg ICBpdGVyYXRpb24yLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBp dGVyYXRpb24xLmxvYWRlZCA9IGZhbHNlOwogICAgIGl0ZXJhdGlvbjIubG9hZGVkID0gdHJ1ZTsK ICAgICBvayh0aGlzLnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjEsIGl0ZXJhdGlv bjIpID4gMCwgImNvbXBhcmVJdGVyYXRpb25zOiBncmVhdGVyIHRoYW4iKTsKQEAgLTI2MSw4ICsy NjEsOCBAQCB0ZXN0KCJjb21wYXJlSXRlcmF0aW9ucyBieSBsb2FkZWQgKHNhbWUgcmV2aXNpb24p IiwgZnVuY3Rpb24oKQogICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRp b24xID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAg ICB2YXIgaXRlcmF0aW9uMiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBm aW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9uMS5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAx OSB9OwotICAgIGl0ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsK KyAgICBpdGVyYXRpb24xLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKKyAg ICBpdGVyYXRpb24yLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBp dGVyYXRpb24xLmxvYWRlZCA9IGZhbHNlOwogICAgIGl0ZXJhdGlvbjIubG9hZGVkID0gdHJ1ZTsK ICAgICBvayh0aGlzLnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjEsIGl0ZXJhdGlv bjIpID4gMCwgImNvbXBhcmVJdGVyYXRpb25zOiBncmVhdGVyIHRoYW4iKTsKQEAgLTI4OCw4ICsy ODgsOCBAQCB0ZXN0KCJjb21wYXJlSXRlcmF0aW9ucyBieSBpZCAoc2FtZSByZXZpc2lvbikiLCBm dW5jdGlvbigpCiAgICAgdmFyIGZpbmlzaGVkID0gZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbjEg PSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwogICAgIHZh ciBpdGVyYXRpb24yID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlz aGVkKTsKLSAgICBpdGVyYXRpb24xLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE5IH07 Ci0gICAgaXRlcmF0aW9uMi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOSB9OworICAg IGl0ZXJhdGlvbjEucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OworICAgIGl0 ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OwogICAgIGl0ZXJh dGlvbjEubG9hZGVkID0gZmFsc2U7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSBmYWxzZTsKICAg ICBvayh0aGlzLnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjIsIGl0ZXJhdGlvbjEp IDwgMCwgImNvbXBhcmVJdGVyYXRpb25zOiBsZXNzIHRoYW4iKTsKQEAgLTMwMiw4ICszMDIsOCBA QCB0ZXN0KCJjb21wYXJlSXRlcmF0aW9uc0J5UmV2aXNpb25zIiwgZnVuY3Rpb24oKQogICAgIHZh ciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24xID0gbmV3IEJ1aWxkYm90SXRl cmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRlcmF0aW9uMiA9IG5l dyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0 aW9uMS5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9OwotICAgIGl0ZXJhdGlvbjIu cmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVyYXRpb24xLnJldmlz aW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOCIgfTsKKyAgICBpdGVyYXRpb24yLnJldmlzaW9u ID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24xLmxvYWRlZCA9IHRy dWU7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSBmYWxzZTsKICAgICBvayh0aGlzLnF1ZXVlLmNv bXBhcmVJdGVyYXRpb25zQnlSZXZpc2lvbnMoaXRlcmF0aW9uMiwgaXRlcmF0aW9uMSkgPCAwLCAi Y29tcGFyZUl0ZXJhdGlvbnNCeVJldmlzaW9uczogbGVzcyB0aGFuIik7Cg== 270709 2016-02-04 17:48:43 -0800 2016-02-05 15:28:09 -0800 Patch bug-153820-20160204174820.patch text/plain 16165 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MTU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDE4MmU1MGFjYWM2ZGU0YjlmOTZmZjZhNDc0MzRlZTkw YTVmN2UwYy4uOGE0NTYzNjQ0NTlmNzM0NmUwMzcwMTljZjExMjQxYjdjYTQ1NDQ0YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDE2LTAyLTA0ICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIFJlbW92ZSBjYWxscyB0byBwYXJzZUludCBpbiBvcmRlciB0byB3b3JrIHdpdGggbm9u LWludGVnZXIgcmV2aXNpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTM4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzOgorICAgICAg ICAoQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlLnNvdXJjZVN0YW1wQ2hhbmdlcyk6IFJlbW92 ZSBjYWxscyB0byBwYXJzZUludCBpbiBvcmRlciB0byB3b3JrIHdpdGggbm9uLWludGVnZXIKKyAg ICAgICAgcmV2aXNpb25zLgorICAgICAgICAoQnVpbGRib3RJdGVyYXRpb24ucHJvdG90eXBlLl9w YXJzZURhdGEpOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZS5wcm90b3R5cGUudXBkYXRlKTogRGl0dG8uCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja0J1aWxkYm90UXVldWVWaWV3LmpzOgor ICAgICAgICAoTW9ja0J1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fbGF0ZXN0UHJvZHVjdGl2 ZUl0ZXJhdGlvbik6IENoYW5nZSBpbnRlZ2VycyB0byBzdHJpbmdzIGluIHRlc3QgY29kZS4KKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qczoKKyAgICAgICAgKE1vY2tU cmFjLnByb3RvdHlwZS5nZXQgb2xkZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcik6IERpdHRvLgor ICAgICAgICAoTW9ja1RyYWMucHJvdG90eXBlLmdldCBsYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVt YmVyKTogRGl0dG8uCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanM6IERp dHRvLgorCisyMDE2LTAyLTA0ICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgor CiAgICAgICAgIFRlYWNoIGRhc2hib2FyZCBjb2RlIHRvIGNvbXBhcmUgbm9uLWludGVnZXIgcmV2 aXNpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTIzNDUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRp b24uanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcwppbmRleCAz Nzc4NGVjODVlNjQ0ZmQwOWNlNjI2Njk4ZTI5NjZlYzJmMjJjMWI5Li5lMjhjMzFlM2ZjNTMxN2Y2 YjgyMWZlMWI2YTFlYThhNGVkNzJkMTdmIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJv dEl0ZXJhdGlvbi5qcwpAQCAtMjE0LDE3ICsyMTQsMTQgQEAgQnVpbGRib3RJdGVyYXRpb24ucHJv dG90eXBlID0gewogICAgICAgICAgICAgICAgIGZhbGxiYWNrS2V5ID0gbnVsbDsKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIHZhciByZXZpc2lvbiA9IHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShy ZXZpc2lvblByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KTsKLSAgICAgICAgICAgIGlmIChyZXBv c2l0b3J5LmlzU1ZOKQotICAgICAgICAgICAgICAgIHRoaXMucmV2aXNpb25bcmVwb3NpdG9yeU5h bWVdID0gcGFyc2VJbnQocmV2aXNpb24pOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIHRoaXMucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdID0gcmV2aXNpb247CisgICAgICAgICAg ICB0aGlzLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSA9IHJldmlzaW9uOwogICAgICAgICB9CiAK ICAgICAgICAgZnVuY3Rpb24gc291cmNlU3RhbXBDaGFuZ2VzKHNvdXJjZVN0YW1wKSB7CiAgICAg ICAgICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgICAgICAgICB2YXIgY2hhbmdlcyA9IHNvdXJj ZVN0YW1wLmNoYW5nZXM7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNoYW5nZXMu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgY2hhbmdlID0geyByZXZpc2lvbk51 bWJlcjogcGFyc2VJbnQoY2hhbmdlc1tpXS5yZXZpc2lvbiwgMTApIH0KKyAgICAgICAgICAgICAg ICB2YXIgY2hhbmdlID0geyByZXZpc2lvbk51bWJlcjogY2hhbmdlc1tpXS5yZXZpc2lvbiB9CiAg ICAgICAgICAgICAgICAgaWYgKGNoYW5nZXNbaV0ucmVwb3NpdG9yeSkKICAgICAgICAgICAgICAg ICAgICAgY2hhbmdlLnJlcG9zaXRvcnkgPSBjaGFuZ2VzW2ldLnJlcG9zaXRvcnk7CiAgICAgICAg ICAgICAgICAgaWYgKGNoYW5nZXNbaV0uYnJhbmNoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 UXVldWUuanMKaW5kZXggYmU3Mjk3NTUxYzdiYTc4OTk3N2Y1NDg2MTA3OGNiNDczM2Q2YmI1MS4u Y2JkZWI0YzU1Y2ZmNWZjZDFjMzg1NjdmYTllOGVkZDQ5ODBhMmYzYyAxMDA2NDQKLS0tIGEvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZS5qcworKysgYi9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9CdWlsZGJvdFF1ZXVlLmpzCkBAIC0yMDksNyArMjA5LDcgQEAgQnVpbGRib3RRdWV1ZS5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gZGF0YS5jYWNoZWRCdWlsZHMu bGVuZ3RoIC0gMTsgaSA+PSAwOyAtLWkpIHsKICAgICAgICAgICAgICAgICB2YXIgaXRlcmF0aW9u ID0gdGhpcy5fa25vd25JdGVyYXRpb25zW2RhdGEuY2FjaGVkQnVpbGRzW2ldXTsKICAgICAgICAg ICAgICAgICBpZiAoIWl0ZXJhdGlvbikgewotICAgICAgICAgICAgICAgICAgICBpdGVyYXRpb24g PSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcywgcGFyc2VJbnQoZGF0YS5jYWNoZWRCdWlsZHNb aV0sIDEwKSwgIShkYXRhLmNhY2hlZEJ1aWxkc1tpXSBpbiBjdXJyZW50QnVpbGRzKSk7CisgICAg ICAgICAgICAgICAgICAgIGl0ZXJhdGlvbiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLCBk YXRhLmNhY2hlZEJ1aWxkc1tpXSwgIShkYXRhLmNhY2hlZEJ1aWxkc1tpXSBpbiBjdXJyZW50QnVp bGRzKSk7CiAgICAgICAgICAgICAgICAgICAgIG5ld0l0ZXJhdGlvbnMucHVzaChpdGVyYXRpb24p OwogICAgICAgICAgICAgICAgICAgICB0aGlzLml0ZXJhdGlvbnMucHVzaChpdGVyYXRpb24pOwog ICAgICAgICAgICAgICAgICAgICB0aGlzLl9rbm93bkl0ZXJhdGlvbnNbaXRlcmF0aW9uLmlkXSA9 IGl0ZXJhdGlvbjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tC dWlsZGJvdFF1ZXVlVmlldy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tCdWls ZGJvdFF1ZXVlVmlldy5qcwppbmRleCBjZTZmYTE5NGU2MTYyM2UwN2Q4YjQzOTVjYjgwNzEyOTY0 NzhlZTk1Li5iMWU2ZTgyMTkxZGFiMjJlNjc1NmNlMDhmYzFmMWY5ZmQxOTMyNDUwIDEwMDY0NAot LS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrQnVpbGRib3RRdWV1ZVZpZXcuanMK KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja0J1aWxkYm90UXVldWVWaWV3Lmpz CkBAIC00NCw3ICs0NCw3IEBAIE1vY2tCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAg ICAgewogICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgcmV2aXNpb246IHsKLSAgICAgICAg ICAgICAgICAib3BlblNvdXJjZSI6IDMzMDIwCisgICAgICAgICAgICAgICAgIm9wZW5Tb3VyY2Ui OiAiMzMwMjAiCiAgICAgICAgICAgICB9CiAgICAgICAgIH07CiAgICAgfQpkaWZmIC0tZ2l0IGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMgYi9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy90ZXN0cy9Nb2NrVHJhYy5qcwppbmRleCA2MGY1NTAyYjQ1MjRhN2Q2ZGNiMWFkN2IzNjdl ZDc4YTM4ZWU5NzYxLi5jNmI5YzkwYjM3YjUyYmRmNzJjZGIzNTI0MmIxNjMwMzg4ODAxMWM3IDEw MDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qcworKysgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qcwpAQCAtMzYsMTIgKzM2LDEyIEBA IE1vY2tUcmFjLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBvbGRlc3RSZWNvcmRlZFJldmlzaW9u TnVtYmVyKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAzMzAxODsKKyAgICAgICAgcmV0dXJuICIz MzAxOCI7CiAgICAgfSwKIAogICAgIGdldCBsYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiAzMzAyMjsKKyAgICAgICAgcmV0dXJuICIzMzAyMiI7CiAg ICAgfSwKIAogICAgIGxvYWRNb3JlSGlzdG9yaWNhbERhdGE6IGZ1bmN0aW9uKCkKQEAgLTUxLDcg KzUxLDcgQEAgTW9ja1RyYWMucHJvdG90eXBlID0gewogCiBNb2NrVHJhYy5FWEFNUExFX1RSQUNf Q09NTUlUUyA9IFsKICAgICB7Ci0gICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDE4LAorICAg ICAgICAicmV2aXNpb25OdW1iZXIiOiAiMzMwMTgiLAogICAgICAgICAibGluayI6ICJodHRwczov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMTgiLAogICAgICAgICAidGl0bGUiOiB7IGlu bmVySFRNTDogImNvbW1pdCBtZXNzYWdlIiB9LAogICAgICAgICAiYXV0aG9yIjogImpvaG5Ad2Vi a2l0Lm9yZyIsCkBAIC02MSw3ICs2MSw3IEBAIE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRT ID0gWwogICAgICAgICAiYnJhbmNoZXMiOiBbInRydW5rIl0KICAgICB9LAogICAgIHsKLSAgICAg ICAgInJldmlzaW9uTnVtYmVyIjogMzMwMTksCisgICAgICAgICJyZXZpc2lvbk51bWJlciI6ICIz MzAxOSIsCiAgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNl dC8zMzAxOSIsCiAgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2Ui IH0sCiAgICAgICAgICJhdXRob3IiOiAicGF1bEB3ZWJraXQub3JnIiwKQEAgLTcxLDcgKzcxLDcg QEAgTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMgPSBbCiAgICAgICAgICJicmFuY2hlcyI6 IFsic29tZU90aGVyQnJhbmNoIl0KICAgICB9LAogICAgIHsKLSAgICAgICAgInJldmlzaW9uTnVt YmVyIjogMzMwMjAsCisgICAgICAgICJyZXZpc2lvbk51bWJlciI6ICIzMzAyMCIsCiAgICAgICAg ICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyMCIsCiAgICAg ICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCiAgICAgICAgICJh dXRob3IiOiAiZ2VvcmdlQHdlYmtpdC5vcmciLApAQCAtODEsNyArODEsNyBAQCBNb2NrVHJhYy5F WEFNUExFX1RSQUNfQ09NTUlUUyA9IFsKICAgICAgICAgImJyYW5jaGVzIjogWyJ0cnVuayJdCiAg ICAgfSwKICAgICB7Ci0gICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDIxLAorICAgICAgICAi cmV2aXNpb25OdW1iZXIiOiAiMzMwMjEiLAogICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjEiLAogICAgICAgICAidGl0bGUiOiB7IGlubmVySFRN TDogImNvbW1pdCBtZXNzYWdlIiB9LAogICAgICAgICAiYXV0aG9yIjogInJpbmdvQHdlYmtpdC5v cmciLApAQCAtOTEsNyArOTEsNyBAQCBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUyA9IFsK ICAgICAgICAgImJyYW5jaGVzIjogWyJzb21lT3RoZXJCcmFuY2giXQogICAgIH0sCiAgICAgewot ICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAyMiwKKyAgICAgICAgInJldmlzaW9uTnVtYmVy IjogIjMzMDIyIiwKICAgICAgICAgImxpbmsiOiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzMzMDIyIiwKICAgICAgICAgInRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVz c2FnZSIgfSwKICAgICAgICAgImF1dGhvciI6ICJib2JAd2Via2l0Lm9yZyIsCmRpZmYgLS1naXQg YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL3Rlc3RzL3Rlc3RzLmpzCmluZGV4IDA5NjJhNGU2Y2ZhNmFhNzBhNzJlOGEyNTRjODQ2MWFh N2E5ZDFmZTYuLmE4ZTYyZDUxYjBlZjdhNjUwNmQ0ZTBlNjVmMzA1ZDIzNzk5MGFhZGYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzCisrKyBiL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzCkBAIC03NSwzNCArNzUsMzQgQEAgdGVzdCgiX3Bh cnNlUmV2aXNpb25Gcm9tVVJMIiwgZnVuY3Rpb24oKQogdGVzdCgibmV4dFJldmlzaW9uIiwgZnVu Y3Rpb24oKQogewogICAgIHRoaXMudHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFN UExFX1RSQUNfQ09NTUlUUzsKLSAgICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMubmV4dFJldmlzaW9u KCJ0cnVuayIsIDMzMDIwKSwgMzMwMjIsICJuZXh0UmV2aXNpb24gc2FtZSBicmFuY2giKTsKLSAg ICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMubmV4dFJldmlzaW9uKCJ0cnVuayIsIDMzMDE5KSwgMzMw MjAsICJuZXh0UmV2aXNpb24gZGlmZmVyZW50IGJyYW5jaCIpOworICAgIHN0cmljdEVxdWFsKHRo aXMudHJhYy5uZXh0UmV2aXNpb24oInRydW5rIiwgIjMzMDIwIiksICIzMzAyMiIsICJuZXh0UmV2 aXNpb24gc2FtZSBicmFuY2giKTsKKyAgICBzdHJpY3RFcXVhbCh0aGlzLnRyYWMubmV4dFJldmlz aW9uKCJ0cnVuayIsICIzMzAxOSIpLCAiMzMwMjAiLCAibmV4dFJldmlzaW9uIGRpZmZlcmVudCBi cmFuY2giKTsKIH0pOwogCiB0ZXN0KCJpbmRleE9mUmV2aXNpb24iLCBmdW5jdGlvbigpCiB7CiAg ICAgdGhpcy50cmFjLnJlY29yZGVkQ29tbWl0cyA9IE1vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01N SVRTOwotICAgIHN0cmljdEVxdWFsKHRoaXMudHJhYy5pbmRleE9mUmV2aXNpb24oMzMwMjApLCAy LCAiaW5kZXhPZlJldmlzaW9uIik7CisgICAgc3RyaWN0RXF1YWwodGhpcy50cmFjLmluZGV4T2ZS ZXZpc2lvbigiMzMwMjAiKSwgMiwgImluZGV4T2ZSZXZpc2lvbiIpOwogfSk7CiAKIHRlc3QoImNv bW1pdHNPbkJyYW5jaExhdGVyVGhhblJldmlzaW9uIiwgZnVuY3Rpb24oKQogewogICAgIHRoaXMu dHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09NTUlUUzsKLSAg ICB2YXIgY29tbWl0cyA9IHRoaXMudHJhYy5jb21taXRzT25CcmFuY2hMYXRlclRoYW5SZXZpc2lv bigidHJ1bmsiLCAzMzAyMCk7CisgICAgdmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMuY29tbWl0c09u QnJhbmNoTGF0ZXJUaGFuUmV2aXNpb24oInRydW5rIiwgIjMzMDIwIik7CiAgICAgZXF1YWwoY29t bWl0cy5sZW5ndGgsIDEsICJncmVhdGVyIHRoYW4gMzMwMjAiKTsKIH0pOwogCiB0ZXN0KCJjb21t aXRzT25CcmFuY2hMYXRlclRoYW5SZXZpc2lvbiBubyBjb21taXRzIiwgZnVuY3Rpb24oKQogewog ICAgIHRoaXMudHJhYy5yZWNvcmRlZENvbW1pdHMgPSBNb2NrVHJhYy5FWEFNUExFX1RSQUNfQ09N TUlUUzsKLSAgICB2YXIgY29tbWl0cyA9IHRoaXMudHJhYy5jb21taXRzT25CcmFuY2hMYXRlclRo YW5SZXZpc2lvbigic29tZU90aGVyQnJhbmNoIiwgMzMwMjEpOworICAgIHZhciBjb21taXRzID0g dGhpcy50cmFjLmNvbW1pdHNPbkJyYW5jaExhdGVyVGhhblJldmlzaW9uKCJzb21lT3RoZXJCcmFu Y2giLCAiMzMwMjEiKTsKICAgICBlcXVhbChjb21taXRzLmxlbmd0aCwgMCwgImdyZWF0ZXIgdGhh biAzMzAyMSIpOwogfSk7CiAKIHRlc3QoImNvbW1pdHNPbkJyYW5jaEluUmV2aXNpb25SYW5nZSIs IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnRyYWMucmVjb3JkZWRDb21taXRzID0gTW9ja1RyYWMu RVhBTVBMRV9UUkFDX0NPTU1JVFM7Ci0gICAgdmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMuY29tbWl0 c09uQnJhbmNoSW5SZXZpc2lvblJhbmdlKCJ0cnVuayIsIDMzMDIwLCAzMzAyMik7CisgICAgdmFy IGNvbW1pdHMgPSB0aGlzLnRyYWMuY29tbWl0c09uQnJhbmNoSW5SZXZpc2lvblJhbmdlKCJ0cnVu ayIsICIzMzAyMCIsICIzMzAyMiIpOwogICAgIGVxdWFsKGNvbW1pdHMubGVuZ3RoLCAyLCAiaW4g cmFuZ2UgMzMwMjAsIDMzMDIyIik7CiB9KTsKIApAQCAtMTM0LDcgKzEzNCw3IEBAIHRlc3QoIl9h cHBlbmRQZW5kaW5nUmV2aXNpb25Db3VudCIsIGZ1bmN0aW9uKCkKIAogdGVzdCgiX3BvcG92ZXJM aW5lc0ZvckNvbW1pdFJhbmdlIiwgZnVuY3Rpb24oKQogewotICAgIHZhciBsaW5lcyA9IHRoaXMu dmlldy5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UodGhpcy50cmFjLCB0aGlzLnRydW5rQnJh bmNoLCAzMzAxOCwgMzMwMjApOworICAgIHZhciBsaW5lcyA9IHRoaXMudmlldy5fcG9wb3Zlckxp bmVzRm9yQ29tbWl0UmFuZ2UodGhpcy50cmFjLCB0aGlzLnRydW5rQnJhbmNoLCAiMzMwMTgiLCAi MzMwMjAiKTsKICAgICBzdHJpY3RFcXVhbChsaW5lcy5sZW5ndGgsIDIsICJoYXMgMiBsaW5lcyIp OwogfSk7CiAKQEAgLTE2Miw3ICsxNjIsNyBAQCB0ZXN0KCJfcHJlc2VudFBvcG92ZXJGb3JQZW5k aW5nQ29tbWl0cyBubyBwZW5kaW5nIGNvbW1pdHMiLCBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICByZXR1cm4gewogICAgICAgICAgICAgcmV2aXNpb246IHsKLSAgICAgICAgICAgICAgICAib3Bl blNvdXJjZSI6IDMzMDIxCisgICAgICAgICAgICAgICAgIm9wZW5Tb3VyY2UiOiAiMzMwMjEiCiAg ICAgICAgICAgICB9CiAgICAgICAgIH07CiAgICAgfQpAQCAtMTgwLDggKzE4MCw4IEBAIHRlc3Qo Il9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFuZ2UiLCBmdW5jdGlvbigpCiAgICAgdmFyIGNv bnRleHQgPSB7CiAgICAgICAgIHRyYWM6IHRoaXMudHJhYywKICAgICAgICAgYnJhbmNoOiB0aGlz LnRydW5rQnJhbmNoLAotICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAxOCwKLSAgICAgICAgbGFz dFJldmlzaW9uOiAzMzAyMAorICAgICAgICBmaXJzdFJldmlzaW9uOiAiMzMwMTgiLAorICAgICAg ICBsYXN0UmV2aXNpb246ICIzMzAyMCIKICAgICB9OwogICAgIHRoaXMudmlldy5fcHJlc2VudFBv cG92ZXJGb3JSZXZpc2lvblJhbmdlKGVsZW1lbnQsIHBvcG92ZXIsIGNvbnRleHQpOwogICAgIHZh ciBub2RlTGlzdCA9IHBvcG92ZXIuX2VsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgicGVu ZGluZy1jb21taXQiKTsKQEAgLTE5NSw4ICsxOTUsOCBAQCB0ZXN0KCJfcHJlc2VudFBvcG92ZXJG b3JSZXZpc2lvblJhbmdlIG5vIGNvbW1pdHMiLCBmdW5jdGlvbigpCiAgICAgdmFyIGNvbnRleHQg PSB7CiAgICAgICAgIHRyYWM6IHRoaXMudHJhYywKICAgICAgICAgYnJhbmNoOiB0aGlzLnRydW5r QnJhbmNoLAotICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAyMCwKLSAgICAgICAgbGFzdFJldmlz aW9uOiAzMzAxOAorICAgICAgICBmaXJzdFJldmlzaW9uOiAiMzMwMjAiLAorICAgICAgICBsYXN0 UmV2aXNpb246ICIzMzAxOCIKICAgICB9OwogICAgIHRoaXMudmlldy5fcHJlc2VudFBvcG92ZXJG b3JSZXZpc2lvblJhbmdlKGVsZW1lbnQsIHBvcG92ZXIsIGNvbnRleHQpOwogICAgIHZhciBub2Rl TGlzdCA9IHBvcG92ZXIuX2VsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgicGVuZGluZy1j b21taXQiKTsKQEAgLTIwNyw3ICsyMDcsNyBAQCB0ZXN0KCJfcmV2aXNpb25Db250ZW50V2l0aFBv cG92ZXJGb3JJdGVyYXRpb24iLCBmdW5jdGlvbigpCiB7CiAgICAgdmFyIGZpbmlzaGVkID0gZmFs c2U7CiAgICAgdmFyIGl0ZXJhdGlvbiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVl LCAxLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6 IDMzMDE4IH07CisgICAgaXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAx OCIgfTsKICAgICB2YXIgcHJldmlvdXNJdGVyYXRpb24gPSBudWxsOwogICAgIHZhciBjb250ZW50 ID0gdGhpcy52aWV3Ll9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbihpdGVy YXRpb24sIHByZXZpb3VzSXRlcmF0aW9uLCB0aGlzLnRydW5rQnJhbmNoKTsKICAgICBzdHJpY3RF cXVhbChjb250ZW50LmlubmVySFRNTCwgInIzMzAxOCIsICJzaG91bGQgaGF2ZSBjb3JyZWN0IHJl dmlzaW9uIG51bWJlci4iKTsKQEAgLTIxOSw5ICsyMTksOSBAQCB0ZXN0KCJfcmV2aXNpb25Db250 ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24gaGFzIHByZXZpb3VzSXRlcmF0aW9uIiwgZnVuY3Rp b24oKQogewogICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24gPSBu ZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMiwgZmluaXNoZWQpOwotICAgIGl0ZXJh dGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAyMiB9OworICAgIGl0ZXJhdGlvbi5y ZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAiMzMwMjIiIH07CiAgICAgdmFyIHByZXZpb3VzSXRl cmF0aW9uID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsK LSAgICBwcmV2aW91c0l0ZXJhdGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9 OworICAgIHByZXZpb3VzSXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAx OCIgfTsKICAgICB2YXIgY29udGVudCA9IHRoaXMudmlldy5fcmV2aXNpb25Db250ZW50V2l0aFBv cG92ZXJGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0l0ZXJhdGlvbiwgdGhpcy50cnVu a0JyYW5jaCk7CiAgICAgc3RyaWN0RXF1YWwoY29udGVudC5pbm5lckhUTUwsICJyMzMwMjIiLCAi c2hvdWxkIGhhdmUgY29ycmVjdCByZXZpc2lvbiBudW1iZXIuIik7CiAgICAgc3RyaWN0RXF1YWwo Y29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInJldmlzaW9uLW51bWJlciIpLCB0cnVlLCAic2hv dWxkIGhhdmUgY2xhc3MgJ3JldmlzaW9uLW51bWJlcicuIik7CkBAIC0yMzgsNyArMjM4LDcgQEAg dGVzdCgiX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSBTdWJ2ZXJzaW9uIiwgZnVuY3Rpb24oKQog ICAgIHZhciByZXBvc2l0b3J5ID0gdGhpcy50cnVua0JyYW5jaC5yZXBvc2l0b3J5OwogICAgIHJl cG9zaXRvcnkuaXNTVk4gPSB0cnVlOwogICAgIHJlcG9zaXRvcnkuaXNHaXQgPSBmYWxzZTsKLSAg ICBzdHJpY3RFcXVhbCh0aGlzLnZpZXcuX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSgzMzAxOCwg cmVwb3NpdG9yeSksICJyMzMwMTgiLCAiU2hvdWxkIGJlIHIzMzAxOCIpCisgICAgc3RyaWN0RXF1 YWwodGhpcy52aWV3Ll9mb3JtYXRSZXZpc2lvbkZvckRpc3BsYXkoIjMzMDE4IiwgcmVwb3NpdG9y eSksICJyMzMwMTgiLCAiU2hvdWxkIGJlIHIzMzAxOCIpCiB9KTsKIAogdGVzdCgiX2Zvcm1hdFJl dmlzaW9uRm9yRGlzcGxheSBHaXQiLCBmdW5jdGlvbigpCkBAIC0yNjcsOCArMjY3LDggQEAgdGVz dCgiY29tcGFyZUl0ZXJhdGlvbnMgYnkgcmV2aXNpb25zIiwgZnVuY3Rpb24oKQogICAgIHZhciBm aW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24xID0gbmV3IEJ1aWxkYm90SXRlcmF0 aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRlcmF0aW9uMiA9IG5ldyBC dWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9u MS5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9OwotICAgIGl0ZXJhdGlvbjIucmV2 aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVyYXRpb24xLnJldmlzaW9u ID0geyAib3BlblNvdXJjZSI6ICIzMzAxOCIgfTsKKyAgICBpdGVyYXRpb24yLnJldmlzaW9uID0g eyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24xLmxvYWRlZCA9IHRydWU7 CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSB0cnVlOwogICAgIG9rKHRoaXMucXVldWUuY29tcGFy ZUl0ZXJhdGlvbnMoaXRlcmF0aW9uMiwgaXRlcmF0aW9uMSkgPCAwLCAiY29tcGFyZUl0ZXJhdGlv bnM6IGxlc3MgdGhhbiIpOwpAQCAtMjgyLDcgKzI4Miw3IEBAIHRlc3QoImNvbXBhcmVJdGVyYXRp b25zIGJ5IGxvYWRlZCAob25lIHJldmlzaW9uIG1pc3NpbmcpIiwgZnVuY3Rpb24oKQogICAgIHZh ciBpdGVyYXRpb24xID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlz aGVkKTsKICAgICB2YXIgaXRlcmF0aW9uMiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1 ZXVlLCAyLCBmaW5pc2hlZCk7CiAgICAgaXRlcmF0aW9uMS5yZXZpc2lvbiA9IHt9OwotICAgIGl0 ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVyYXRp b24yLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24x LmxvYWRlZCA9IGZhbHNlOwogICAgIGl0ZXJhdGlvbjIubG9hZGVkID0gdHJ1ZTsKICAgICBvayh0 aGlzLnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjEsIGl0ZXJhdGlvbjIpID4gMCwg ImNvbXBhcmVJdGVyYXRpb25zOiBncmVhdGVyIHRoYW4iKTsKQEAgLTI5NCw4ICsyOTQsOCBAQCB0 ZXN0KCJjb21wYXJlSXRlcmF0aW9ucyBieSBsb2FkZWQgKHNhbWUgcmV2aXNpb24pIiwgZnVuY3Rp b24oKQogICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24xID0gbmV3 IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRl cmF0aW9uMiA9IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7 Ci0gICAgaXRlcmF0aW9uMS5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOSB9OwotICAg IGl0ZXJhdGlvbjIucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVy YXRpb24xLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKKyAgICBpdGVyYXRp b24yLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24x LmxvYWRlZCA9IGZhbHNlOwogICAgIGl0ZXJhdGlvbjIubG9hZGVkID0gdHJ1ZTsKICAgICBvayh0 aGlzLnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjEsIGl0ZXJhdGlvbjIpID4gMCwg ImNvbXBhcmVJdGVyYXRpb25zOiBncmVhdGVyIHRoYW4iKTsKQEAgLTMyMSw4ICszMjEsOCBAQCB0 ZXN0KCJjb21wYXJlSXRlcmF0aW9ucyBieSBpZCAoc2FtZSByZXZpc2lvbikiLCBmdW5jdGlvbigp CiAgICAgdmFyIGZpbmlzaGVkID0gZmFsc2U7CiAgICAgdmFyIGl0ZXJhdGlvbjEgPSBuZXcgQnVp bGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwogICAgIHZhciBpdGVyYXRp b24yID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKLSAg ICBpdGVyYXRpb24xLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE5IH07Ci0gICAgaXRl cmF0aW9uMi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOSB9OworICAgIGl0ZXJhdGlv bjEucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OworICAgIGl0ZXJhdGlvbjIu cmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogIjMzMDE5IiB9OwogICAgIGl0ZXJhdGlvbjEubG9h ZGVkID0gZmFsc2U7CiAgICAgaXRlcmF0aW9uMi5sb2FkZWQgPSBmYWxzZTsKICAgICBvayh0aGlz LnF1ZXVlLmNvbXBhcmVJdGVyYXRpb25zKGl0ZXJhdGlvbjIsIGl0ZXJhdGlvbjEpIDwgMCwgImNv bXBhcmVJdGVyYXRpb25zOiBsZXNzIHRoYW4iKTsKQEAgLTMzNSw4ICszMzUsOCBAQCB0ZXN0KCJj b21wYXJlSXRlcmF0aW9uc0J5UmV2aXNpb25zIiwgZnVuY3Rpb24oKQogICAgIHZhciBmaW5pc2hl ZCA9IGZhbHNlOwogICAgIHZhciBpdGVyYXRpb24xID0gbmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRo aXMucXVldWUsIDEsIGZpbmlzaGVkKTsKICAgICB2YXIgaXRlcmF0aW9uMiA9IG5ldyBCdWlsZGJv dEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAyLCBmaW5pc2hlZCk7Ci0gICAgaXRlcmF0aW9uMS5yZXZp c2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9OwotICAgIGl0ZXJhdGlvbjIucmV2aXNpb24g PSB7ICJvcGVuU291cmNlIjogMzMwMTkgfTsKKyAgICBpdGVyYXRpb24xLnJldmlzaW9uID0geyAi b3BlblNvdXJjZSI6ICIzMzAxOCIgfTsKKyAgICBpdGVyYXRpb24yLnJldmlzaW9uID0geyAib3Bl blNvdXJjZSI6ICIzMzAxOSIgfTsKICAgICBpdGVyYXRpb24xLmxvYWRlZCA9IHRydWU7CiAgICAg aXRlcmF0aW9uMi5sb2FkZWQgPSBmYWxzZTsKICAgICBvayh0aGlzLnF1ZXVlLmNvbXBhcmVJdGVy YXRpb25zQnlSZXZpc2lvbnMoaXRlcmF0aW9uMiwgaXRlcmF0aW9uMSkgPCAwLCAiY29tcGFyZUl0 ZXJhdGlvbnNCeVJldmlzaW9uczogbGVzcyB0aGFuIik7Cg==