[mono/monodevelop] d9fa0c06: Fixed 'Bug 16332 - Duplicate BOM! '.

Mike Krüger ([email protected]) <[email protected]> Wed, 20 Nov 2013 06:53:45 +0000
Newsgroups	gmane.comp.gnome.mono.patches
Message-ID	<0000014274493b96-67e0cd60-2da9-4456-b4a8-359497610599-000000@email.amazonses.com>
DQogICBCcmFuY2g6IHJlZnMvaGVhZHMvbWFzdGVyDQogICAgIEhvbWU6IGh0dHBzOi8vZ2l0aHVi
LmNvbS9tb25vL21vbm9kZXZlbG9wDQogIENvbXBhcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9tb25v
L21vbm9kZXZlbG9wL2NvbXBhcmUvNjg0ODFlODM2OWQ2Li4uZDlmYTBjMDY5YmJiDQoNCiAgIENv
bW1pdDogZDlmYTBjMDY5YmJiMGMzNDRmMWY0MGRjNTFkZWRkOGY1MGM3OGMwMg0KICAgQXV0aG9y
OiBNaWtlIEtyw7xnZXIgPG1rcnVlZ2VyQHhhbWFyaW4uY29tPiAobWtydWVnZXIpDQogICAgIERh
dGU6IDIwMTMtMTEtMjAgMDY6NTI6MjggR01UDQogICAgICBVUkw6IGh0dHBzOi8vZ2l0aHViLmNv
bS9tb25vL21vbm9kZXZlbG9wL2NvbW1pdC9kOWZhMGMwNjliYmIwYzM0NGYxZjQwZGM1MWRlZGQ4
ZjUwYzc4YzAyDQoNCkZpeGVkICdCdWcgMTYzMzIgLSBEdXBsaWNhdGUgQk9NISAnLg0KDQpDaGFu
Z2VkIHBhdGhzOgogIE0gbWFpbi9zcmMvYWRkaW5zL01vbm9EZXZlbG9wLlNvdXJjZUVkaXRvcjIv
TW9ub0RldmVsb3AuU291cmNlRWRpdG9yL1NvdXJjZUVkaXRvclZpZXcuY3MKICBNIG1haW4vc3Jj
L2NvcmUvTW9uby5UZXh0ZWRpdG9yL01vbm8uVGV4dEVkaXRvci5VdGlscy9UZXh0RmlsZVV0aWxp
dHkuY3MKICBNIG1haW4vc3JjL2NvcmUvTW9ub0RldmVsb3AuVGV4dEVkaXRvci5UZXN0cy9Nb25v
LlRleHRFZGl0b3IuVGVzdHMvVGV4dEZpbGVSZWFkZXJUZXN0cy5jcwoNCk1vZGlmaWVkOiBtYWlu
L3NyYy9hZGRpbnMvTW9ub0RldmVsb3AuU291cmNlRWRpdG9yMi9Nb25vRGV2ZWxvcC5Tb3VyY2VF
ZGl0b3IvU291cmNlRWRpdG9yVmlldy5jcw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KQEAgLTgzNSw5ICs4MzUsOSBA
QCBwdWJsaWMgdm9pZCBMb2FkIChzdHJpbmcgZmlsZU5hbWUsIEVuY29kaW5nIGxvYWRFbmNvZGlu
ZywgYm9vbCByZWxvYWQgPSBmYWxzZSkKIAkJCWVsc2UgewogCQkJCWluTG9hZCA9IHRydWU7CiAJ
CQkJaWYgKGxvYWRFbmNvZGluZyA9PSBudWxsKSB7Ci0JCQkJCXRleHQgPSBUZXh0RmlsZVV0aWxp
dHkuUmVhZEFsbFRleHQgKGZpbGVOYW1lLCBvdXQgaGFkQm9tLCBvdXQgdGhpcy5lbmNvZGluZyk7
Ci0JCQkJfQotCQkJCWVsc2UgeworCQkJCQl0ZXh0ID0gVGV4dEZpbGVVdGlsaXR5LlJlYWRBbGxU
ZXh0IChmaWxlTmFtZSwgb3V0IGhhZEJvbSwgb3V0IGVuY29kaW5nKTsKKwkJCQl9IGVsc2Ugewor
CQkJCQllbmNvZGluZyA9IGxvYWRFbmNvZGluZzsKIAkJCQkJdGV4dCA9IFRleHRGaWxlVXRpbGl0
eS5SZWFkQWxsVGV4dCAoZmlsZU5hbWUsIGxvYWRFbmNvZGluZywgb3V0IGhhZEJvbSk7CiAJCQkJ
fQogCQkJCWlmIChyZWxvYWQpIHsNCg0KTW9kaWZpZWQ6IG1haW4vc3JjL2NvcmUvTW9uby5UZXh0
ZWRpdG9yL01vbm8uVGV4dEVkaXRvci5VdGlscy9UZXh0RmlsZVV0aWxpdHkuY3MNCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0NCkBAIC0xNTYsNiArMTU2LDI1IEBAIHB1YmxpYyBzdGF0aWMgc3RyaW5nIEdldFRleHQgKGJ5
dGVbXSBieXRlcywgb3V0IEVuY29kaW5nIGVuY29kaW5nLCBvdXQgYm9vbCBoYWRCCiAJCQl9CiAJ
CX0KIAorCQlwdWJsaWMgc3RhdGljIHN0cmluZyBHZXRUZXh0IChieXRlW10gYnl0ZXMsIEVuY29k
aW5nIGVuY29kaW5nLCBvdXQgYm9vbCBoYWRCb20pCisJCXsKKwkJCWJ5dGVbXSBib20gPSBlbmNv
ZGluZy5HZXRQcmVhbWJsZSAoKTsKKwkJCWlmIChib20gIT0gbnVsbCAmJiBib20uTGVuZ3RoID4g
MCAmJiBib20uTGVuZ3RoIDw9IGJ5dGVzLkxlbmd0aCkgeworCQkJCWhhZEJvbSA9IHRydWU7CisJ
CQkJZm9yIChpbnQgaSA9IDA7IGkgPCBib20uTGVuZ3RoOyBpKyspIHsKKwkJCQkJaWYgKGJ5dGVz
IFtpXSAhPSBib20gW2ldKSB7CisJCQkJCQloYWRCb20gPSBmYWxzZTsKKwkJCQkJCWJyZWFrOwor
CQkJCQl9CisJCQkJfQorCQkJfSBlbHNlIHsKKwkJCQloYWRCb20gPSBmYWxzZTsKKwkJCX0KKwkJ
CWlmIChoYWRCb20pIAorCQkJCXJldHVybiBlbmNvZGluZy5HZXRTdHJpbmcgKGJ5dGVzLCBib20u
TGVuZ3RoLCBieXRlcy5MZW5ndGggLSBib20uTGVuZ3RoKTsKKwkJCXJldHVybiBlbmNvZGluZy5H
ZXRTdHJpbmcgKGJ5dGVzKTsKKwkJfQorCiAJCXB1YmxpYyBzdGF0aWMgc3RyaW5nIEdldFRleHQg
KFN0cmVhbSBpbnB1dFN0cmVhbSkKIAkJewogCQkJdXNpbmcgKHZhciBzdHJlYW0gPSBPcGVuU3Ry
ZWFtIChpbnB1dFN0cmVhbSkpIHsKQEAgLTMwMywyMSArMzIyLDggQEAgcHVibGljIHN0YXRpYyBz
dHJpbmcgUmVhZEFsbFRleHQgKHN0cmluZyBmaWxlTmFtZSwgRW5jb2RpbmcgZW5jb2RpbmcsIG91
dCBib29sIGgKIAkJCQl0aHJvdyBuZXcgQXJndW1lbnROdWxsRXhjZXB0aW9uICgiZW5jb2Rpbmci
KTsKIAkJCQogCQkJYnl0ZVtdIGNvbnRlbnQgPSBGaWxlLlJlYWRBbGxCeXRlcyAoZmlsZU5hbWUp
OwotCQkJYnl0ZVtdIGJvbSA9IGVuY29kaW5nLkdldFByZWFtYmxlICgpOwotCQkJaWYgKGJvbSAh
PSBudWxsICYmIGJvbS5MZW5ndGggPiAwICYmIGJvbS5MZW5ndGggPD0gY29udGVudC5MZW5ndGgp
IHsKLQkJCQloYWRCb20gPSB0cnVlOwotCQkJCWZvciAoaW50IGkgPSAwOyBpIDwgYm9tLkxlbmd0
aDsgaSsrKSB7Ci0JCQkJCWlmIChjb250ZW50IFtpXSAhPSBib20gW2ldKSB7Ci0JCQkJCQloYWRC
b209IGZhbHNlOwotCQkJCQkJYnJlYWs7Ci0JCQkJCX0KLQkJCQl9Ci0JCQl9IGVsc2UgewotCQkJ
CWhhZEJvbSA9IGZhbHNlOwotCQkJfQotCQkJcmV0dXJuIGVuY29kaW5nLkdldFN0cmluZyAoY29u
dGVudCk7CisJCQlyZXR1cm4gR2V0VGV4dCAoY29udGVudCwgZW5jb2RpbmcsIG91dCBoYWRCb20p
OyAKIAkJfQotCiAJCSNlbmRyZWdpb24KIAogCQkjcmVnaW9uIEFTQ0lJIGVuY29kaW5nIGNoZWNr
DQoNCk1vZGlmaWVkOiBtYWluL3NyYy9jb3JlL01vbm9EZXZlbG9wLlRleHRFZGl0b3IuVGVzdHMv
TW9uby5UZXh0RWRpdG9yLlRlc3RzL1RleHRGaWxlUmVhZGVyVGVzdHMuY3MNCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N
CkBAIC0xNDMsNiArMTQzLDE4IEBAIHB1YmxpYyB2b2lkIFRlc3RHQjE4MDMwICgpCiAJCQlieXRl
W10gaW5wdXQgPSBFbmNvZGluZy5HZXRFbmNvZGluZyAoNTQ5MzYpLkdldEJ5dGVzIChzcmMpOwog
CQkJQXNzZXJ0LkFyZUVxdWFsIChzcmMsIFRleHRGaWxlVXRpbGl0eS5HZXRUZXh0IChpbnB1dCkp
OwogCQl9CisKKwkJLy8vIDxzdW1tYXJ5PgorCQkvLy8gQnVnIDE2MzMyIC0gRHVwbGljYXRlIEJP
TSEgCisJCS8vLyA8L3N1bW1hcnk+CisJCVtUZXN0KCldCisJCXB1YmxpYyB2b2lkIFRlc3RCdWcx
NjMzMiAoKQkKKwkJeworCQkJYnl0ZVtdIGlucHV0ID0gbmV3IGJ5dGVbXSB7IDB4RUYsIDB4QkIs
IDB4QkYsIChieXRlKSdhJ307CisJCQlib29sIGhhZEJvbTsKKwkJCUFzc2VydC5BcmVFcXVhbCAo
ImEiLCBUZXh0RmlsZVV0aWxpdHkuR2V0VGV4dCAoaW5wdXQsIEVuY29kaW5nLlVURjgsIG91dCBo
YWRCb20pKTsKKwkJCUFzc2VydC5Jc1RydWUgKGhhZEJvbSk7CisJCX0KIAl9CiB9CiANCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk1vbm8tcGF0Y2hlcyBt
YWlsbGlzdCAgLSAgTW9uby1wYXRjaGVzQGxpc3RzLnhpbWlhbi5jb20KaHR0cDovL2xpc3RzLnhp
bWlhbi5jb20vbWFpbG1hbi9saXN0aW5mby9tb25vLXBhdGNoZXMK