[mb-commits] r13737 - in search_server/trunk: index/src/main/java/org/musicbrainz/search/index servlet/src/test/java/org/musicbrainz/search/servlet
[email protected] Fri, 25 Apr 2014 11:07:52 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Wddyy-0004KL-TF@wiley> |
QXV0aG9yOiBpamFiegpEYXRlOiAyMDE0LTA0LTI1IDExOjA3OjQwICswMDAwIChGcmksIDI1IEFw ciAyMDE0KQpOZXcgUmV2aXNpb246IDEzNzM3CgpNb2RpZmllZDoKICAgc2VhcmNoX3NlcnZlci90 cnVuay9pbmRleC9zcmMvbWFpbi9qYXZhL29yZy9tdXNpY2JyYWluei9zZWFyY2gvaW5kZXgvV29y a0luZGV4LmphdmEKICAgc2VhcmNoX3NlcnZlci90cnVuay9zZXJ2bGV0L3NyYy90ZXN0L2phdmEv b3JnL211c2ljYnJhaW56L3NlYXJjaC9zZXJ2bGV0L0ZpbmRXb3JrVGVzdC5qYXZhCkxvZzoKUmVm bGVjdCBjaGFuZ2VzIHRvIHdvcmsgYXR0cmlidXRlcyBpbiBNTUQtc2NoZW1hCgpNb2RpZmllZDog c2VhcmNoX3NlcnZlci90cnVuay9pbmRleC9zcmMvbWFpbi9qYXZhL29yZy9tdXNpY2JyYWluei9z ZWFyY2gvaW5kZXgvV29ya0luZGV4LmphdmEKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc2VhcmNoX3NlcnZlci90 cnVuay9pbmRleC9zcmMvbWFpbi9qYXZhL29yZy9tdXNpY2JyYWluei9zZWFyY2gvaW5kZXgvV29y a0luZGV4LmphdmEJMjAxNC0wNC0yNSAxMTowNjo0MiBVVEMgKHJldiAxMzczNikKKysrIHNlYXJj aF9zZXJ2ZXIvdHJ1bmsvaW5kZXgvc3JjL21haW4vamF2YS9vcmcvbXVzaWNicmFpbnovc2VhcmNo L2luZGV4L1dvcmtJbmRleC5qYXZhCTIwMTQtMDQtMjUgMTE6MDc6NDAgVVRDIChyZXYgMTM3Mzcp CkBAIC0xNTcsOSArMTU3LDkgQEAKIAogICAgICAgICAgICAgaWYobGlua0lkPT1sYXN0TGlua0lk KSB7CiAgICAgICAgICAgICAgICAgU3RyaW5nIGF0dHJpYnV0ZSA9IHJzLmdldFN0cmluZygiYXR0 cmlidXRlIik7Ci0gICAgICAgICAgICAgICAgQXR0cmlidXRlTGlzdCBhdHRyaWJ1dGVMaXN0PWxh c3RSZWxhdGlvbi5nZXRBdHRyaWJ1dGVMaXN0KCk7CisgICAgICAgICAgICAgICAgUmVsYXRpb24u QXR0cmlidXRlTGlzdCBhdHRyaWJ1dGVMaXN0PWxhc3RSZWxhdGlvbi5nZXRBdHRyaWJ1dGVMaXN0 KCk7CiAgICAgICAgICAgICAgICAgaWYoYXR0cmlidXRlTGlzdD09bnVsbCkgewotICAgICAgICAg ICAgICAgICAgICBhdHRyaWJ1dGVMaXN0ID0gbmV3IE9iamVjdEZhY3RvcnkoKS5jcmVhdGVBdHRy aWJ1dGVMaXN0KCk7CisgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZUxpc3QgPSBuZXcgT2Jq ZWN0RmFjdG9yeSgpLmNyZWF0ZVJlbGF0aW9uQXR0cmlidXRlTGlzdCgpOwogICAgICAgICAgICAg ICAgICAgICBsYXN0UmVsYXRpb24uc2V0QXR0cmlidXRlTGlzdChhdHRyaWJ1dGVMaXN0KTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYXR0cmlidXRlTGlzdC5nZXRBdHRyaWJ1 dGUoKS5hZGQoYXR0cmlidXRlKTsKQEAgLTE4NSwxMiArMTg1LDExIEBACiAgICAgICAgICAgICAg ICAgcmVsYXRpb24uc2V0VHlwZShycy5nZXRTdHJpbmcoImxpbmsiKSk7CiAgICAgICAgICAgICAg ICAgcmVsYXRpb24uc2V0RGlyZWN0aW9uKERlZkRpcmVjdGlvbi5CQUNLV0FSRCk7CiAgICAgICAg ICAgICAgICAgbGlzdC5nZXRSZWxhdGlvbigpLmFkZChyZWxhdGlvbik7Ci0KICAgICAgICAgICAg ICAgICBTdHJpbmcgYXR0cmlidXRlID0gcnMuZ2V0U3RyaW5nKCJhdHRyaWJ1dGUiKTsKICAgICAg ICAgICAgICAgICBpZihhdHRyaWJ1dGUhPW51bGwpIHsKLSAgICAgICAgICAgICAgICAgICAgQXR0 cmlidXRlTGlzdCBhdHRyaWJ1dGVMaXN0PXJlbGF0aW9uLmdldEF0dHJpYnV0ZUxpc3QoKTsKKyAg ICAgICAgICAgICAgICAgICAgUmVsYXRpb24uQXR0cmlidXRlTGlzdCBhdHRyaWJ1dGVMaXN0PXJl bGF0aW9uLmdldEF0dHJpYnV0ZUxpc3QoKTsKICAgICAgICAgICAgICAgICAgICAgaWYoYXR0cmli dXRlTGlzdD09bnVsbCkgewotICAgICAgICAgICAgICAgICAgICAgICAgYXR0cmlidXRlTGlzdCA9 IG5ldyBPYmplY3RGYWN0b3J5KCkuY3JlYXRlQXR0cmlidXRlTGlzdCgpOworICAgICAgICAgICAg ICAgICAgICAgICAgYXR0cmlidXRlTGlzdCA9IG5ldyBPYmplY3RGYWN0b3J5KCkuY3JlYXRlUmVs YXRpb25BdHRyaWJ1dGVMaXN0KCk7CiAgICAgICAgICAgICAgICAgICAgICAgICByZWxhdGlvbi5z ZXRBdHRyaWJ1dGVMaXN0KGF0dHJpYnV0ZUxpc3QpOwogICAgICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZUxpc3QuZ2V0QXR0cmlidXRlKCkuYWRkKGF0dHJp YnV0ZSk7CgpNb2RpZmllZDogc2VhcmNoX3NlcnZlci90cnVuay9zZXJ2bGV0L3NyYy90ZXN0L2ph dmEvb3JnL211c2ljYnJhaW56L3NlYXJjaC9zZXJ2bGV0L0ZpbmRXb3JrVGVzdC5qYXZhCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIHNlYXJjaF9zZXJ2ZXIvdHJ1bmsvc2VydmxldC9zcmMvdGVzdC9qYXZhL29yZy9t dXNpY2JyYWluei9zZWFyY2gvc2VydmxldC9GaW5kV29ya1Rlc3QuamF2YQkyMDE0LTA0LTI1IDEx OjA2OjQyIFVUQyAocmV2IDEzNzM2KQorKysgc2VhcmNoX3NlcnZlci90cnVuay9zZXJ2bGV0L3Ny Yy90ZXN0L2phdmEvb3JnL211c2ljYnJhaW56L3NlYXJjaC9zZXJ2bGV0L0ZpbmRXb3JrVGVzdC5q YXZhCTIwMTQtMDQtMjUgMTE6MDc6NDAgVVRDIChyZXYgMTM3MzcpCkBAIC04OSw3ICs4OSw3IEBA CiAgICAgICAgICAgICBybC5zZXRUYXJnZXRUeXBlKCJhcnRpc3QiKTsKICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICBSZWxhdGlvbiByZWxhdGlvbiA9IG9mLmNyZWF0ZVJlbGF0aW9uKCk7 Ci0gICAgICAgICAgICAgICAgQXR0cmlidXRlTGlzdCBhbCA9IG9mLmNyZWF0ZUF0dHJpYnV0ZUxp c3QoKTsKKyAgICAgICAgICAgICAgICBSZWxhdGlvbi5BdHRyaWJ1dGVMaXN0IGFsID0gb2YuY3Jl YXRlUmVsYXRpb25BdHRyaWJ1dGVMaXN0KCk7CiAgICAgICAgICAgICAgICAgQXJ0aXN0IGFydGlz dDEgPSBvZi5jcmVhdGVBcnRpc3QoKTsKICAgICAgICAgICAgICAgICBhcnRpc3QxLnNldElkKCIx ZjlkZjE5Mi1hNjIxLTRmNTQtODg1MC0yYzUzNzNiN2VhYzkiKTsKICAgICAgICAgICAgICAgICBh cnRpc3QxLnNldE5hbWUoItCf0ZHRgtGAINCY0LvRjNC40Ycg0KfQsNC50LrQvtCy0YHQutC40Lki KTsKQEAgLTEwMyw3ICsxMDMsNyBAQAogICAgICAgICAgICAgfQogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgIFJlbGF0aW9uIHJlbGF0aW9uID0gb2YuY3JlYXRlUmVsYXRpb24oKTsKLSAg ICAgICAgICAgICAgICBBdHRyaWJ1dGVMaXN0IGFsID0gb2YuY3JlYXRlQXR0cmlidXRlTGlzdCgp OworICAgICAgICAgICAgICAgIFJlbGF0aW9uLkF0dHJpYnV0ZUxpc3QgYWwgPSBvZi5jcmVhdGVS ZWxhdGlvbkF0dHJpYnV0ZUxpc3QoKTsKICAgICAgICAgICAgICAgICBBcnRpc3QgYXJ0aXN0MSA9 IG9mLmNyZWF0ZUFydGlzdCgpOwogICAgICAgICAgICAgICAgIGFydGlzdDEuc2V0SWQoImFiY2Rl ZmdoLWE2MjEtNGY1NC04ODUwLTJjNTM3M2I3ZWFjOSIpOwogICAgICAgICAgICAgICAgIGFydGlz dDEuc2V0TmFtZSgiZnJhbmsiKTsKQEAgLTE0OCw3ICsxNDgsNyBAQAogICAgICAgICAgICAgcmwu c2V0VGFyZ2V0VHlwZSgiYXJ0aXN0Iik7CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg UmVsYXRpb24gcmVsYXRpb24gPSBvZi5jcmVhdGVSZWxhdGlvbigpOwotICAgICAgICAgICAgICAg IEF0dHJpYnV0ZUxpc3QgYWwgPSBvZi5jcmVhdGVBdHRyaWJ1dGVMaXN0KCk7CisgICAgICAgICAg ICAgICAgUmVsYXRpb24uQXR0cmlidXRlTGlzdCBhbCA9IG9mLmNyZWF0ZVJlbGF0aW9uQXR0cmli dXRlTGlzdCgpOwogICAgICAgICAgICAgICAgIEFydGlzdCBhcnRpc3QgPSBvZi5jcmVhdGVBcnRp c3QoKTsKICAgICAgICAgICAgICAgICBhcnRpc3Quc2V0SWQoIjc4OWY2NzY4LTU4MzAtNGIwOC04 YjRmLWYzODU2NmIyZWIxZCIpOwogICAgICAgICAgICAgICAgIGFydGlzdC5zZXROYW1lKCJCbGFj ayBGcmFuY2lzIik7CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KTXVzaWNCcmFpbnotY29tbWl0cyBtYWlsaW5nIGxpc3QKTXVzaWNCcmFpbnotY29tbWl0 c0BsaXN0cy5tdXNpY2JyYWluei5vcmcKaHR0cDovL2xpc3RzLm11c2ljYnJhaW56Lm9yZy9tYWls bWFuL2xpc3RpbmZvL211c2ljYnJhaW56LWNvbW1pdHM=